From 0fcb548c054248924190fa27caf7372cfded2ba0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Mar 2021 06:47:17 +0000
Subject: [PATCH 001/288] build(deps-dev): bump swr from 0.4.2 to 0.5.3 (#3230)

---
 package.json |  2 +-
 yarn.lock    | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 202710fb386d..4de04de8c710 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "stylelint-config-sass-guidelines": "^8.0.0",
     "stylelint-prettier": "^1.2.0",
     "stylelint-scss": "^3.19.0",
-    "swr": "^0.4.2",
+    "swr": "^0.5.3",
     "ts-loader": "^8.0.18",
     "typescript": "^4.2.3",
     "use-debounce": "^5.2.1",
diff --git a/yarn.lock b/yarn.lock
index e8f356732376..3dcb9ad75d09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6641,11 +6641,6 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
-dequal@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d"
-  integrity sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug==
-
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -16906,12 +16901,10 @@ svgo@^2.1.0:
     csso "^4.2.0"
     stable "^0.1.8"
 
-swr@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/swr/-/swr-0.4.2.tgz#4a9ed5e9948088af145c79d716d294cb99712a29"
-  integrity sha512-SKGxcAfyijj/lE5ja5zVMDqJNudASH3WZPRUakDVOePTM18FnsXgugndjl9BSRwj+jokFCulMDe7F2pQL+VhEw==
-  dependencies:
-    dequal "2.0.2"
+swr@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/swr/-/swr-0.5.3.tgz#7290a9a61329d930583ef365317e636b8dbaa8bb"
+  integrity sha512-RUE3RWn3jt9e4qLPat2A9vbHG/5N6konsc27xKjE65jFSiGv0P7HLD8IGvwAv6DRKktL7Od2UcayX0plKb2awg==
 
 symbol-tree@^3.2.4:
   version "3.2.4"

From 8af61551630879fb8b36da53d6effe22d85692b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Mar 2021 06:49:01 +0000
Subject: [PATCH 002/288] build(deps): bump fast-xml-parser from 3.18.0 to
 3.19.0 (#3231)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4de04de8c710..371c0f12f070 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "dotenv": "8.2.0",
     "ejs": "3.1.6",
     "express": "4.17.1",
-    "fast-xml-parser": "3.18.0",
+    "fast-xml-parser": "3.19.0",
     "file-type": "16.3.0",
     "front-matter": "4.0.2",
     "fs-extra": "9.1.0",
diff --git a/yarn.lock b/yarn.lock
index 3dcb9ad75d09..1230d39890d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7954,10 +7954,10 @@ fast-safe-stringify@^2.0.4:
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
   integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==
 
-fast-xml-parser@3.18.0:
-  version "3.18.0"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.18.0.tgz#b77f4a494cd64e6f44aadfa68fbde30cd922b2df"
-  integrity sha512-tRrwShhppv0K5GKEtuVs92W0VGDaVltZAwtHbpjNF+JOT7cjIFySBGTEOmdBslXYyWYaZwEX/g4Su8ZeKg0LKQ==
+fast-xml-parser@3.19.0:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01"
+  integrity sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg==
 
 fastest-levenshtein@^1.0.12:
   version "1.0.12"

From ba908cbba15eace5869bf6d4a0dec0531f7514dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Mar 2021 06:49:29 +0000
Subject: [PATCH 003/288] build(deps-dev): bump html-validate from 4.6.1 to
 4.7.0 (#3233)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 371c0f12f070..c680ed8f120f 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "fuzzyjs": "4.0.4",
     "fuzzysearch": "1.0.3",
     "history": "5.0.0",
-    "html-validate": "4.6.1",
+    "html-validate": "4.7.0",
     "husky": "4.3.8",
     "ignore-loader": "^0.1.2",
     "jest-environment-jsdom-sixteen": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index 1230d39890d0..6085315c423e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9327,10 +9327,10 @@ html-tags@^3.1.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
   integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
 
-html-validate@4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.6.1.tgz#9fc01072d36e518f75b8dc51157fc2e1d45ccb9f"
-  integrity sha512-vFmvy70+UUySVbekufawocXyfIUDRex6cwX5JMPpHZ3FzTmWnarUTGttXHk1l6/v67c/DDnsdZiJHaLMZWcOUg==
+html-validate@4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.7.0.tgz#98df8689a2021f069962294d824697412a2c820d"
+  integrity sha512-tu6xLlHQY4RkfXtR5d8WjJ8+w2BbZZGtAdgtL3C7tRjepFtVluu3vLpGPEfi3NP9wZf9Xk2/Dgm9RK48StqVpA==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@html-validate/stylish" "1.0.0"

From db0131eadf82c0ed7f3f71df53becfce0383b82c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Mar 2021 06:50:31 +0000
Subject: [PATCH 004/288] build(deps-dev): bump eslint-plugin-jest from 24.2.1
 to 24.3.1 (#3234)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c680ed8f120f..c8a960e742ee 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "downshift": "^6.1.0",
     "eslint": "^7.18.0",
     "eslint-gitignore": "^0.1.0",
-    "eslint-plugin-jest": "24.2.1",
+    "eslint-plugin-jest": "24.3.1",
     "eslint-plugin-node": "11.1.0",
     "extend": "^3.0.2",
     "flexsearch": "0.6.32",
diff --git a/yarn.lock b/yarn.lock
index 6085315c423e..d6d170c8087b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7412,10 +7412,10 @@ eslint-plugin-import@^2.22.1:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-jest@24.2.1, eslint-plugin-jest@^24.1.0:
-  version "24.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.2.1.tgz#7e84f16a3ca6589b86be9732a93d71367a4ed627"
-  integrity sha512-s24ve8WUu3DLVidvlSzaqlOpTZre9lTkZTAO+a7X0WMtj8HraWTiTEkW3pbDT1xVxqEHMWSv+Kx7MyqR50nhBw==
+eslint-plugin-jest@24.3.1, eslint-plugin-jest@^24.1.0:
+  version "24.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.1.tgz#c8df037847b83397940bef7fbc2cc168ab466bcc"
+  integrity sha512-RQt59rfMSHyvedImT72iaf8JcvCcR4P7Uq499dALtjY8mrCjbwWrFi1UceG4sid2wVIeDi+0tjxXZ8CZEVO7Zw==
   dependencies:
     "@typescript-eslint/experimental-utils" "^4.0.1"
 

From 78b226e1ae5af7b281b9e1cca52b77cffe90b2f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Mar 2021 08:23:02 +0000
Subject: [PATCH 005/288] build(deps-dev): bump flake8 from 3.8.4 to 3.9.0 in
 /deployer (#3235)

---
 deployer/poetry.lock    | 26 +++++++++++++-------------
 deployer/pyproject.toml |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 7fdedf7b741a..239c4c55ee5b 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -174,17 +174,17 @@ develop = ["mock", "pytest (>=3.0.0)", "pytest-cov", "pytest-mock (<3.0.0)", "py
 
 [[package]]
 name = "flake8"
-version = "3.8.4"
+version = "3.9.0"
 description = "the modular source code checker: pep8 pyflakes and co"
 category = "dev"
 optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
 
 [package.dependencies]
 importlib-metadata = {version = "*", markers = "python_version < \"3.8\""}
 mccabe = ">=0.6.0,<0.7.0"
-pycodestyle = ">=2.6.0a1,<2.7.0"
-pyflakes = ">=2.2.0,<2.3.0"
+pycodestyle = ">=2.7.0,<2.8.0"
+pyflakes = ">=2.3.0,<2.4.0"
 
 [[package]]
 name = "idna"
@@ -285,7 +285,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pycodestyle"
-version = "2.6.0"
+version = "2.7.0"
 description = "Python style guide checker"
 category = "dev"
 optional = false
@@ -301,7 +301,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pyflakes"
-version = "2.2.0"
+version = "2.3.0"
 description = "passive checker of Python programs"
 category = "dev"
 optional = false
@@ -479,7 +479,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "08e36bb5279b9dcbabe1f87c8488d3722dacafc4d846711bb68d1734ceedc643"
+content-hash = "9c23cadee62150680d858c7c4ea9c46d43bc1d77d410f766872a3c47a64723c7"
 
 [metadata.files]
 appdirs = [
@@ -585,8 +585,8 @@ elasticsearch-dsl = [
     {file = "elasticsearch_dsl-7.3.0-py2.py3-none-any.whl", hash = "sha256:9390d8e5cf82ebad3505e7f656e407259cf703f5a4035f211cef454127672572"},
 ]
 flake8 = [
-    {file = "flake8-3.8.4-py2.py3-none-any.whl", hash = "sha256:749dbbd6bfd0cf1318af27bf97a14e28e5ff548ef8e5b1566ccfb25a11e7c839"},
-    {file = "flake8-3.8.4.tar.gz", hash = "sha256:aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b"},
+    {file = "flake8-3.9.0-py2.py3-none-any.whl", hash = "sha256:12d05ab02614b6aee8df7c36b97d1a3b2372761222b19b58621355e82acddcff"},
+    {file = "flake8-3.9.0.tar.gz", hash = "sha256:78873e372b12b093da7b5e5ed302e8ad9e988b38b063b61ad937f26ca58fc5f0"},
 ]
 idna = [
     {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
@@ -629,16 +629,16 @@ py = [
     {file = "py-1.10.0.tar.gz", hash = "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"},
 ]
 pycodestyle = [
-    {file = "pycodestyle-2.6.0-py2.py3-none-any.whl", hash = "sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367"},
-    {file = "pycodestyle-2.6.0.tar.gz", hash = "sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"},
+    {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"},
+    {file = "pycodestyle-2.7.0.tar.gz", hash = "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"},
 ]
 pycparser = [
     {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"},
     {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"},
 ]
 pyflakes = [
-    {file = "pyflakes-2.2.0-py2.py3-none-any.whl", hash = "sha256:0d94e0e05a19e57a99444b6ddcf9a6eb2e5c68d3ca1e98e90707af8152c90a92"},
-    {file = "pyflakes-2.2.0.tar.gz", hash = "sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"},
+    {file = "pyflakes-2.3.0-py2.py3-none-any.whl", hash = "sha256:910208209dcea632721cb58363d0f72913d9e8cf64dc6f8ae2e02a3609aba40d"},
+    {file = "pyflakes-2.3.0.tar.gz", hash = "sha256:e59fd8e750e588358f1b8885e5a4751203a0516e0ee6d34811089ac294c8806f"},
 ]
 pyopenssl = [
     {file = "pyOpenSSL-20.0.1-py2.py3-none-any.whl", hash = "sha256:818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index c204850e8dc2..b607840d70cd 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -18,7 +18,7 @@ selectolax = "^0.2.10"
 
 [tool.poetry.dev-dependencies]
 black = "^20.8b1"
-flake8 = "^3.8.2"
+flake8 = "^3.9.0"
 pytest = "^6.2.2"
 
 [tool.poetry.scripts]

From 2d115e8a76fe8094280a4614b29149ebef3ebbae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Mar 2021 09:46:35 +0000
Subject: [PATCH 006/288] build(deps-dev): bump flake8 from 3.8.4 to 3.9.0 in
 /testing/integration (#3237)

---
 testing/integration/poetry.lock    | 26 +++++++++++++-------------
 testing/integration/pyproject.toml |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/testing/integration/poetry.lock b/testing/integration/poetry.lock
index eca0453dc136..ff9354416bfc 100644
--- a/testing/integration/poetry.lock
+++ b/testing/integration/poetry.lock
@@ -100,17 +100,17 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "flake8"
-version = "3.8.4"
+version = "3.9.0"
 description = "the modular source code checker: pep8 pyflakes and co"
 category = "dev"
 optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
 
 [package.dependencies]
 importlib-metadata = {version = "*", markers = "python_version < \"3.8\""}
 mccabe = ">=0.6.0,<0.7.0"
-pycodestyle = ">=2.6.0a1,<2.7.0"
-pyflakes = ">=2.2.0,<2.3.0"
+pycodestyle = ">=2.7.0,<2.8.0"
+pyflakes = ">=2.3.0,<2.4.0"
 
 [[package]]
 name = "idna"
@@ -217,7 +217,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pycodestyle"
-version = "2.6.0"
+version = "2.7.0"
 description = "Python style guide checker"
 category = "dev"
 optional = false
@@ -225,7 +225,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pyflakes"
-version = "2.2.0"
+version = "2.3.0"
 description = "passive checker of Python programs"
 category = "dev"
 optional = false
@@ -382,7 +382,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "0bc6df00c02f80c21dac088cf197f3caabf1ec0e98cec4d1f9a8a062ff711e7f"
+content-hash = "e2d74c3b25e579b95fe9d6b91d707062cbf3de2994d7553c8a1571b33712eb66"
 
 [metadata.files]
 appdirs = [
@@ -425,8 +425,8 @@ cssselect = [
     {file = "cssselect-1.1.0.tar.gz", hash = "sha256:f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc"},
 ]
 flake8 = [
-    {file = "flake8-3.8.4-py2.py3-none-any.whl", hash = "sha256:749dbbd6bfd0cf1318af27bf97a14e28e5ff548ef8e5b1566ccfb25a11e7c839"},
-    {file = "flake8-3.8.4.tar.gz", hash = "sha256:aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b"},
+    {file = "flake8-3.9.0-py2.py3-none-any.whl", hash = "sha256:12d05ab02614b6aee8df7c36b97d1a3b2372761222b19b58621355e82acddcff"},
+    {file = "flake8-3.9.0.tar.gz", hash = "sha256:78873e372b12b093da7b5e5ed302e8ad9e988b38b063b61ad937f26ca58fc5f0"},
 ]
 idna = [
     {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
@@ -504,12 +504,12 @@ py = [
     {file = "py-1.9.0.tar.gz", hash = "sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"},
 ]
 pycodestyle = [
-    {file = "pycodestyle-2.6.0-py2.py3-none-any.whl", hash = "sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367"},
-    {file = "pycodestyle-2.6.0.tar.gz", hash = "sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"},
+    {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"},
+    {file = "pycodestyle-2.7.0.tar.gz", hash = "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"},
 ]
 pyflakes = [
-    {file = "pyflakes-2.2.0-py2.py3-none-any.whl", hash = "sha256:0d94e0e05a19e57a99444b6ddcf9a6eb2e5c68d3ca1e98e90707af8152c90a92"},
-    {file = "pyflakes-2.2.0.tar.gz", hash = "sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"},
+    {file = "pyflakes-2.3.0-py2.py3-none-any.whl", hash = "sha256:910208209dcea632721cb58363d0f72913d9e8cf64dc6f8ae2e02a3609aba40d"},
+    {file = "pyflakes-2.3.0.tar.gz", hash = "sha256:e59fd8e750e588358f1b8885e5a4751203a0516e0ee6d34811089ac294c8806f"},
 ]
 pyparsing = [
     {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"},
diff --git a/testing/integration/pyproject.toml b/testing/integration/pyproject.toml
index ea61e274ce86..2308fe0d45c1 100644
--- a/testing/integration/pyproject.toml
+++ b/testing/integration/pyproject.toml
@@ -18,7 +18,7 @@ braceexpand = "^0.1.6"
 
 [tool.poetry.dev-dependencies]
 black = "^20.8b1"
-flake8 = "^3.8.2"
+flake8 = "^3.9.0"
 
 [build-system]
 requires = ["poetry>=0.12"]

From a7a5bc1d40e389a138fa6e118872d6a02cabaa8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Mar 2021 09:57:43 +0000
Subject: [PATCH 007/288] build(deps-dev): bump jsdom from 16.5.0 to 16.5.1
 (#3232)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c8a960e742ee..925e4c083ae1 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "jest-environment-jsdom-sixteen": "^1.0.3",
     "jest-junit-reporter": "^1.1.0",
     "jest-puppeteer": "4.4.0",
-    "jsdom": "^16.5.0",
+    "jsdom": "^16.5.1",
     "jsesc": "^3.0.2",
     "nodemon": "2.0.7",
     "pegjs": "^0.10.0",
diff --git a/yarn.lock b/yarn.lock
index d6d170c8087b..e535e1d69278 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11148,10 +11148,10 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdom@^16.2.1, jsdom@^16.4.0, jsdom@^16.5.0:
-  version "16.5.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.0.tgz#9e453505600cc5a70b385750d35256f380730cc4"
-  integrity sha512-QxZH0nmDTnTTVI0YDm4RUlaUPl5dcyn62G5TMDNfMmTW+J1u1v9gCR8WR+WZ6UghAa7nKJjDOFaI00eMMWvJFQ==
+jsdom@^16.2.1, jsdom@^16.4.0, jsdom@^16.5.1:
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.1.tgz#4ced6bbd7b77d67fb980e64d9e3e6fb900f97dd6"
+  integrity sha512-pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==
   dependencies:
     abab "^2.0.5"
     acorn "^8.0.5"

From a41d5f24794bb7029b893544bf3f299ae3baa5bb Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 15 Mar 2021 07:15:19 -0400
Subject: [PATCH 008/288] sitemap tool (#3158)

* _sitemap

* more features

* fixes

* small fixes

* misc improvements

* open in your editor

* eslint

* add a basic headless test

* more feedbacked
---
 client/src/app.tsx                    |  10 +
 client/src/sitemap/index.scss         |  39 ++
 client/src/sitemap/index.tsx          | 514 ++++++++++++++++++++++++++
 client/src/writers-homepage/index.tsx |   3 +
 server/index.js                       |  26 +-
 testing/tests/developing.test.js      |  10 +
 6 files changed, 592 insertions(+), 10 deletions(-)
 create mode 100644 client/src/sitemap/index.scss
 create mode 100644 client/src/sitemap/index.tsx

diff --git a/client/src/app.tsx b/client/src/app.tsx
index 7aa5065c723a..883319bc758a 100644
--- a/client/src/app.tsx
+++ b/client/src/app.tsx
@@ -22,6 +22,7 @@ const DocumentEdit = React.lazy(() => import("./document/forms/edit"));
 const DocumentCreate = React.lazy(() => import("./document/forms/create"));
 const DocumentManage = React.lazy(() => import("./document/forms/manage"));
 const WritersHomepage = React.lazy(() => import("./writers-homepage"));
+const Sitemap = React.lazy(() => import("./sitemap"));
 
 const isServer = typeof window === "undefined";
 
@@ -183,6 +184,15 @@ export function App(appProps) {
                     </StandardLayout>
                   }
                 />
+
+                <Route
+                  path="/_sitemap/*"
+                  element={
+                    <StandardLayout>
+                      <Sitemap />
+                    </StandardLayout>
+                  }
+                />
               </>
             )}
             <Route
diff --git a/client/src/sitemap/index.scss b/client/src/sitemap/index.scss
new file mode 100644
index 000000000000..0080406d1df4
--- /dev/null
+++ b/client/src/sitemap/index.scss
@@ -0,0 +1,39 @@
+@import "~@mdn/minimalist/sass/vars/typography";
+
+#sitemap {
+  min-height: 800px;
+
+  div.opening-in-your-editor {
+    float: right;
+    font-size: $small-font-size;
+  }
+  ul.breadcrumb {
+    li {
+      list-style-type: none;
+      display: inline-block;
+      margin-right: 5px;
+
+      &::after {
+        content: " /";
+      }
+    }
+    li.last,
+    li.this-doc {
+      &::after {
+        content: "";
+      }
+    }
+
+    li.this-doc {
+      margin-left: 20px;
+    }
+  }
+
+  .tree li.highlight {
+    background-color: #efefef;
+  }
+
+  .footer-note {
+    margin-top: 100px;
+  }
+}
diff --git a/client/src/sitemap/index.tsx b/client/src/sitemap/index.tsx
new file mode 100644
index 000000000000..e4f63b73804c
--- /dev/null
+++ b/client/src/sitemap/index.tsx
@@ -0,0 +1,514 @@
+import React from "react";
+import { Link, useNavigate, useLocation } from "react-router-dom";
+import useSWR from "swr";
+
+import { CRUD_MODE } from "../constants";
+import { useLocale } from "../hooks";
+import { PageContentContainer } from "../ui/atoms/page-content";
+
+import "./index.scss";
+
+interface SearchIndexDoc {
+  url: string;
+  title: string;
+}
+
+export default function Sitemap() {
+  const location = useLocation();
+  const navigate = useNavigate();
+  const locale = useLocale();
+
+  // Because you can load this app with something like `/en-us/_sitemap/Web/`
+  // we have to pretend that didn't happen and force it to be `/en-US/_sitemap/Web`
+  const pathname = location.pathname.endsWith("/")
+    ? location.pathname.slice(0, -1)
+    : location.pathname;
+
+  // `pathname` is going to be something like `/en-US/_sitemap/Web/Foo`.
+  // Transform that to be just `en-us/docs/web/foo`.
+  const searchPathname = pathname
+    .replace(`/${locale}/_sitemap`, `/${locale}/docs`)
+    .toLowerCase();
+
+  React.useEffect(() => {
+    document.title = "Sitemap";
+  }, []);
+
+  const { data, error } = useSWR<SearchIndexDoc[] | null, Error | null>(
+    `/${locale}/search-index.json`,
+    async (url) => {
+      const response = await fetch(url);
+      if (!response.ok) {
+        throw new Error(`${response.status} on ${response.url}`);
+      }
+      return (await response.json()) as SearchIndexDoc[];
+    },
+    {
+      revalidateOnFocus: false,
+    }
+  );
+
+  const [docs, setDocs] = React.useState<SearchIndexDoc[] | null>(null);
+  React.useEffect(() => {
+    if (data) {
+      const theseDocs = [...data].sort((a, b) => a.url.localeCompare(b.url));
+      setDocs(theseDocs);
+    }
+  }, [data]);
+
+  const [childCounts, setChildCounts] = React.useState<Map<string, number>>(
+    new Map()
+  );
+  React.useEffect(() => {
+    const counts = new Map<string, number>();
+    if (docs) {
+      for (const { url } of docs) {
+        const split = url.split("/");
+        const root = split.slice(0, 3);
+        split.slice(3).forEach((portion, i) => {
+          root.push(portion);
+          const key = root.join("/");
+          counts.set(key, (counts.get(key) || 0) + 1);
+        });
+      }
+      setChildCounts(counts);
+    }
+  }, [docs]);
+
+  const [thisDoc, setThisDoc] = React.useState<SearchIndexDoc | null>(null);
+  React.useEffect(() => {
+    if (docs) {
+      const newThisDoc = docs.find((doc) => {
+        return doc.url.toLowerCase() === searchPathname;
+      });
+      setThisDoc(newThisDoc || null);
+    }
+  }, [searchPathname, docs]);
+
+  const [searchFilter, setSearchFilter] = React.useState("");
+  React.useEffect(() => {
+    setSearchFilter("");
+  }, [pathname]);
+  const [searchSubmitted, setSearchSubmitted] = React.useState(false);
+
+  const [filtered, setFiltered] = React.useState<SearchIndexDoc[] | null>(null);
+  React.useEffect(() => {
+    if (docs) {
+      const depth = searchPathname.split("/").length;
+      const newFiltered = docs.filter((doc) => {
+        if (
+          doc.url.toLowerCase().startsWith(searchPathname) &&
+          depth + 1 === doc.url.split("/").length
+        ) {
+          const baseName = doc.url.split("/").slice(-1)[0].toLowerCase();
+          if (!baseName.startsWith(searchFilter.toLowerCase())) {
+            return false;
+          }
+          return true;
+        }
+        return false;
+      });
+      setFiltered(newFiltered);
+    }
+  }, [searchPathname, docs, searchFilter]);
+
+  const [highlightIndex, setHighlightIndex] = React.useState(0);
+  React.useEffect(() => {
+    setHighlightIndex(0);
+  }, [searchFilter]);
+
+  React.useEffect(() => {
+    if (searchSubmitted) {
+      if (filtered && filtered.length >= 1) {
+        const slug = filtered[highlightIndex].url.split("/").slice(3);
+        setSearchFilter("");
+        setSearchSubmitted(false);
+        navigate(`/${locale}/_sitemap/${slug.join("/")}`);
+      }
+    }
+  }, [locale, filtered, searchSubmitted, navigate, highlightIndex]);
+
+  function changeHighlight(direction: "up" | "down") {
+    if (direction === "up") {
+      let nextNumber = highlightIndex - 1;
+      if (filtered) {
+        nextNumber =
+          ((nextNumber % filtered.length) + filtered.length) % filtered.length;
+      }
+      setHighlightIndex(nextNumber);
+    } else {
+      let nextNumber = highlightIndex + 1;
+      if (filtered) {
+        nextNumber = nextNumber % filtered.length;
+      }
+      setHighlightIndex(nextNumber);
+    }
+  }
+
+  const [opening, setOpening] = React.useState<string | null>(null);
+  const [
+    editorOpeningError,
+    setEditorOpeningError,
+  ] = React.useState<Error | null>(null);
+  React.useEffect(() => {
+    let unsetOpeningTimer: ReturnType<typeof setTimeout>;
+    if (opening) {
+      unsetOpeningTimer = setTimeout(() => {
+        setOpening(null);
+      }, 3000);
+    }
+    return () => {
+      if (unsetOpeningTimer) {
+        clearTimeout(unsetOpeningTimer);
+      }
+    };
+  }, [opening]);
+
+  async function openInYourEditor(url: string) {
+    console.log(`Going to try to open ${url} in your editor`);
+    setOpening(url);
+    const sp = new URLSearchParams();
+    sp.set("url", url);
+    try {
+      const response = await fetch(`/_open?${sp.toString()}`);
+      if (!response.ok) {
+        if (response.status >= 500) {
+          setEditorOpeningError(
+            new Error(`${response.status}: ${response.statusText}`)
+          );
+        } else {
+          const body = await response.text();
+          setEditorOpeningError(new Error(`${response.status}: ${body}`));
+        }
+      }
+    } catch (err) {
+      setEditorOpeningError(err);
+    }
+  }
+
+  return (
+    <PageContentContainer>
+      <div id="sitemap">
+        {error && (
+          <div className="notecard error">
+            <h4>Error</h4>
+            <p>
+              <code>{error.toString()}</code>
+            </p>
+          </div>
+        )}
+
+        {editorOpeningError && (
+          <div className="notecard error">
+            <h4>Error opening in your editor</h4>
+            <p>
+              <code>{editorOpeningError.toString()}</code>
+            </p>
+          </div>
+        )}
+
+        {!data && !error && <p>Loading loading loading...</p>}
+        <div className="opening-in-your-editor">
+          {opening && (
+            <>
+              Opening{" "}
+              <code>{opening.slice(opening.length - 50, opening.length)}</code>{" "}
+              in your editor...
+            </>
+          )}
+        </div>
+        {filtered && (
+          <Breadcrumb
+            pathname={pathname}
+            thisDoc={thisDoc}
+            openInYourEditor={openInYourEditor}
+          />
+        )}
+        {filtered && (
+          <FilterForm
+            pathname={pathname}
+            searchFilter={searchFilter}
+            onUpdate={(text: string, submitted: boolean) => {
+              setSearchFilter(text);
+              setSearchSubmitted(submitted);
+            }}
+            onGoUp={() => {
+              // Navigate to the parent! ...if possible
+              const split = pathname.split("/");
+              if (split.length >= 4) {
+                const parentPathname = split.slice(0, -1);
+                navigate(parentPathname.join("/"));
+              }
+            }}
+            onChangeHighlight={changeHighlight}
+          />
+        )}
+        {filtered &&
+          filtered.length === 0 &&
+          (searchFilter ? (
+            <em>nothing found</em>
+          ) : (
+            <em>has no further sub-documents</em>
+          ))}
+        {filtered && !searchFilter && <GoBackUp pathname={pathname} />}
+        {filtered && filtered.length > 0 && (
+          <ShowTree
+            filtered={filtered}
+            childCounts={childCounts}
+            highlightIndex={highlightIndex}
+            openInYourEditor={openInYourEditor}
+          />
+        )}
+        <p className="footer-note">
+          Note, this sitemap only shows documents. Not any other applications.
+        </p>
+      </div>
+    </PageContentContainer>
+  );
+}
+
+function GoBackUp({ pathname }: { pathname: string }) {
+  const parentPath = pathname.split("/").slice(0, -1);
+  if (parentPath.length <= 2) {
+    return null;
+  }
+  const parentBasename = parentPath[parentPath.length - 1];
+
+  return (
+    <p>
+      <Link to={parentPath.join("/")}>
+        ↖️ Back up to{" "}
+        {parentPath.length <= 3 ? <em>root</em> : <code>{parentBasename}</code>}
+      </Link>
+    </p>
+  );
+}
+
+function FilterForm({
+  pathname,
+  searchFilter,
+  onUpdate,
+  onGoUp,
+  onChangeHighlight,
+}: {
+  pathname: string;
+  searchFilter: string;
+  onUpdate: (text: string, submitted: boolean) => void;
+  onGoUp: () => void;
+  onChangeHighlight: (s: "up" | "down") => void;
+}) {
+  const [hideTip, setHideTip] = React.useState(false);
+
+  const [countBackspaces, setCountBackspaces] = React.useState(0);
+  React.useEffect(() => {
+    if (countBackspaces >= 2) {
+      setCountBackspaces(0);
+      onGoUp();
+    }
+  }, [countBackspaces, onGoUp]);
+
+  const inputRef = React.useRef<null | HTMLInputElement>(null);
+
+  const focusSearch = React.useCallback(
+    (event: KeyboardEvent) => {
+      if (inputRef.current && event.target) {
+        const target = event.target as HTMLElement;
+
+        if (target === inputRef.current) {
+          if (event.key === "ArrowDown") {
+            onChangeHighlight("down");
+          } else if (event.key === "ArrowUp") {
+            onChangeHighlight("up");
+          }
+        }
+
+        if (target.tagName === "INPUT" || target.tagName === "TEXTAREA") {
+          if (event.key === "Backspace" && event.target === inputRef.current) {
+            if (!searchFilter.trim()) {
+              setCountBackspaces((s) => s + 1);
+            }
+          } else {
+            setCountBackspaces(0);
+          }
+
+          if (event.key === "Escape") {
+            inputRef.current.blur();
+          }
+        } else {
+          if (event.key === "T" || event.key === "t") {
+            inputRef.current.focus();
+            setCountBackspaces(0);
+          }
+        }
+      }
+    },
+    [onChangeHighlight, searchFilter]
+  );
+
+  React.useEffect(() => {
+    window.document.addEventListener("keyup", focusSearch);
+    return () => {
+      window.document.removeEventListener("keyup", focusSearch);
+    };
+  }, [focusSearch]);
+  const prefixPathname = pathname.replace(`/_sitemap`, "/docs");
+
+  return (
+    <form
+      className="filter-form"
+      onSubmit={(event) => {
+        event.preventDefault();
+        onUpdate(searchFilter.trim(), true);
+      }}
+    >
+      <code>{prefixPathname}</code>/
+      <input
+        type="search"
+        ref={inputRef}
+        value={searchFilter}
+        onChange={(event) => {
+          onUpdate(event.target.value, false);
+        }}
+        onFocus={() => {
+          setHideTip(true);
+        }}
+        onBlur={() => {
+          setHideTip(false);
+        }}
+      />{" "}
+      {!hideTip && (
+        <small className="keyboard-tip">
+          Tip! press <kbd>t</kbd> on your keyboard to focus on search filter
+        </small>
+      )}
+    </form>
+  );
+}
+
+function Breadcrumb({
+  pathname,
+  thisDoc,
+  openInYourEditor,
+}: {
+  pathname: string;
+  thisDoc: SearchIndexDoc | null;
+  openInYourEditor: (url: string) => void;
+}) {
+  const locale = useLocale();
+  const split = pathname.split("/").slice(3);
+  const root = pathname.split("/").slice(0, 2);
+  root.push("_sitemap");
+
+  return (
+    <>
+      <ul className="breadcrumb">
+        <li className="first">
+          {split.length ? <Link to={root.join("/")}>root</Link> : <em>root</em>}
+        </li>
+        {split.map((portion, i) => {
+          const last = i === split.length - 1;
+          root.push(portion);
+          return (
+            <li key={`${portion}${i}`} className={last ? "last" : undefined}>
+              {last ? (
+                <code>{portion}</code>
+              ) : (
+                <Link to={root.join("/")}>
+                  <code>{portion}</code>
+                </Link>
+              )}
+            </li>
+          );
+        })}
+        <li className="this-doc">
+          <b>Go to:</b>{" "}
+          {thisDoc ? (
+            <>
+              <Link to={thisDoc.url}>
+                <em>{thisDoc.title}</em>
+              </Link>{" "}
+              {CRUD_MODE && (
+                <small>
+                  (
+                  <a
+                    href={thisDoc.url}
+                    role="img"
+                    aria-label="Editor pen"
+                    onClick={(event) => {
+                      event.preventDefault();
+                      openInYourEditor(thisDoc.url);
+                    }}
+                    title="Open in your editor"
+                  >
+                    Edit
+                  </a>
+                  )
+                </small>
+              )}
+            </>
+          ) : (
+            <Link to={`/${locale}/`}>Home page</Link>
+          )}
+        </li>
+      </ul>
+    </>
+  );
+}
+
+function ShowTree({
+  filtered,
+  childCounts,
+  highlightIndex,
+  openInYourEditor,
+}: {
+  filtered: SearchIndexDoc[];
+  childCounts: Map<string, number>;
+  highlightIndex: number;
+  openInYourEditor: (url: string) => void;
+}) {
+  const locale = useLocale();
+  return (
+    <div className="tree">
+      <ul>
+        {filtered.map((doc, i) => {
+          const countChild = childCounts.get(doc.url) || 0;
+          return (
+            <li
+              key={doc.url}
+              className={highlightIndex === i ? "highlight" : undefined}
+            >
+              <Link
+                to={doc.url.replace("/docs/", "/_sitemap/")}
+                title={doc.title}
+              >
+                <code>{doc.url.replace(`/${locale}/docs`, "")}</code>
+              </Link>{" "}
+              <small>
+                (
+                {countChild === 1
+                  ? "1 document"
+                  : `${countChild.toLocaleString()} documents`}
+                {" | "}
+                <Link to={doc.url} title={`Go to: ${doc.title}`}>
+                  View
+                </Link>
+                {" | "}
+                <Link
+                  to={doc.url}
+                  title={`Edit: ${doc.title}`}
+                  onClick={(event) => {
+                    event.preventDefault();
+                    openInYourEditor(doc.url);
+                  }}
+                >
+                  Edit
+                </Link>
+                )
+              </small>
+            </li>
+          );
+        })}
+      </ul>
+    </div>
+  );
+}
diff --git a/client/src/writers-homepage/index.tsx b/client/src/writers-homepage/index.tsx
index 8895645b4a46..487ebc84996a 100644
--- a/client/src/writers-homepage/index.tsx
+++ b/client/src/writers-homepage/index.tsx
@@ -81,6 +81,9 @@ export default function WritersHomepage() {
         </ul>
         <h3>Tools</h3>
         <ul>
+          <li>
+            <Link to="/en-US/_sitemap">Sitemap</Link>
+          </li>
           <li>
             <Link to="/en-US/_flaws">Flaws Dashboard</Link>
           </li>
diff --git a/server/index.js b/server/index.js
index 4a4cf7f416ba..21d6b1147948 100644
--- a/server/index.js
+++ b/server/index.js
@@ -93,11 +93,7 @@ app.use(express.urlencoded({ extended: true }));
 app.use("/_document", documentRouter);
 
 app.get("/_open", (req, res) => {
-  const { line, column, filepath } = req.query;
-  if (!filepath) {
-    throw new Error("No .filepath in the request query");
-  }
-
+  const { line, column, filepath, url } = req.query;
   // Sometimes that 'filepath' query string parameter is a full absolute
   // filepath (e.g. /Users/peterbe/yari/content.../index.html), which usually
   // happens when you this is used from the displayed flaws on a preview
@@ -105,12 +101,22 @@ app.get("/_open", (req, res) => {
   // But sometimes, it's a relative path and if so, it's always relative
   // to the main builder source.
   let absoluteFilepath;
-  if (fs.existsSync(filepath)) {
-    absoluteFilepath = filepath;
+  if (filepath) {
+    if (fs.existsSync(filepath)) {
+      absoluteFilepath = filepath;
+    } else {
+      const [locale] = filepath.split(path.sep);
+      const root = getRoot(locale);
+      absoluteFilepath = path.join(root, filepath);
+    }
+  } else if (url) {
+    const document = Document.findByURL(url);
+    if (!document) {
+      res.status(410).send(`No known document by the URL '${url}'\n`);
+    }
+    absoluteFilepath = document.fileInfo.path;
   } else {
-    const [locale] = filepath.split(path.sep);
-    const root = getRoot(locale);
-    absoluteFilepath = path.join(root, filepath);
+    throw new Error("No .filepath or .url in the request query");
   }
 
   // Double-check that the file can be found.
diff --git a/testing/tests/developing.test.js b/testing/tests/developing.test.js
index 26935174ef98..66585fcd10e6 100644
--- a/testing/tests/developing.test.js
+++ b/testing/tests/developing.test.js
@@ -187,4 +187,14 @@ describe("Testing the CRUD apps", () => {
     await expect(page).toClick("a", { text: "Flaws Dashboard" });
     await expect(page).toMatch("Documents with flaws found (0)");
   });
+
+  withCrud("open the sitemap app", async () => {
+    await page.goto(devURL("/"));
+    await expect(page).toMatch("Writer's home page");
+    await expect(page).toClick("a", { text: "Sitemap" });
+    await expect(page).toMatchElement("a", { text: "Web" });
+    await expect(page).toMatchElement("a", { text: "Learn" });
+    await expect(page).toClick("a", { text: "Glossary" });
+    await expect(page).toMatchElement("a", { text: "Glossary/PNG" });
+  });
 });

From 1c79f9a24a110680ec30d800ebef5b4ca803c948 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 15 Mar 2021 08:48:10 -0400
Subject: [PATCH 009/288] calm down gather-git-history (#3243)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 925e4c083ae1..dd779ebd6cf8 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "filecheck": "cd filecheck && node cli.js",
     "fiori:build": "cd client && build-storybook",
     "fiori:start": "cd client && start-storybook -p 6006",
-    "prepare-build": "yarn build:client && yarn build:ssr && yarn tool google-analytics-code && yarn tool spas && yarn tool gather-git-history --verbose",
+    "prepare-build": "yarn build:client && yarn build:ssr && yarn tool google-analytics-code && yarn tool spas && yarn tool gather-git-history",
     "prettier-check": "prettier --check .",
     "prettier-format": "prettier --write .",
     "start": "(test -f client/build/index.html || yarn build:client) && (test -f ssr/dist/main.js || yarn build:ssr) && (test -d client/build/en-us/_spas || yarn tool spas) && nf -j Procfile.start start",

From 0a194ed4a5ea7e37d39db44a0604694129709f49 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 15 Mar 2021 08:49:45 -0400
Subject: [PATCH 010/288] make keys for MacroPagesErrors more unique (#3185)

* make keys for MacroPagesErrors more unique

Fixes #3184

* make keys for MacroPagesErrors more unique

Fixes #3184

* Revert "make keys for MacroPagesErrors more unique"

This reverts commit abd4918c45edeed1eb66ae71f394e5ff0c1c80a1.

* feedbacked
---
 client/src/document/toolbar/flaws.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/client/src/document/toolbar/flaws.tsx b/client/src/document/toolbar/flaws.tsx
index fe2696286e07..076428db36e9 100644
--- a/client/src/document/toolbar/flaws.tsx
+++ b/client/src/document/toolbar/flaws.tsx
@@ -625,7 +625,7 @@ function Macros({
     };
   }, [opening]);
 
-  function openInEditor(msg: MacroErrorMessage, key: string) {
+  function openInEditor(msg: MacroErrorMessage, id: string) {
     const sp = new URLSearchParams();
     sp.set("filepath", msg.filepath);
     sp.set("line", `${msg.line}`);
@@ -633,7 +633,7 @@ function Macros({
     console.log(
       `Going to try to open ${msg.filepath}:${msg.line}:${msg.column} in your editor`
     );
-    setOpening(key);
+    setOpening(id);
     fetch(`/_open?${sp.toString()}`);
   }
 
@@ -644,11 +644,9 @@ function Macros({
         const inPrerequisiteMacro = !flaw.filepath.includes(
           `${sourceFolder}/index.html`
         );
-        const key = `${flaw.filepath}:${flaw.line}:${flaw.column}`;
-
         return (
           <details
-            key={key}
+            key={flaw.id}
             className={flaw.fixed ? "fixed_flaw" : undefined}
             title={
               flaw.fixed
@@ -661,13 +659,13 @@ function Macros({
                 href={`file://${flaw.filepath}`}
                 onClick={(event: React.MouseEvent) => {
                   event.preventDefault();
-                  openInEditor(flaw, key);
+                  openInEditor(flaw, flaw.id);
                 }}
               >
                 <code>{flaw.name}</code> from <code>{flaw.macroName}</code> in
                 line {flaw.line}:{flaw.column}
               </a>{" "}
-              {opening && opening === key && <span>Opening...</span>}{" "}
+              {opening && opening === flaw.id && <span>Opening...</span>}{" "}
               {inPrerequisiteMacro && (
                 <span
                   className="macro-filepath-in-prerequisite"

From a8df40e0645fafd26e9e89b56332985fe26df343 Mon Sep 17 00:00:00 2001
From: Florian Dieminger <me@fiji-flo.de>
Date: Mon, 15 Mar 2021 14:17:05 +0100
Subject: [PATCH 011/288] make ru locale active (#3242)

---
 libs/constants/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/constants/index.js b/libs/constants/index.js
index 242785e30e95..5e792969be50 100644
--- a/libs/constants/index.js
+++ b/libs/constants/index.js
@@ -51,7 +51,7 @@ const LOCALE_ALIASES = new Map([
 // This must match what we do in `language-menu/index.tsx` where the cookie
 // gets set in the client!
 const PREFERRED_LOCALE_COOKIE_NAME = "preferredlocale";
-const ACTIVE_LOCALES = new Set(["en-us", "fr", "ja", "zh-cn", "zh-tw"]);
+const ACTIVE_LOCALES = new Set(["en-us", "fr", "ja", "ru", "zh-cn", "zh-tw"]);
 
 module.exports = {
   ACTIVE_LOCALES,

From 65f1627b4f07baa9014366e786134460df93a016 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Mar 2021 13:41:29 +0000
Subject: [PATCH 012/288] build(deps): bump image-size from 0.9.5 to 0.9.7
 (#3246)

---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index dd779ebd6cf8..327b689018de 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "glob": "^7.1.6",
     "got": "11.8.2",
     "http-proxy-middleware": "1.0.6",
-    "image-size": "0.9.5",
+    "image-size": "0.9.7",
     "image-type": "4.1.0",
     "imagemin": "7.0.1",
     "imagemin-gifsicle": "7.0.0",
diff --git a/yarn.lock b/yarn.lock
index e535e1d69278..a520c561ceb9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9576,12 +9576,12 @@ ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
-image-size@0.9.5:
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.9.5.tgz#03a4224c5b643d2a0a7d21ee561cf7edf8985421"
-  integrity sha512-HvnQBt6+u5PjmZvaFpJOB1VfrDdwxu8p456HAfYXPzEKl6GJKrNJZKDaN0A/0b1kJ7JpDUU6eBT7hmiREwzqWA==
+image-size@0.9.7:
+  version "0.9.7"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.9.7.tgz#43b4ead4b1310d5ae310a559d52935a347e47c09"
+  integrity sha512-KRVgLNZkr00YGN0qn9MlIrmlxbRhsCcEb1Byq3WKGnIV4M48iD185cprRtaoK4t5iC+ym2Q5qlArxZ/V1yzDgA==
   dependencies:
-    queue "6.0.1"
+    queue "6.0.2"
 
 image-type@4.1.0:
   version "4.1.0"
@@ -14560,10 +14560,10 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
   integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
-queue@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.1.tgz#abd5a5b0376912f070a25729e0b6a7d565683791"
-  integrity sha512-AJBQabRCCNr9ANq8v77RJEv73DPbn55cdTb+Giq4X0AVnNVZvMHlYp7XlQiN+1npCZj1DuSmaA2hYVUUDgxFDg==
+queue@6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65"
+  integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==
   dependencies:
     inherits "~2.0.3"
 

From 817860ebe713d270f4d9e6fedf32b152efe7c25a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Mar 2021 11:24:58 -0400
Subject: [PATCH 013/288] build(deps-dev): bump @mdn/minimalist from 0.7.3 to
 0.7.4 (#3247)

Bumps [@mdn/minimalist](https://github.com/mdn/mdn-minimalist) from 0.7.3 to 0.7.4.
- [Release notes](https://github.com/mdn/mdn-minimalist/releases)
- [Changelog](https://github.com/mdn/mdn-minimalist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mdn/mdn-minimalist/compare/v0.7.3...v0.7.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[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 327b689018de..dd94da3c06ae 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
   "devDependencies": {
     "@babel/core": "^7.13.10",
     "@mdn/dinocons": "^0.3.0",
-    "@mdn/minimalist": "^0.7.3",
+    "@mdn/minimalist": "^0.7.4",
     "@storybook/addon-a11y": "^6.1.21",
     "@storybook/addon-actions": "^6.1.21",
     "@storybook/addon-essentials": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index a520c561ceb9..74ec9deb093c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1894,10 +1894,10 @@
   resolved "https://registry.yarnpkg.com/@mdn/dinocons/-/dinocons-0.3.0.tgz#2162eb6c12b36dd9bfc69f344d9150b4b5a3c9ad"
   integrity sha512-++oqKEzbWtc4DHELnS9R6HoGt+7AGRe2zlxTyk5YCSwouIIiI4DEGuoMCdtBCrZOoHtp2WHZ1mZ6BqEmQh8hLA==
 
-"@mdn/minimalist@^0.7.3":
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/@mdn/minimalist/-/minimalist-0.7.3.tgz#e3f0773f94d1ea0578a4b16c19e604ebb4ef294b"
-  integrity sha512-4cYfO5SrRSyRY4RUusUK4alMsFZlUD0801Z3t2hQqdXE28QDFLRUNKa/B0Fk6hBs0Y3b3z4rhql+dYmyOE1dBA==
+"@mdn/minimalist@^0.7.4":
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/@mdn/minimalist/-/minimalist-0.7.4.tgz#83e6bfba5d0ded8d05e0b72f92123ea1d77ec1fb"
+  integrity sha512-5n0cB1HCdRe6Mw78+SFG3UZkXx2xcuv33SfnPTU9dQAFQ13JOjwACJrNBvQZdqtjo2+hjXi6Xu50eyf5tP30Sg==
 
 "@mdx-js/loader@^1.6.19":
   version "1.6.21"

From 51dcc558437d6d4502b456fb65fccc39b566813b Mon Sep 17 00:00:00 2001
From: Florian Dieminger <me@fiji-flo.de>
Date: Mon, 15 Mar 2021 18:55:49 +0100
Subject: [PATCH 014/288] generate pre in CSSSyntax (#3244)

---
 kumascript/macros/CSSSyntax.ejs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kumascript/macros/CSSSyntax.ejs b/kumascript/macros/CSSSyntax.ejs
index 7af7ca7d2b59..ae52914abe0b 100644
--- a/kumascript/macros/CSSSyntax.ejs
+++ b/kumascript/macros/CSSSyntax.ejs
@@ -433,4 +433,8 @@ if (!formattedSyntax) {
     throw new Error(`No syntax found in DB for '${name}'`);
 }
 
-%><%- formattedSyntax %>
+const rtlLocales = ['ar', 'he', 'fa'];
+const rtl = rtlLocales.includes(env.locale);
+const out = `<pre${rtl ? ' dir="rtl"' : ""}>${formattedSyntax}</pre>`
+
+%><%- out %>

From 8556a9e4479276bf5d5f4b9ce8d38c0d59e42301 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 15 Mar 2021 19:10:19 -0400
Subject: [PATCH 015/288] Check of unsafe HTML in SVG files (#3250)

* Check of unsafe HTML in SVG files

Fixes #3249

* mention in index.html file

* feedbacked
---
 filecheck/checker.js                    | 17 ++++++++++++++---
 testing/tests/filecheck.test.js         | 25 +++++++++++++++++++++++++
 testing/tests/samplefiles/index.html    |  3 +++
 testing/tests/samplefiles/onhandler.svg |  3 +++
 testing/tests/samplefiles/script.svg    |  3 +++
 5 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 testing/tests/filecheck.test.js
 create mode 100644 testing/tests/samplefiles/index.html
 create mode 100644 testing/tests/samplefiles/onhandler.svg
 create mode 100644 testing/tests/samplefiles/script.svg

diff --git a/filecheck/checker.js b/filecheck/checker.js
index 4b9049656d82..bc892949fb87 100644
--- a/filecheck/checker.js
+++ b/filecheck/checker.js
@@ -62,9 +62,20 @@ async function checkFile(filePath, options) {
       throw new Error(`${filePath} does not appear to be an SVG`);
     }
     const $ = cheerio.load(content);
-    if ($("script").length) {
-      throw new Error(`${filePath} contains a <script> tag`);
-    }
+    const disallowedTagNames = new Set(["script", "object", "iframe", "embed"]);
+    $("*").each((i, element) => {
+      const { tagName } = element;
+      if (disallowedTagNames.has(tagName)) {
+        throw new Error(`${filePath} contains a <${tagName}> tag`);
+      }
+      for (const key in element.attribs) {
+        if (/(\\x[a-f0-9]{2}|\b)on\w+/.test(key)) {
+          throw new Error(
+            `${filePath} <${tagName}> contains an unsafe attribute: '${key}'`
+          );
+        }
+      }
+    });
   } else {
     // Check that the file extension matches the file header.
     const fileType = await FileType.fromFile(filePath);
diff --git a/testing/tests/filecheck.test.js b/testing/tests/filecheck.test.js
new file mode 100644
index 000000000000..8dcc89ead234
--- /dev/null
+++ b/testing/tests/filecheck.test.js
@@ -0,0 +1,25 @@
+const fs = require("fs");
+const path = require("path");
+
+const { checkFile } = require("../../filecheck/checker");
+
+const SAMPLES_DIRECTORY = path.join(__dirname, "samplefiles");
+
+describe("checking files", () => {
+  it("should spot SVGs with scripts inside them", async () => {
+    const filePath = path.join(SAMPLES_DIRECTORY, "script.svg");
+    // Sanity check the test itself
+    console.assert(fs.existsSync(filePath), `${filePath} does not exist`);
+    await expect(checkFile(filePath)).rejects.toThrow(
+      "contains a <script> tag"
+    );
+  });
+  it("should spot SVGs with onLoad inside an element", async () => {
+    const filePath = path.join(SAMPLES_DIRECTORY, "onhandler.svg");
+    // Sanity check the test itself
+    console.assert(fs.existsSync(filePath), `${filePath} does not exist`);
+    await expect(checkFile(filePath)).rejects.toThrow(
+      "<path> contains an unsafe attribute: 'onload'"
+    );
+  });
+});
diff --git a/testing/tests/samplefiles/index.html b/testing/tests/samplefiles/index.html
new file mode 100644
index 000000000000..43cdfe75b71a
--- /dev/null
+++ b/testing/tests/samplefiles/index.html
@@ -0,0 +1,3 @@
+<!-- Must be mention in the adjacent index.html file -->
+<img src="script.svg" />
+<img src="onhandler.svg" />
diff --git a/testing/tests/samplefiles/onhandler.svg b/testing/tests/samplefiles/onhandler.svg
new file mode 100644
index 000000000000..c2c92e81edc1
--- /dev/null
+++ b/testing/tests/samplefiles/onhandler.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="42.667" height="25.6"
+viewBox="0 0 40 24"><path oNload=alert(1) d="M28 0l4.59 4.59-9.76 9.75-8-8L0 21.17
+2.83 24l12-12 8 8L35.41 7.41 40 12V0z"/></svg>
diff --git a/testing/tests/samplefiles/script.svg b/testing/tests/samplefiles/script.svg
new file mode 100644
index 000000000000..26471905890a
--- /dev/null
+++ b/testing/tests/samplefiles/script.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="42.667" height="25.6"
+viewBox="0 0 40 24"><path d="M28 0l4.59 4.59-9.76 9.75-8-8L0 21.17
+2.83 24l12-12 8 8L35.41 7.41 40 12V0z"/><Script>alert(1)</script></svg>

From 9fb7ce0a72c140ec1166e6b3d1399bfeaf882491 Mon Sep 17 00:00:00 2001
From: Sebastian Zartner <sebastianzartner@gmail.com>
Date: Tue, 16 Mar 2021 00:15:20 +0100
Subject: [PATCH 016/288] Added CSS Cascade Level 5 spec. to SpecData macro
 (#3227)

---
 kumascript/macros/SpecData.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kumascript/macros/SpecData.json b/kumascript/macros/SpecData.json
index 2f2e216ccc5d..01908ad3cf74 100644
--- a/kumascript/macros/SpecData.json
+++ b/kumascript/macros/SpecData.json
@@ -484,6 +484,11 @@
     "url": "https://drafts.csswg.org/css-writing-modes-4/",
     "status": "CR"
   },
+  "CSS5 Cascade": {
+    "name": "CSS Cascading and Inheritance Level&nbsp;5",
+    "url": "https://drafts.csswg.org/css-cascade-5/",
+    "status": "WD"
+  },
   "CSS5 Media Queries": {
     "name": "Media Queries Level&nbsp;5",
     "url": "https://drafts.csswg.org/mediaqueries-5/",

From e5e65c4be334ce20b7c3c3dd066ab1b8e22e5d27 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 15 Mar 2021 19:24:39 -0400
Subject: [PATCH 017/288] only run scheduled workflows on mdn/yari (#3245)

Part of #3229
---
 .github/workflows/prod-build.yml  | 3 +++
 .github/workflows/stage-build.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
index faf02fdee7b6..c69e4e379b7a 100644
--- a/.github/workflows/prod-build.yml
+++ b/.github/workflows/prod-build.yml
@@ -51,6 +51,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
+    # Only run the scheduled workflows on the main repo.
+    if: github.repository == 'mdn/yari'
+
     steps:
       - uses: actions/checkout@v2
 
diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
index 527987bd1184..29b5790b82f8 100644
--- a/.github/workflows/stage-build.yml
+++ b/.github/workflows/stage-build.yml
@@ -51,6 +51,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
+    # Only run the scheduled workflows on the main repo.
+    if: github.repository == 'mdn/yari'
+
     steps:
       - uses: actions/checkout@v2
 

From 5e6d3b74956b40340c2e6e0e65562a67a9314c68 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 15 Mar 2021 20:18:55 -0400
Subject: [PATCH 018/288] doing some more filecheck tests (#3251)

---
 testing/tests/filecheck.test.js      |  23 +++++++++++++++++++++++
 testing/tests/samplefiles/orphan.png | Bin 0 -> 592 bytes
 testing/tests/samplefiles/png.jpeg   | Bin 0 -> 592 bytes
 testing/tests/samplefiles/zero.gif   |   0
 4 files changed, 23 insertions(+)
 create mode 100644 testing/tests/samplefiles/orphan.png
 create mode 100644 testing/tests/samplefiles/png.jpeg
 create mode 100644 testing/tests/samplefiles/zero.gif

diff --git a/testing/tests/filecheck.test.js b/testing/tests/filecheck.test.js
index 8dcc89ead234..5871fe713f1a 100644
--- a/testing/tests/filecheck.test.js
+++ b/testing/tests/filecheck.test.js
@@ -22,4 +22,27 @@ describe("checking files", () => {
       "<path> contains an unsafe attribute: 'onload'"
     );
   });
+
+  it("should spot files that are not mentioned in source", async () => {
+    const filePath = path.join(SAMPLES_DIRECTORY, "orphan.png");
+    // Sanity check the test itself
+    console.assert(fs.existsSync(filePath), `${filePath} does not exist`);
+    await expect(checkFile(filePath)).rejects.toThrow("is not mentioned in");
+  });
+
+  it("should spot files that are completely empty", async () => {
+    const filePath = path.join(SAMPLES_DIRECTORY, "zero.gif");
+    // Sanity check the test itself
+    console.assert(fs.existsSync(filePath), `${filePath} does not exist`);
+    await expect(checkFile(filePath)).rejects.toThrow("is 0 bytes");
+  });
+
+  it("should spot mismatch between file-type and file extension", async () => {
+    const filePath = path.join(SAMPLES_DIRECTORY, "png.jpeg");
+    // Sanity check the test itself
+    console.assert(fs.existsSync(filePath), `${filePath} does not exist`);
+    await expect(checkFile(filePath)).rejects.toThrow(
+      "is type 'image/png' but named extension is '.jpeg'"
+    );
+  });
 });
diff --git a/testing/tests/samplefiles/orphan.png b/testing/tests/samplefiles/orphan.png
new file mode 100644
index 0000000000000000000000000000000000000000..791501245adad69de482b0346060771ccd008719
GIT binary patch
literal 592
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP
zfk$L9kgfz_MvJW-LO=$4iKnkC`(rj~em?#{n~4*ELc2X(978nDC#U>4-ym*aXb`ZX
zf%RaI&FufZ{kh-YYp+p1qNlBN<iGKs^dIN{JpVNDKgWmIKfEq;9@;Y>u5bI_^IuQF
z`#%tT{yJ&#8~X=b*W`YD|7g$lqlWinOK`h^=$~r#@B_cR-(Fms{Nj^4{{c~hKjPK5
z%Q(``uKJslzgI8no<ore$RxMz3$5xm|84lq5XpG>|0(7F`~Uv`|6H=mWD`@{|1|S_
z`QJ6N{Xizq|JM5pKS^r#`7%7b{CKnD_AFtbH&jbpBT7;dOH!?pi&B9UgOP!urLKXQ
zu910&p{bRjiIt(Lwt<nAfq~4`Er(Gw<mRVjrd8tBklVpi57ZzDvLQG>t)x7$D3zhS
zyj(9cFS|H7u^?41zbJk7I~ysWqVTGah?1bha)pAT{ItxRRE3htf>edff|6tghKf0l
zKk;xBhG}S=@;`mX^Jx$Rvog0{GPkg@u=ivUW?==F29v`n%*vZX6i(l`a^lFDBQi(W
fPd9ih@X}*=B`#R<$;oso&<X}mS3j3^P6<r_JD}SL

literal 0
HcmV?d00001

diff --git a/testing/tests/samplefiles/png.jpeg b/testing/tests/samplefiles/png.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..791501245adad69de482b0346060771ccd008719
GIT binary patch
literal 592
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP
zfk$L9kgfz_MvJW-LO=$4iKnkC`(rj~em?#{n~4*ELc2X(978nDC#U>4-ym*aXb`ZX
zf%RaI&FufZ{kh-YYp+p1qNlBN<iGKs^dIN{JpVNDKgWmIKfEq;9@;Y>u5bI_^IuQF
z`#%tT{yJ&#8~X=b*W`YD|7g$lqlWinOK`h^=$~r#@B_cR-(Fms{Nj^4{{c~hKjPK5
z%Q(``uKJslzgI8no<ore$RxMz3$5xm|84lq5XpG>|0(7F`~Uv`|6H=mWD`@{|1|S_
z`QJ6N{Xizq|JM5pKS^r#`7%7b{CKnD_AFtbH&jbpBT7;dOH!?pi&B9UgOP!urLKXQ
zu910&p{bRjiIt(Lwt<nAfq~4`Er(Gw<mRVjrd8tBklVpi57ZzDvLQG>t)x7$D3zhS
zyj(9cFS|H7u^?41zbJk7I~ysWqVTGah?1bha)pAT{ItxRRE3htf>edff|6tghKf0l
zKk;xBhG}S=@;`mX^Jx$Rvog0{GPkg@u=ivUW?==F29v`n%*vZX6i(l`a^lFDBQi(W
fPd9ih@X}*=B`#R<$;oso&<X}mS3j3^P6<r_JD}SL

literal 0
HcmV?d00001

diff --git a/testing/tests/samplefiles/zero.gif b/testing/tests/samplefiles/zero.gif
new file mode 100644
index 000000000000..e69de29bb2d1

From 56cb99f28a265dec47619c5d23c8d229d4fa6aa1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Mar 2021 07:01:39 +0000
Subject: [PATCH 019/288] build(deps): bump boto3 from 1.17.26 to 1.17.28 in
 /deployer (#3252)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 239c4c55ee5b..8f56f326bbf6 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.26"
+version = "1.17.28"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.26,<1.21.0"
+botocore = ">=1.20.28,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.26"
+version = "1.20.28"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -479,7 +479,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "9c23cadee62150680d858c7c4ea9c46d43bc1d77d410f766872a3c47a64723c7"
+content-hash = "a66c51cb8338c0f22b775dd06bcc4c468e8f97277006e1953cbb2440f210bc84"
 
 [metadata.files]
 appdirs = [
@@ -498,12 +498,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.26-py2.py3-none-any.whl", hash = "sha256:8e9ff8006c41889ed8a11831dee62adf922e071f14d54c52946d1f7855ae7a8e"},
-    {file = "boto3-1.17.26.tar.gz", hash = "sha256:64a8900b3a110e2d6ff4d87f4d8cd56f0c8527361d9fc9385fcb50efe7a4975a"},
+    {file = "boto3-1.17.28-py2.py3-none-any.whl", hash = "sha256:442c8579541661ab1dbbd2013d646506633bd1435368c217bd38acc01696992d"},
+    {file = "boto3-1.17.28.tar.gz", hash = "sha256:ba13bda83ca1a26469fdf5130bb7a8f671dd807d0551e3242cafc8c44caab057"},
 ]
 botocore = [
-    {file = "botocore-1.20.26-py2.py3-none-any.whl", hash = "sha256:d27cbe115a25bfa82b851861b62d71fc771c2883bf5645bf37a7c0114789407c"},
-    {file = "botocore-1.20.26.tar.gz", hash = "sha256:4a785847a351e59f2329627fc9a19cf50f07644ea68996a1595d5a20487a423f"},
+    {file = "botocore-1.20.28-py2.py3-none-any.whl", hash = "sha256:75e6cfa246ec14863742c79ab8ddd887bd1b48c3d44268d53d69a5c6f472dee0"},
+    {file = "botocore-1.20.28.tar.gz", hash = "sha256:6dde07154c37b552f52cbf8041541c5460a29d916f527b2098a36d44496c7126"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index b607840d70cd..00f0a2cdb4ef 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.26"
+boto3 = "^1.17.28"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 98788b878f90c6a8ec051d0170b32c4e012d8642 Mon Sep 17 00:00:00 2001
From: Florian Dieminger <me@fiji-flo.de>
Date: Tue, 16 Mar 2021 16:42:04 +0100
Subject: [PATCH 020/288] convert *_ROOT env to absolute paths (#3255)

fixes #3220
---
 content/constants.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/content/constants.js b/content/constants.js
index 0088595db15d..74e8afaee1ba 100644
--- a/content/constants.js
+++ b/content/constants.js
@@ -10,6 +10,7 @@ let CONTENT_ROOT = process.env.CONTENT_ROOT;
 if (!CONTENT_ROOT) {
   throw new Error("Env var CONTENT_ROOT must be set");
 }
+CONTENT_ROOT = fs.realpathSync(CONTENT_ROOT);
 if (
   path.basename(CONTENT_ROOT) !== "files" &&
   fs.existsSync(path.join(CONTENT_ROOT, "files"))
@@ -23,8 +24,8 @@ if (
   throw new Error(`${path.resolve(CONTENT_ROOT)} does not exist`);
 }
 
-const CONTENT_ARCHIVED_ROOT = process.env.CONTENT_ARCHIVED_ROOT;
-const CONTENT_TRANSLATED_ROOT = process.env.CONTENT_TRANSLATED_ROOT;
+let CONTENT_ARCHIVED_ROOT = process.env.CONTENT_ARCHIVED_ROOT;
+let CONTENT_TRANSLATED_ROOT = process.env.CONTENT_TRANSLATED_ROOT;
 
 // This makes it possible to know, give a root folder, what is the name of
 // the repository on GitHub.
@@ -41,6 +42,7 @@ if (CONTENT_ARCHIVED_ROOT) {
   if (!fs.existsSync(CONTENT_ARCHIVED_ROOT)) {
     throw new Error(`${path.resolve(CONTENT_ARCHIVED_ROOT)} does not exist`);
   }
+  CONTENT_ARCHIVED_ROOT = fs.realpathSync(CONTENT_ARCHIVED_ROOT);
   ROOTS.push(CONTENT_ARCHIVED_ROOT);
   REPOSITORY_URLS[CONTENT_ARCHIVED_ROOT] = "mdn/archived-content";
 }
@@ -48,6 +50,7 @@ if (CONTENT_TRANSLATED_ROOT) {
   if (!fs.existsSync(CONTENT_TRANSLATED_ROOT)) {
     throw new Error(`${path.resolve(CONTENT_TRANSLATED_ROOT)} does not exist`);
   }
+  CONTENT_TRANSLATED_ROOT = fs.realpathSync(CONTENT_TRANSLATED_ROOT);
   ROOTS.push(CONTENT_TRANSLATED_ROOT);
   REPOSITORY_URLS[CONTENT_TRANSLATED_ROOT] = "mdn/translated-content";
 }

From f72618bf577da36979face46b5c4f7786873b2f1 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 16 Mar 2021 13:17:06 -0400
Subject: [PATCH 021/288] Broken link checkers should fallback to en-US if
 possible (#3254)

* Broken link checkers should fallback nicely to English if need be

Fixes #3104

* remove debugging

* adding tests
---
 build/flaws.js                                | 73 ++++++++++++++++---
 kumascript/src/api/web.js                     |  2 +-
 testing/tests/index.test.js                   | 26 +++++++
 .../files/fr/web/foo/index.html               | 12 +++
 4 files changed, 103 insertions(+), 10 deletions(-)

diff --git a/build/flaws.js b/build/flaws.js
index 3f916527c532..6426a47daa74 100644
--- a/build/flaws.js
+++ b/build/flaws.js
@@ -25,6 +25,7 @@ const {
 } = require("./matches-in-text");
 const { humanFileSize } = require("./utils");
 const { VALID_MIME_TYPES } = require("../filecheck/constants");
+const { DEFAULT_LOCALE } = require("../libs/constants");
 
 function injectFlaws(doc, $, options, document) {
   if (doc.isArchive) return;
@@ -204,21 +205,37 @@ function injectBrokenLinksFlaws(doc, $, { rawContent }, level) {
   // us from calling `findMatchesInText()` more than once.
   const matches = new Map();
 
+  function mutateLink($element, suggestion, enUSFallback) {
+    if (suggestion) {
+      $element.attr("href", suggestion);
+    } else if (enUSFallback) {
+      $element.attr("href", enUSFallback);
+      // This functionality here should match what we do inside
+      // the `web.smartLink()` function in kumascript rendering.
+      $element.text(`${$element.text()} (${DEFAULT_LOCALE})`);
+      $element.addClass("only-in-en-us");
+      $element.attr("title", "Currently only available in English (US)");
+    } else {
+      throw new Error("Don't use this function if neither is true");
+    }
+  }
+
   // A closure function to help making it easier to append flaws
   function addBrokenLink(
     $element,
     index,
     href,
     suggestion = null,
-    explanation
+    explanation = null,
+    enUSFallback = null
   ) {
     if (level === FLAW_LEVELS.IGNORE) {
       // Note, even if not interested in flaws, we still need to apply the
       // suggestion. For example, in production builds, we don't care about
       // logging flaws, but because not all `broken_links` flaws have been
       // manually fixed at the source.
-      if (suggestion) {
-        $element.attr("href", suggestion);
+      if (suggestion || enUSFallback) {
+        mutateLink($element, suggestion, enUSFallback);
       }
       return;
     }
@@ -245,10 +262,9 @@ function injectBrokenLinksFlaws(doc, $, { rawContent }, level) {
         doc.flaws.broken_links = [];
       }
       const id = `link${doc.flaws.broken_links.length + 1}`;
-      let fixable = false;
-      if (suggestion) {
-        $element.attr("href", suggestion);
-        fixable = true;
+      const fixable = !!suggestion;
+      if (suggestion || enUSFallback) {
+        mutateLink($element, suggestion, enUSFallback);
       }
       $element.attr("data-flaw", id);
       doc.flaws.broken_links.push(
@@ -297,7 +313,8 @@ function injectBrokenLinksFlaws(doc, $, { rawContent }, level) {
           !Image.findByURL(hrefNormalized) &&
           !Archive.isArchivedURL(hrefNormalized)
         ) {
-          // Before we give up, check if it's a redirect.
+          // Even if it's a redirect, it's still a flaw, but it'll be nice to
+          // know what it *should* be.
           const resolved = Redirect.resolve(hrefNormalized);
           if (resolved !== hrefNormalized) {
             addBrokenLink(
@@ -307,7 +324,45 @@ function injectBrokenLinksFlaws(doc, $, { rawContent }, level) {
               resolved + absoluteURL.search + absoluteURL.hash.toLowerCase()
             );
           } else {
-            addBrokenLink(a, checked.get(href), href);
+            let enUSFallbackURL = null;
+            // Test if the document is a translated document and the link isn't
+            // to an en-US URL. We know the link is broken (in this locale!)
+            // but it might be "salvageable" if we link the en-US equivalent.
+            // This is, by the way, the same trick the `web.smartLink()` utility
+            // function does in kumascript rendering.
+            if (
+              doc.locale !== DEFAULT_LOCALE &&
+              href.startsWith(`/${doc.locale}/`)
+            ) {
+              // What if you swich to the English link; would th link work
+              // better then?
+              const enUSHrefNormalized = hrefNormalized.replace(
+                `/${doc.locale}/`,
+                `/${DEFAULT_LOCALE}/`
+              );
+              let enUSFound = Document.findByURL(enUSHrefNormalized);
+              if (enUSFound) {
+                enUSFallbackURL = enUSFound.url;
+              } else {
+                const enUSResolved = Redirect.resolve(enUSHrefNormalized);
+                if (enUSResolved !== enUSHrefNormalized) {
+                  enUSFallbackURL =
+                    enUSResolved +
+                    absoluteURL.search +
+                    absoluteURL.hash.toLowerCase();
+                }
+              }
+            }
+            addBrokenLink(
+              a,
+              checked.get(href),
+              href,
+              null,
+              enUSFallbackURL
+                ? "Can use the English (en-US) link as a fallback"
+                : null,
+              enUSFallbackURL
+            );
           }
         }
         // But does it have the correct case?!
diff --git a/kumascript/src/api/web.js b/kumascript/src/api/web.js
index 71e3c86c9e9a..f682e191e6f0 100644
--- a/kumascript/src/api/web.js
+++ b/kumascript/src/api/web.js
@@ -99,7 +99,7 @@ module.exports = {
         flawAttribute = ` data-flaw-src="${util.htmlEscape(flaw.macroSource)}"`;
         return (
           '<a class="only-in-en-us" ' +
-          'title="Currently only available in English" ' +
+          'title="Currently only available in English (US)" ' +
           `href="${enUSPage.url}"${flawAttribute}>${content} <span>(en-US)</span></a>`
         );
       }
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 9ee58b5ebc2e..dcd76fe36236 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -1299,3 +1299,29 @@ test("unsafe HTML gets flagged as flaws and replace with its raw HTML", () => {
   const $ = cheerio.load(html);
   expect($("code.unsafe-html").length).toBe(6);
 });
+
+test("translated content broken links can fall back to en-us", () => {
+  const builtFolder = path.join(buildRoot, "fr", "docs", "web", "foo");
+  const jsonFile = path.join(builtFolder, "index.json");
+
+  // We should be able to read it and expect certain values
+  const { doc } = JSON.parse(fs.readFileSync(jsonFile));
+  const map = new Map(doc.flaws.broken_links.map((x) => [x.href, x]));
+  expect(map.get("/fr/docs/Web/CSS/dumber").explanation).toBe(
+    "Can use the English (en-US) link as a fallback"
+  );
+  expect(map.get("/fr/docs/Web/CSS/number").explanation).toBe(
+    "Can use the English (en-US) link as a fallback"
+  );
+
+  const htmlFile = path.join(builtFolder, "index.html");
+  const html = fs.readFileSync(htmlFile, "utf-8");
+  const $ = cheerio.load(html);
+  expect($('article a[href="/fr/docs/Web/CSS/dumber"]').length).toBe(0);
+  expect($('article a[href="/fr/docs/Web/CSS/number"]').length).toBe(0);
+  expect($('article a[href="/en-US/docs/Web/CSS/number"]').length).toBe(2);
+  expect($("article a.only-in-en-us").length).toBe(2);
+  expect($("article a.only-in-en-us").attr("title")).toBe(
+    "Currently only available in English (US)"
+  );
+});
diff --git a/testing/translated-content/files/fr/web/foo/index.html b/testing/translated-content/files/fr/web/foo/index.html
index 2940c8b5458e..67a34f931c1f 100644
--- a/testing/translated-content/files/fr/web/foo/index.html
+++ b/testing/translated-content/files/fr/web/foo/index.html
@@ -10,3 +10,15 @@
   <img src="screenshot.png" alt="Capture d'écran des couleurs" />
   <figcaption>Une image parfaitement normale</figcaption>
 </figure>
+
+<p>
+  This here demonstrates what happens when translated links exist but they're
+  actually broken. And in this case, what should happen is that it can fall back
+  on the en-US equivalent of those URLs.
+</p>
+<ul>
+  <li><a href="/fr/docs/Web/CSS/dumber">The &quot;dumber&quot; page</a></li>
+  <li>
+    <a href="/fr/docs/Web/CSS/number">The <i>number</i> page</a>
+  </li>
+</ul>

From 2072d119109b2d293273ef79488d00b2fe4fa875 Mon Sep 17 00:00:00 2001
From: Ryan Johnson <rjohnson@mozilla.com>
Date: Tue, 16 Mar 2021 16:10:20 -0700
Subject: [PATCH 022/288] fix integration tests to reflect latest changes
 (#3259)

---
 testing/integration/headless/map_301.py        | 2 +-
 testing/integration/headless/test_cdn.py       | 6 +++---
 testing/integration/headless/test_endpoints.py | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/testing/integration/headless/map_301.py b/testing/integration/headless/map_301.py
index 6771a6754167..1c5abf7ee3d9 100644
--- a/testing/integration/headless/map_301.py
+++ b/testing/integration/headless/map_301.py
@@ -1039,7 +1039,7 @@
     url_test("/en-US/Security/", "/en-US/docs/Security"),
     url_test("/en-US/Security/CSP/", "/en-US/docs/Security/CSP"),
     # Add trailing slash for the home page.
-    url_test("/en-US", "/en-US/"),
+    url_test("/en-US", "/en-US/", status_code=302),
     # Some special cases for "/docs".
     url_test("/docs", "/docs/Web"),
     url_test("/docs/", "/docs/Web"),
diff --git a/testing/integration/headless/test_cdn.py b/testing/integration/headless/test_cdn.py
index 06bbbe764ff4..06bee9beec29 100644
--- a/testing/integration/headless/test_cdn.py
+++ b/testing/integration/headless/test_cdn.py
@@ -139,7 +139,6 @@ def assert_cached(
         ("/healthz", 204, None),
         ("/readiness", 204, None),
         ("/api/v1/whoami", 200, None),
-        ("/api/v1/search/en-US?q=css", 200, None),
         ("/csp-violation-capture", 405, None),
         ("/en-US/profile", 302, "/en-US/users/signin?next=/en-US/profile"),
         ("/en-US/profile/edit", 302, "/en-US/users/signin?next=/en-US/profile/edit"),
@@ -207,8 +206,9 @@ def test_not_cached(base_url, is_behind_cdn, slug, status, expected_location):
         ("/en-US/search/xml", 200, None),
         ("/en-US/search.json?q=yada", 301, "/api/v1/search?q=yada"),
         ("/en-US/search?q=css", 200, None),
-        ("/en-US/search/?q=css", 301, "/en-US/search?q=css"),
-        ("/en-US/search/?q=html", 301, "/en-US/search?q=html"),
+        ("/en-US/search/?q=css", 302, "/en-US/search?q=css"),
+        ("/en-US/search/?q=html", 302, "/en-US/search?q=html"),
+        ("/api/v1/search?q=css", 200, None),
         ("/en-US/Firefox", 302, "/en-US/docs/Mozilla/Firefox"),
         ("/en-US/docs/Web/HTML", 200, None),
     ],
diff --git a/testing/integration/headless/test_endpoints.py b/testing/integration/headless/test_endpoints.py
index 8f2269f557c6..1df4031a898e 100644
--- a/testing/integration/headless/test_endpoints.py
+++ b/testing/integration/headless/test_endpoints.py
@@ -136,7 +136,6 @@ def test_api_basic(base_url, uri, expected_keys):
         "/profile",
         "/profiles/sheppy",
         "/users/signin",
-        "/promote",
         "/account",
     ],
 )

From 49409d3aa64a2a46c8099eced487a658af3adb38 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 16 Mar 2021 20:44:21 -0400
Subject: [PATCH 023/288] Stop saying "Building roots:" twice (#3256)

Fixes #3253
---
 build/cli.js        | 16 +++++++++++++++-
 content/document.js | 12 +-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/build/cli.js b/build/cli.js
index 49b462d1da3c..bb55b76a41d0 100644
--- a/build/cli.js
+++ b/build/cli.js
@@ -2,6 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const zlib = require("zlib");
 
+const chalk = require("chalk");
 const cliProgress = require("cli-progress");
 const program = require("@caporal/core").default;
 const { prompt } = require("inquirer");
@@ -10,7 +11,9 @@ const {
   Document,
   slugToFolder,
   translationsOf,
+  CONTENT_ROOT,
   CONTENT_TRANSLATED_ROOT,
+  CONTENT_ARCHIVED_ROOT,
 } = require("../content");
 
 // eslint-disable-next-line node/no-missing-require
@@ -279,7 +282,18 @@ program
   .action(async ({ args, options }) => {
     try {
       if (!options.quiet) {
-        console.log("\nBuilding Documents...");
+        const roots = [
+          ["CONTENT_ROOT", CONTENT_ROOT],
+          ["CONTENT_TRANSLATED_ROOT", CONTENT_TRANSLATED_ROOT],
+          ["CONTENT_ARCHIVED_ROOT", CONTENT_ARCHIVED_ROOT],
+        ];
+        for (const [key, value] of roots) {
+          console.log(
+            `${chalk.grey((key + ":").padEnd(25, " "))}${
+              value ? chalk.white(value) : chalk.grey("not set")
+            }`
+          );
+        }
       }
       const { files } = args;
       const t0 = new Date();
diff --git a/content/document.js b/content/document.js
index 1c2f266c9613..02044ffa3f8a 100644
--- a/content/document.js
+++ b/content/document.js
@@ -358,30 +358,20 @@ function findByURL(url, ...args) {
   return doc;
 }
 
-function findAll({
-  files = new Set(),
-  folderSearch = null,
-  quiet = false,
-} = {}) {
+function findAll({ files = new Set(), folderSearch = null } = {}) {
   if (!(files instanceof Set)) throw new TypeError("'files' not a Set");
   if (folderSearch && typeof folderSearch !== "string")
     throw new TypeError("'folderSearch' not a string");
 
-  // TODO: doesn't support archive content yet
-  // console.warn("Currently hardcoded to only build 'en-us'");
   const filePaths = [];
   const roots = [];
   if (CONTENT_ARCHIVED_ROOT) {
-    // roots.push({ path: CONTENT_ARCHIVED_ROOT, isArchive: true });
     roots.push(CONTENT_ARCHIVED_ROOT);
   }
   if (CONTENT_TRANSLATED_ROOT) {
     roots.push(CONTENT_TRANSLATED_ROOT);
   }
   roots.push(CONTENT_ROOT);
-  if (!quiet) {
-    console.log("Building roots:", roots);
-  }
   for (const root of roots) {
     filePaths.push(
       ...glob

From 6aaa7b1e1408979032119fa67e7e11a758bd75b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Mar 2021 05:59:17 +0000
Subject: [PATCH 024/288] build(deps-dev): bump eslint-plugin-jest from 24.3.1
 to 24.3.2 (#3262)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index dd94da3c06ae..50b8cf003ee7 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "downshift": "^6.1.0",
     "eslint": "^7.18.0",
     "eslint-gitignore": "^0.1.0",
-    "eslint-plugin-jest": "24.3.1",
+    "eslint-plugin-jest": "24.3.2",
     "eslint-plugin-node": "11.1.0",
     "extend": "^3.0.2",
     "flexsearch": "0.6.32",
diff --git a/yarn.lock b/yarn.lock
index 74ec9deb093c..3d3b1ad2441b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7412,10 +7412,10 @@ eslint-plugin-import@^2.22.1:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-jest@24.3.1, eslint-plugin-jest@^24.1.0:
-  version "24.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.1.tgz#c8df037847b83397940bef7fbc2cc168ab466bcc"
-  integrity sha512-RQt59rfMSHyvedImT72iaf8JcvCcR4P7Uq499dALtjY8mrCjbwWrFi1UceG4sid2wVIeDi+0tjxXZ8CZEVO7Zw==
+eslint-plugin-jest@24.3.2, eslint-plugin-jest@^24.1.0:
+  version "24.3.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.2.tgz#30a8b2dea6278d0da1d6fb9d6cd530aaf58050a1"
+  integrity sha512-cicWDr+RvTAOKS3Q/k03+Z3odt3VCiWamNUHWd6QWbVQWcYJyYgUTu8x0mx9GfeDEimawU5kQC+nQ3MFxIM6bw==
   dependencies:
     "@typescript-eslint/experimental-utils" "^4.0.1"
 

From 7131a053ffebcb10d09145c1e08b3f1e1cfbb472 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Mar 2021 06:52:45 +0000
Subject: [PATCH 025/288] build(deps): bump boto3 from 1.17.28 to 1.17.29 in
 /deployer (#3263)

---
 deployer/poetry.lock    | 19 +++++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 8f56f326bbf6..f2f0f6323c53 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.28"
+version = "1.17.29"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.28,<1.21.0"
+botocore = ">=1.20.29,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.28"
+version = "1.20.29"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -76,6 +76,9 @@ jmespath = ">=0.7.1,<1.0.0"
 python-dateutil = ">=2.1,<3.0.0"
 urllib3 = ">=1.25.4,<1.27"
 
+[package.extras]
+crt = ["awscrt (==0.10.8)"]
+
 [[package]]
 name = "certifi"
 version = "2020.12.5"
@@ -479,7 +482,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "a66c51cb8338c0f22b775dd06bcc4c468e8f97277006e1953cbb2440f210bc84"
+content-hash = "b3e37a230ca3371648e326bde0eb3f7856b9364ae310832e30873b19962f5004"
 
 [metadata.files]
 appdirs = [
@@ -498,12 +501,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.28-py2.py3-none-any.whl", hash = "sha256:442c8579541661ab1dbbd2013d646506633bd1435368c217bd38acc01696992d"},
-    {file = "boto3-1.17.28.tar.gz", hash = "sha256:ba13bda83ca1a26469fdf5130bb7a8f671dd807d0551e3242cafc8c44caab057"},
+    {file = "boto3-1.17.29-py2.py3-none-any.whl", hash = "sha256:bf8ced7760f9ef36964ccdba719f334a2ae6ec8a7719c259b198fec56fabad87"},
+    {file = "boto3-1.17.29.tar.gz", hash = "sha256:31396fcaffdfc0f465b4de76e1ecae53894eb869b000ffa54aa1693a98db3a3c"},
 ]
 botocore = [
-    {file = "botocore-1.20.28-py2.py3-none-any.whl", hash = "sha256:75e6cfa246ec14863742c79ab8ddd887bd1b48c3d44268d53d69a5c6f472dee0"},
-    {file = "botocore-1.20.28.tar.gz", hash = "sha256:6dde07154c37b552f52cbf8041541c5460a29d916f527b2098a36d44496c7126"},
+    {file = "botocore-1.20.29-py2.py3-none-any.whl", hash = "sha256:5a26ad20662f8e15685889a17c62a2f8804bf02fcdea59f45ad993b261f9caa2"},
+    {file = "botocore-1.20.29.tar.gz", hash = "sha256:184b7d26b0669fd65ac8193662376d1267d800e005b69412b57cc82c5ffbe935"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 00f0a2cdb4ef..a1a764877947 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.28"
+boto3 = "^1.17.29"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 25408d9970c29a57698a1e97195786c67908067c Mon Sep 17 00:00:00 2001
From: Rachel Andrew <rachel.andrew@edgeofmyseat.com>
Date: Wed, 17 Mar 2021 10:21:10 +0000
Subject: [PATCH 026/288] adds Level 5 Color Spec (#3265)

---
 kumascript/macros/SpecData.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kumascript/macros/SpecData.json b/kumascript/macros/SpecData.json
index 01908ad3cf74..f85523f3afb2 100644
--- a/kumascript/macros/SpecData.json
+++ b/kumascript/macros/SpecData.json
@@ -489,6 +489,11 @@
     "url": "https://drafts.csswg.org/css-cascade-5/",
     "status": "WD"
   },
+  "CSS5 Colors": {
+    "name": "CSS Color Module Level&nbsp;5",
+    "url": "https://drafts.csswg.org/css-color-5/",
+    "status": "WD"
+  },
   "CSS5 Media Queries": {
     "name": "Media Queries Level&nbsp;5",
     "url": "https://drafts.csswg.org/mediaqueries-5/",

From d75d6075e01ca9a0ba838cc97ce20ff128bd8e42 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Wed, 17 Mar 2021 16:13:48 -0400
Subject: [PATCH 027/288] CompatibilityTable.ejs injects HTML that's considered
 unsafe (#3270)

Fixes #3269
---
 kumascript/macros/CompatibilityTable.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kumascript/macros/CompatibilityTable.ejs b/kumascript/macros/CompatibilityTable.ejs
index 3ecfc2b2736c..cc9afb5b3d58 100644
--- a/kumascript/macros/CompatibilityTable.ejs
+++ b/kumascript/macros/CompatibilityTable.ejs
@@ -42,7 +42,7 @@ var cta = mdn.localString({
 <div class="htab">
     <a id="AutoCompatibilityTable" name="AutoCompatibilityTable"></a>
     <ul>
-        <li class="selected"><a href="javascript:;"><%- s_header[0] %></a></li>
-        <li><a href="javascript:;"><%- s_header[1] %></a></li>
+        <li class="selected"><a href="#compat-desktop"><%- s_header[0] %></a></li>
+        <li><a href="#compat-mobile"><%- s_header[1] %></a></li>
     </ul>
 </div>

From aaec11ebf336b58ec92eff065b99dd867d5daa2f Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Wed, 17 Mar 2021 16:20:10 -0400
Subject: [PATCH 028/288] Don't choke on iframes without a src (#3272)

Fixes #3271
---
 build/flaws.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/flaws.js b/build/flaws.js
index 6426a47daa74..b64d624d1589 100644
--- a/build/flaws.js
+++ b/build/flaws.js
@@ -75,7 +75,7 @@ function injectFlaws(doc, $, options, document) {
   }
 }
 
-function injectUnsafeHTMLFlaws(doc, $, { rawContent }) {
+function injectUnsafeHTMLFlaws(doc, $, { rawContent, fileInfo }) {
   function addFlaw(element, explanation) {
     if (!("unsafe_html" in doc.flaws)) {
       doc.flaws.unsafe_html = [];
@@ -131,6 +131,12 @@ function injectUnsafeHTMLFlaws(doc, $, { rawContent }) {
     if (tagName === "iframe") {
       // For iframes we only check the 'src' value
       const src = $(element).attr("src");
+      if (!src) {
+        console.warn(
+          `${fileInfo.path} has an iframe without a 'src' attribute`
+        );
+        return;
+      }
       // Local URLs are always safe.
       if (!(src.startsWith("//") || src.includes("://"))) {
         return;

From 24f5df309d5b1961c56d2c13ae9cd33be2db15f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Mar 2021 05:59:50 +0000
Subject: [PATCH 029/288] build(deps-dev): bump @types/jest from 26.0.20 to
 26.0.21 (#3275)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 50b8cf003ee7..dbcf633a787d 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "@storybook/preset-create-react-app": "^3.1.6",
     "@storybook/react": "^6.1.21",
     "@testing-library/react": "^11.2.5",
-    "@types/jest": "^26.0.20",
+    "@types/jest": "^26.0.21",
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.2",
     "braces": "^3.0.2",
diff --git a/yarn.lock b/yarn.lock
index 3d3b1ad2441b..d29083635865 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2997,10 +2997,10 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@^26.0.20":
-  version "26.0.20"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307"
-  integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==
+"@types/jest@^26.0.21":
+  version "26.0.21"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.21.tgz#3a73c2731e7e4f0fbaea56ce7ff8c79cf812bd24"
+  integrity sha512-ab9TyM/69yg7eew9eOwKMUmvIZAKEGZYlq/dhe5/0IMUd/QLJv5ldRMdddSn+u22N13FP3s5jYyktxuBwY0kDA==
   dependencies:
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"

From 7884a08738a6a2bbd6fa9f24e754392af8e62a42 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Mar 2021 06:01:30 +0000
Subject: [PATCH 030/288] build(deps): bump tempy from 1.0.0 to 1.0.1 (#3276)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index dbcf633a787d..af2d37d40648 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "sanitize-filename": "^1.6.3",
     "send": "0.17.1",
     "source-map-support": "0.5.19",
-    "tempy": "1.0.0"
+    "tempy": "1.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.13.10",
diff --git a/yarn.lock b/yarn.lock
index d29083635865..d1c44f9fda37 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17013,10 +17013,10 @@ tempfile@^2.0.0:
     temp-dir "^1.0.0"
     uuid "^3.0.1"
 
-tempy@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tempy/-/tempy-1.0.0.tgz#4f192b3ee3328a2684d0e3fc5c491425395aab65"
-  integrity sha512-eLXG5B1G0mRPHmgH2WydPl5v4jH35qEn3y/rA/aahKhIa91Pn119SsU7n7v/433gtT9ONzC8ISvNHIh2JSTm0w==
+tempy@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tempy/-/tempy-1.0.1.tgz#30fe901fd869cfb36ee2bd999805aa72fbb035de"
+  integrity sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==
   dependencies:
     del "^6.0.0"
     is-stream "^2.0.0"

From 1950c5535678225c6b964746e48653290ba9afac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Mar 2021 07:02:16 +0000
Subject: [PATCH 031/288] build(deps): bump boto3 from 1.17.29 to 1.17.30 in
 /deployer (#3277)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index f2f0f6323c53..4395de5c1f06 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.29"
+version = "1.17.30"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.29,<1.21.0"
+botocore = ">=1.20.30,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.29"
+version = "1.20.30"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -482,7 +482,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "b3e37a230ca3371648e326bde0eb3f7856b9364ae310832e30873b19962f5004"
+content-hash = "fece341f13f2a5cc7d43fc902fbbec6318d921445d32969a5215c8bcae13adb2"
 
 [metadata.files]
 appdirs = [
@@ -501,12 +501,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.29-py2.py3-none-any.whl", hash = "sha256:bf8ced7760f9ef36964ccdba719f334a2ae6ec8a7719c259b198fec56fabad87"},
-    {file = "boto3-1.17.29.tar.gz", hash = "sha256:31396fcaffdfc0f465b4de76e1ecae53894eb869b000ffa54aa1693a98db3a3c"},
+    {file = "boto3-1.17.30-py2.py3-none-any.whl", hash = "sha256:fe1898c5b10035528207995c9931b78f2f50bb70cf93bac353152aea47c04780"},
+    {file = "boto3-1.17.30.tar.gz", hash = "sha256:d39c04b51e60197f5503f8489f043bc904981567cc8431d389367767dc3fd5ae"},
 ]
 botocore = [
-    {file = "botocore-1.20.29-py2.py3-none-any.whl", hash = "sha256:5a26ad20662f8e15685889a17c62a2f8804bf02fcdea59f45ad993b261f9caa2"},
-    {file = "botocore-1.20.29.tar.gz", hash = "sha256:184b7d26b0669fd65ac8193662376d1267d800e005b69412b57cc82c5ffbe935"},
+    {file = "botocore-1.20.30-py2.py3-none-any.whl", hash = "sha256:63951595a736dfc9759f57e33bec6eaea4f09c4800626ef5309437060b263e48"},
+    {file = "botocore-1.20.30.tar.gz", hash = "sha256:98ff1eb210d394a1ffe736b33c8a7be68f30f0a03550b559c5bb6fdf0c29328d"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index a1a764877947..e197857897b6 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.29"
+boto3 = "^1.17.30"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 9857a0ebc57cf3b57ccb6fa9ad1a8b45228d2c78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Mar 2021 08:17:51 +0000
Subject: [PATCH 032/288] build(deps-dev): bump
 @storybook/preset-create-react-app (#3178)

---
 package.json |  2 +-
 yarn.lock    | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index af2d37d40648..9547951774fd 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.1.21",
     "@storybook/node-logger": "^6.1.19",
-    "@storybook/preset-create-react-app": "^3.1.6",
+    "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
     "@testing-library/react": "^11.2.5",
     "@types/jest": "^26.0.21",
diff --git a/yarn.lock b/yarn.lock
index d1c44f9fda37..7edd6204053b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1984,7 +1984,7 @@
   dependencies:
     mkdirp "^1.0.4"
 
-"@pmmmwh/react-refresh-webpack-plugin@0.4.3", "@pmmmwh/react-refresh-webpack-plugin@^0.4.2":
+"@pmmmwh/react-refresh-webpack-plugin@0.4.3", "@pmmmwh/react-refresh-webpack-plugin@^0.4.2", "@pmmmwh/react-refresh-webpack-plugin@^0.4.3":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz#1eec460596d200c0236bf195b078a5d1df89b766"
   integrity sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==
@@ -2526,11 +2526,12 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/preset-create-react-app@^3.1.6":
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-3.1.6.tgz#fdcc332343085d26fe50891be484c830921f2688"
-  integrity sha512-hH8g5bBqNVU1zl2K19fXazncaWX2eiOX+ZHN3RtfQioAgHtXH/S1TS92xJj7uxoU40GYjldRmv7+fhzJCyRxNg==
+"@storybook/preset-create-react-app@^3.1.7":
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-3.1.7.tgz#e48df77768bdcc4863e3918c11965c45e4110ac8"
+  integrity sha512-SR+HGSWCrhHA5sszuIHJYdh2tWNi/zu858WB5RM74OBW4ogo8Bv4/7td4p53eWbdm0zBDbnKcrBmwRrAYqwL9Q==
   dependencies:
+    "@pmmmwh/react-refresh-webpack-plugin" "^0.4.3"
     "@types/babel__core" "^7.1.7"
     "@types/webpack" "^4.41.13"
     babel-plugin-react-docgen "^4.1.0"

From f93f197bd93c1d89e745f18bf2c64d80d5c0dd30 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 18 Mar 2021 08:22:46 -0400
Subject: [PATCH 033/288] account settings app (#3130)

---
 build/languages.json           | 518 +++++++++++++++++++++++++++++++++
 build/spas.js                  |  35 ++-
 client/src/app.tsx             |   9 +
 client/src/index.tsx           |   2 +
 client/src/settings/app.tsx    | 385 ++++++++++++++++++++++++
 client/src/settings/index.tsx  |  31 ++
 server/static.js               |  45 ++-
 ssr/render.js                  |   8 +
 testing/tests/headless.test.js |  26 ++
 testing/tests/index.test.js    |  18 ++
 10 files changed, 1074 insertions(+), 3 deletions(-)
 create mode 100644 build/languages.json
 create mode 100644 client/src/settings/app.tsx
 create mode 100644 client/src/settings/index.tsx

diff --git a/build/languages.json b/build/languages.json
new file mode 100644
index 000000000000..f1a53eb0e021
--- /dev/null
+++ b/build/languages.json
@@ -0,0 +1,518 @@
+{
+  "ach": {
+    "English": "Acholi",
+    "native": "Acholi"
+  },
+  "ak": {
+    "English": "Akan",
+    "native": "Akan"
+  },
+  "am-et": {
+    "English": "Amharic",
+    "native": "\u12a0\u121b\u122d\u129b"
+  },
+  "an": {
+    "English": "Aragonese",
+    "native": "aragon\u00e9s"
+  },
+  "ar": {
+    "English": "Arabic",
+    "native": "\u0639\u0631\u0628\u064a"
+  },
+  "as": {
+    "English": "Assamese",
+    "native": "\u0985\u09b8\u09ae\u09c0\u09af\u09bc\u09be"
+  },
+  "ast": {
+    "English": "Asturian",
+    "native": "Asturianu"
+  },
+  "azz": {
+    "English": "Highland Puebla Nahuatl",
+    "native": "nahuatl sierra norte Puebla"
+  },
+  "be": {
+    "English": "Belarusian",
+    "native": "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f"
+  },
+  "bg": {
+    "English": "Bulgarian",
+    "native": "\u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"
+  },
+  "bm": {
+    "English": "Bambara",
+    "native": "Bamanankan"
+  },
+  "bn": {
+    "English": "Bengali",
+    "native": "\u09ac\u09be\u0982\u09b2\u09be"
+  },
+  "br": {
+    "English": "Breton",
+    "native": "Brezhoneg"
+  },
+  "brx": {
+    "English": "Bodo",
+    "native": "\u092c\u0930'"
+  },
+  "bs": {
+    "English": "Bosnian",
+    "native": "Bosanski"
+  },
+  "ca": {
+    "English": "Catalan",
+    "native": "Catal\u00e0"
+  },
+  "ca-valencia": {
+    "English": "Catalan (Valencian)",
+    "native": "catal\u00e0 (valenci\u00e0)"
+  },
+  "cak": {
+    "English": "Kaqchikel",
+    "native": "Maya Kaqchikel"
+  },
+  "csb": {
+    "English": "Kashubian",
+    "native": "Kasz\u00ebbsczi"
+  },
+  "cy": {
+    "English": "Welsh",
+    "native": "Cymraeg"
+  },
+  "da": {
+    "English": "Danish",
+    "native": "Dansk"
+  },
+  "dbg": {
+    "English": "Debug Robot",
+    "native": "\u1e12\u1e17\u0180\u016d\u0260 \u0158\u01ff\u0180\u01ff\u0167"
+  },
+  "de": {
+    "English": "German",
+    "native": "Deutsch"
+  },
+  "de-AT": {
+    "English": "German (Austria)",
+    "native": "Deutsch (\u00d6sterreich)"
+  },
+  "de-CH": {
+    "English": "German (Switzerland)",
+    "native": "Deutsch (Schweiz)"
+  },
+  "de-DE": {
+    "English": "German (Germany)",
+    "native": "Deutsch (Deutschland)"
+  },
+  "dsb": {
+    "English": "Lower Sorbian",
+    "native": "Dolnoserb\u0161\u0107ina"
+  },
+  "el": {
+    "English": "Greek",
+    "native": "\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"
+  },
+  "en-AU": {
+    "English": "English (Australian)",
+    "native": "English (Australian)"
+  },
+  "en-CA": {
+    "English": "English (Canadian)",
+    "native": "English (Canadian)"
+  },
+  "en-GB": {
+    "English": "English (British)",
+    "native": "English (British)"
+  },
+  "en-NZ": {
+    "English": "English (New Zealand)",
+    "native": "English (New Zealand)"
+  },
+  "en-US": {
+    "English": "English (US)",
+    "native": "English (US)"
+  },
+  "en-ZA": {
+    "English": "English (South African)",
+    "native": "English (South African)"
+  },
+  "eo": {
+    "English": "Esperanto",
+    "native": "Esperanto"
+  },
+  "es": {
+    "English": "Spanish",
+    "native": "Espa\u00f1ol"
+  },
+  "es-AR": {
+    "English": "Spanish (Argentina)",
+    "native": "Espa\u00f1ol (de Argentina)"
+  },
+  "es-CL": {
+    "English": "Spanish (Chile)",
+    "native": "Espa\u00f1ol (de Chile)"
+  },
+  "es-ES": {
+    "English": "Spanish (Spain)",
+    "native": "Espa\u00f1ol (de Espa\u00f1a)"
+  },
+  "es-MX": {
+    "English": "Spanish (Mexico)",
+    "native": "Espa\u00f1ol (de M\u00e9xico)"
+  },
+  "et": {
+    "English": "Estonian",
+    "native": "Eesti keel"
+  },
+  "eu": {
+    "English": "Basque",
+    "native": "Euskara"
+  },
+  "fa": {
+    "English": "Persian",
+    "native": "\u0641\u0627\u0631\u0633\u06cc"
+  },
+  "fi": {
+    "English": "Finnish",
+    "native": "suomi"
+  },
+  "fj-FJ": {
+    "English": "Fijian",
+    "native": "Vosa vaka-Viti"
+  },
+  "fr": {
+    "English": "French",
+    "native": "Fran\u00e7ais"
+  },
+  "fur-IT": {
+    "English": "Friulian",
+    "native": "Furlan"
+  },
+  "ga": {
+    "English": "Irish",
+    "native": "Gaeilge"
+  },
+  "gd": {
+    "English": "Gaelic (Scotland)",
+    "native": "G\u00e0idhlig"
+  },
+  "gl": {
+    "English": "Galician",
+    "native": "Galego"
+  },
+  "gn": {
+    "English": "Guarani",
+    "native": "Ava\u00f1e'\u1ebd"
+  },
+  "gu": {
+    "English": "Gujarati",
+    "native": "\u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0"
+  },
+  "gu-IN": {
+    "English": "Gujarati (India)",
+    "native": "\u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0 (\u0aad\u0abe\u0ab0\u0aa4)"
+  },
+  "he": {
+    "English": "Hebrew",
+    "native": "\u05e2\u05d1\u05e8\u05d9\u05ea"
+  },
+  "hi": {
+    "English": "Hindi",
+    "native": "\u0939\u093f\u0928\u094d\u0926\u0940"
+  },
+  "hi-IN": {
+    "English": "Hindi (India)",
+    "native": "\u0939\u093f\u0928\u094d\u0926\u0940 (\u092d\u093e\u0930\u0924)"
+  },
+  "hsb": {
+    "English": "Upper Sorbian",
+    "native": "Hornjoserbsce"
+  },
+  "hu": {
+    "English": "Hungarian",
+    "native": "magyar"
+  },
+  "hy-AM": {
+    "English": "Armenian",
+    "native": "\u0540\u0561\u0575\u0565\u0580\u0565\u0576"
+  },
+  "ia": {
+    "English": "Interlingua",
+    "native": "Interlingua"
+  },
+  "id": {
+    "English": "Indonesian",
+    "native": "Bahasa Indonesia"
+  },
+  "is": {
+    "English": "Icelandic",
+    "native": "\u00edslenska"
+  },
+  "it": {
+    "English": "Italian",
+    "native": "Italiano"
+  },
+  "ja": {
+    "English": "Japanese",
+    "native": "\u65e5\u672c\u8a9e"
+  },
+  "ja-JP-mac": {
+    "English": "Japanese",
+    "native": "\u65e5\u672c\u8a9e"
+  },
+  "kab": {
+    "English": "Kabyle",
+    "native": "Taqbaylit"
+  },
+  "kk": {
+    "English": "Kazakh",
+    "native": "\u049a\u0430\u0437\u0430\u049b"
+  },
+  "km": {
+    "English": "Khmer",
+    "native": "\u1781\u17d2\u1798\u17c2\u179a"
+  },
+  "kn": {
+    "English": "Kannada",
+    "native": "\u0c95\u0ca8\u0ccd\u0ca8\u0ca1"
+  },
+  "ko": {
+    "English": "Korean",
+    "native": "\ud55c\uad6d\uc5b4"
+  },
+  "kok": {
+    "English": "Konkani",
+    "native": "\u0915\u094b\u0902\u0915\u0928\u0940"
+  },
+  "ku": {
+    "English": "Kurdish",
+    "native": "Kurd\u00ee"
+  },
+  "ks": {
+    "English": "Kashmiri",
+    "native": "\u0643\u0634\u0645\u06cc\u0631\u06cc"
+  },
+  "la": {
+    "English": "Latin",
+    "native": "Latina"
+  },
+  "lg": {
+    "English": "Luganda",
+    "native": "Luganda"
+  },
+  "lij": {
+    "English": "Ligurian",
+    "native": "Ligure"
+  },
+  "lo": {
+    "English": "Lao",
+    "native": "\u0e9e\u0eb2\u0eaa\u0eb2\u0ea5\u0eb2\u0ea7"
+  },
+  "lt": {
+    "English": "Lithuanian",
+    "native": "Lietuvi\u0173"
+  },
+  "ltg": {
+    "English": "Latgalian",
+    "native": "Latgalie\u0161u valoda"
+  },
+  "lv": {
+    "English": "Latvian",
+    "native": "Latvie\u0161u"
+  },
+  "mai": {
+    "English": "Maithili",
+    "native": "\u092e\u0948\u0925\u093f\u0932\u0940 \u09ae\u09c8\u09a5\u09bf\u09b2\u09c0"
+  },
+  "mi": {
+    "English": "Maori (Aotearoa)",
+    "native": "M\u0101ori (Aotearoa)"
+  },
+  "mk": {
+    "English": "Macedonian",
+    "native": "\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438"
+  },
+  "mn": {
+    "English": "Mongolian",
+    "native": "\u041c\u043e\u043d\u0433\u043e\u043b"
+  },
+  "mr": {
+    "English": "Marathi",
+    "native": "\u092e\u0930\u093e\u0920\u0940"
+  },
+  "ms": {
+    "English": "Malay",
+    "native": "Melayu"
+  },
+  "my": {
+    "English": "Burmese",
+    "native": "\u1019\u103c\u1014\u103a\u1019\u102c\u1018\u102c\u101e\u102c"
+  },
+  "nb-NO": {
+    "English": "Norwegian (Bokm\u00e5l)",
+    "native": "Norsk bokm\u00e5l"
+  },
+  "ne-NP": {
+    "English": "Nepali",
+    "native": "\u0928\u0947\u092a\u093e\u0932\u0940"
+  },
+  "nn-NO": {
+    "English": "Norwegian (Nynorsk)",
+    "native": "Norsk nynorsk"
+  },
+  "nl": {
+    "English": "Dutch",
+    "native": "Nederlands"
+  },
+  "nr": {
+    "English": "Ndebele, South",
+    "native": "isiNdebele"
+  },
+  "nso": {
+    "English": "Northern Sotho",
+    "native": "Sepedi"
+  },
+  "oc": {
+    "English": "Occitan (Lengadocian)",
+    "native": "occitan (lengadocian)"
+  },
+  "or": {
+    "English": "Odia",
+    "native": "\u0b13\u0b21\u0b3c\u0b3f\u0b06"
+  },
+  "pa": {
+    "English": "Punjabi",
+    "native": "\u0a2a\u0a70\u0a1c\u0a3e\u0a2c\u0a40"
+  },
+  "pa-IN": {
+    "English": "Punjabi (India)",
+    "native": "\u0a2a\u0a70\u0a1c\u0a3e\u0a2c\u0a40 (\u0a2d\u0a3e\u0a30\u0a24)"
+  },
+  "pl": {
+    "English": "Polish",
+    "native": "Polski"
+  },
+  "pt-BR": {
+    "English": "Portuguese (Brazilian)",
+    "native": "Portugu\u00eas (do\u00a0Brasil)"
+  },
+  "pt-PT": {
+    "English": "Portuguese (Portugal)",
+    "native": "Portugu\u00eas (Europeu)"
+  },
+  "rm": {
+    "English": "Romansh",
+    "native": "rumantsch"
+  },
+  "ru": {
+    "English": "Russian",
+    "native": "\u0420\u0443\u0441\u0441\u043a\u0438\u0439"
+  },
+  "rw": {
+    "English": "Kinyarwanda",
+    "native": "Ikinyarwanda"
+  },
+  "sa": {
+    "English": "Sanskrit",
+    "native": "\u0938\u0902\u0938\u094d\u0915\u0943\u0924"
+  },
+  "sat": {
+    "English": "Santali",
+    "native": "\u0938\u0902\u0924\u093e\u0932\u0940"
+  },
+  "sah": {
+    "English": "Sakha",
+    "native": "\u0421\u0430\u0445\u0430\u043b\u044b\u044b"
+  },
+  "si": {
+    "English": "Sinhala",
+    "native": "\u0dc3\u0dd2\u0d82\u0dc4\u0dbd"
+  },
+  "sk": {
+    "English": "Slovak",
+    "native": "sloven\u010dina"
+  },
+  "sl": {
+    "English": "Slovenian",
+    "native": "Sloven\u0161\u010dina"
+  },
+  "sr-Cyrl": {
+    "English": "Serbian",
+    "native": "\u0421\u0440\u043f\u0441\u043a\u0438"
+  },
+  "ss": {
+    "English": "Siswati",
+    "native": "siSwati"
+  },
+  "st": {
+    "English": "Southern Sotho",
+    "native": "Sesotho"
+  },
+  "sv-SE": {
+    "English": "Swedish",
+    "native": "Svenska"
+  },
+  "ta-IN": {
+    "English": "Tamil (India)",
+    "native": "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd (\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe)"
+  },
+  "ta-LK": {
+    "English": "Tamil (Sri Lanka)",
+    "native": "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd (\u0b87\u0bb2\u0b99\u0bcd\u0b95\u0bc8)"
+  },
+  "th": {
+    "English": "Thai",
+    "native": "\u0e44\u0e17\u0e22"
+  },
+  "tr": {
+    "English": "Turkish",
+    "native": "T\u00fcrk\u00e7e"
+  },
+  "trs": {
+    "English": "Triqui",
+    "native": "Triqui"
+  },
+  "ts": {
+    "English": "Tsonga",
+    "native": "Xitsonga"
+  },
+  "tsz": {
+    "English": "Pur\u00e9pecha",
+    "native": "Pur\u00e9pecha"
+  },
+  "tt-RU": {
+    "English": "Tatar",
+    "native": "Tatar\u00e7a"
+  },
+  "uk": {
+    "English": "Ukrainian",
+    "native": "\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430"
+  },
+  "ur": {
+    "English": "Urdu",
+    "native": "\u0627\u064f\u0631\u062f\u0648"
+  },
+  "uz": {
+    "English": "Uzbek",
+    "native": "O\u02bbzbek tili"
+  },
+  "ve": {
+    "English": "Venda",
+    "native": "Tshiven\u1e13a"
+  },
+  "vi": {
+    "English": "Vietnamese",
+    "native": "Ti\u1ebfng Vi\u1ec7t"
+  },
+  "x-testing": {
+    "English": "Testing",
+    "native": "\u0166\u1e17\u015f\u0167\u012b\u019e\u0260"
+  },
+  "zh-CN": {
+    "English": "Chinese (Simplified)",
+    "native": "\u4e2d\u6587 (\u7b80\u4f53)"
+  },
+  "zh-TW": {
+    "English": "Chinese (Traditional)",
+    "native": "\u6b63\u9ad4\u4e2d\u6587 (\u7e41\u9ad4)"
+  }
+}
diff --git a/build/spas.js b/build/spas.js
index 09f9e5043975..f948cf3fd08e 100644
--- a/build/spas.js
+++ b/build/spas.js
@@ -1,7 +1,11 @@
 const fs = require("fs");
 const path = require("path");
 
-const { CONTENT_ROOT, CONTENT_TRANSLATED_ROOT } = require("../content");
+const {
+  CONTENT_ROOT,
+  CONTENT_TRANSLATED_ROOT,
+  VALID_LOCALES,
+} = require("../content");
 const {
   BUILD_OUT_ROOT,
   HOMEPAGE_FEED_URL,
@@ -11,6 +15,14 @@ const { getFeedEntries } = require("./feedparser");
 // eslint-disable-next-line node/no-missing-require
 const { renderHTML } = require("../ssr/dist/main");
 
+function getLanguages() {
+  return new Map(
+    Object.entries(
+      JSON.parse(fs.readFileSync(path.join(__dirname, "languages.json")))
+    )
+  );
+}
+
 async function buildSPAs(options) {
   let buildCount = 0;
 
@@ -39,10 +51,21 @@ async function buildSPAs(options) {
         { prefix: "search", pageTitle: "Search" },
         { prefix: "signin", pageTitle: "Sign in" },
         { prefix: "signup", pageTitle: "Sign up" },
+        { prefix: "settings", pageTitle: "Settings" },
       ];
       for (const { prefix, pageTitle } of SPAs) {
         const url = `/${locale}/${prefix}`;
-        const html = renderHTML(url, { pageTitle });
+        const context = { pageTitle };
+        if (prefix === "settings") {
+          // This SPA needs a list of all valid locales
+          const languages = getLanguages();
+          context.possibleLocales = [...VALID_LOCALES.values()].map(
+            (locale) => {
+              return Object.assign({ locale }, languages.get(locale));
+            }
+          );
+        }
+        const html = renderHTML(url, context);
         const outPath = path.join(BUILD_OUT_ROOT, locale, prefix);
         fs.mkdirSync(outPath, { recursive: true });
         const filePath = path.join(outPath, "index.html");
@@ -51,6 +74,14 @@ async function buildSPAs(options) {
         if (options.verbose) {
           console.log("Wrote", filePath);
         }
+        if (prefix === "settings") {
+          const filePathContext = path.join(outPath, "index.json");
+          fs.writeFileSync(filePathContext, JSON.stringify(context));
+          buildCount++;
+          if (options.verbose) {
+            console.log("Wrote", filePathContext);
+          }
+        }
       }
     }
   }
diff --git a/client/src/app.tsx b/client/src/app.tsx
index 883319bc758a..15b36a19dfa3 100644
--- a/client/src/app.tsx
+++ b/client/src/app.tsx
@@ -16,6 +16,7 @@ import { PageContentContainer } from "./ui/atoms/page-content";
 import { PageNotFound } from "./page-not-found";
 import { Banner } from "./banners";
 import { SignIn, SignUp } from "./auth";
+import { Settings } from "./settings";
 
 const AllFlaws = React.lazy(() => import("./flaws"));
 const DocumentEdit = React.lazy(() => import("./document/forms/edit"));
@@ -223,6 +224,14 @@ export function App(appProps) {
                 </StandardLayout>
               }
             />
+            <Route
+              path="/settings"
+              element={
+                <StandardLayout>
+                  <Settings {...appProps} />
+                </StandardLayout>
+              }
+            />
             <Route
               path="/docs/*"
               element={<DocumentOrPageNotFound {...appProps} />}
diff --git a/client/src/index.tsx b/client/src/index.tsx
index b53640a04a9c..a80840f20977 100644
--- a/client/src/index.tsx
+++ b/client/src/index.tsx
@@ -22,6 +22,7 @@ if (!container) {
 const docData = (window as any).__data__;
 const pageNotFound = (window as any).__pageNotFound__;
 const feedEntries = (window as any).__feedEntries__;
+const possibleLocales = (window as any).__possibleLocales__;
 
 let app = (
   <GAProvider>
@@ -31,6 +32,7 @@ let app = (
           doc={docData}
           pageNotFound={pageNotFound}
           feedEntries={feedEntries}
+          possibleLocales={possibleLocales}
         />
       </Router>
     </UserDataProvider>
diff --git a/client/src/settings/app.tsx b/client/src/settings/app.tsx
new file mode 100644
index 000000000000..ed7039daf831
--- /dev/null
+++ b/client/src/settings/app.tsx
@@ -0,0 +1,385 @@
+import React from "react";
+import { Link, useNavigate } from "react-router-dom";
+import useSWR, { mutate } from "swr";
+
+import { DISABLE_AUTH } from "../constants";
+import { useUserData } from "../user-context";
+import { useLocale } from "../hooks";
+
+interface UserSettings {
+  csrfmiddlewaretoken: string;
+  locale: string;
+}
+
+interface Locale {
+  locale: string;
+  native: string;
+  English: string;
+}
+
+interface SettingsData {
+  possibleLocales: Locale[];
+}
+
+export default function SettingsApp({ ...appProps }) {
+  // This app is only ever loaded in the client so we can use `window`
+  let settingsDataURL = window.location.pathname;
+  if (!settingsDataURL.endsWith("/")) {
+    settingsDataURL += "/";
+  }
+  settingsDataURL += "index.json";
+
+  const { data: settingsData, error: settingsError } = useSWR<SettingsData>(
+    settingsDataURL,
+    async (url) => {
+      const response = await fetch(url);
+      if (!response.ok) {
+        const text = await response.text();
+        throw new Error(`${response.status} on ${url}: ${text}`);
+      }
+      return await response.json();
+    },
+    {
+      initialData: appProps.possibleLocales
+        ? { possibleLocales: appProps.possibleLocales }
+        : undefined,
+      revalidateOnFocus: false,
+    }
+  );
+  const userData = useUserData();
+
+  const { data, error } = useSWR<UserSettings | null, Error | null>(
+    userData ? "/api/v1/settings" : null,
+    async (url) => {
+      const response = await fetch(url);
+      if (!response.ok) {
+        throw new Error(`${response.status} on ${response.url}`);
+      }
+      const data = (await response.json()) as UserSettings;
+      return data;
+    }
+  );
+
+  if (DISABLE_AUTH) {
+    return <AuthDisabled />;
+  }
+
+  if (!userData) {
+    // The XHR request hasn't finished yet so we don't know if the user is
+    // signed in or not.
+    return <Loading />;
+  }
+  if (!userData.isAuthenticated) {
+    return <NotSignedIn />;
+  }
+
+  if (error) {
+    return (
+      <div className="notecard error">
+        <h3>Server error</h3>
+        <p>A server error occurred trying to get your user settings.</p>
+        <p>
+          <code>{error.toString()}</code>
+        </p>
+        <a href={window.location.pathname}>Reload this page and try again.</a>
+      </div>
+    );
+  }
+
+  if (!data) {
+    return <Loading />;
+  }
+
+  if (settingsError) {
+    return (
+      <div className="notecard error">
+        <h3>Server error</h3>
+        <p>Unable to get the current user settings from the server.</p>
+        <p>
+          <code>{settingsError.toString()}</code>
+        </p>
+        <a href={window.location.pathname}>Reload this page and try again.</a>
+      </div>
+    );
+  }
+
+  return (
+    <div>
+      {settingsData &&
+        settingsData.possibleLocales &&
+        settingsData.possibleLocales.length && (
+          <Settings
+            userSettings={data}
+            settingsData={settingsData}
+            refreshUserSettings={() => {
+              // This will "force" a new XHR request in the useUserData hook.
+              mutate("/api/v1/whoami");
+
+              mutate("/api/v1/settings");
+            }}
+          />
+        )}
+      <CloseAccount userSettings={data} />
+    </div>
+  );
+}
+
+function AuthDisabled() {
+  return (
+    <div className="notecard warning">
+      <h4>Authentication disabled</h4>
+      <p>Authentication and the user settings app is currently disabled.</p>
+    </div>
+  );
+}
+
+function Loading() {
+  return <p style={{ minHeight: 200 }}>Loading...</p>;
+}
+
+function NotSignedIn() {
+  const locale = useLocale();
+  const sp = new URLSearchParams();
+  sp.set("next", window.location.pathname);
+
+  return (
+    <div>
+      <h2>You are not signed in</h2>
+      <Link to={`/${locale}/signin?${sp.toString()}`}>Sign in first</Link>
+    </div>
+  );
+}
+
+interface ValidationErrorMessage {
+  message: string;
+  code: string;
+}
+
+interface ValidationError {
+  [key: string]: ValidationErrorMessage[];
+}
+interface ValidationErrors {
+  errors: ValidationError;
+}
+
+function Settings({
+  userSettings,
+  settingsData,
+  refreshUserSettings,
+}: {
+  userSettings: UserSettings;
+  settingsData: SettingsData;
+  refreshUserSettings: () => void;
+}) {
+  const [locale, setLocale] = React.useState(userSettings.locale);
+
+  const [sent, setSent] = React.useState(false);
+  const [sendError, setSendError] = React.useState<Error | null>(null);
+  const [
+    validationErrors,
+    setValidationErrors,
+  ] = React.useState<ValidationErrors | null>(null);
+
+  async function sendSettings() {
+    const formData = new URLSearchParams();
+    formData.set("locale", locale);
+
+    const response = await fetch("/api/v1/settings", {
+      method: "POST",
+      headers: {
+        "X-CSRFToken": userSettings.csrfmiddlewaretoken,
+        "Content-Type": "application/x-www-form-urlencoded",
+      },
+      body: formData,
+    });
+    if (response.status === 400) {
+      setValidationErrors((await response.json()) as ValidationErrors);
+    } else if (!response.ok) {
+      setSendError(new Error(`${response.status} on ${response.url}`));
+    } else {
+      setSent(true);
+      refreshUserSettings();
+    }
+  }
+  React.useEffect(() => {
+    let mounted = true;
+    setTimeout(() => {
+      if (mounted) {
+        setSent(false);
+      }
+    }, 5000);
+    return () => {
+      mounted = false;
+    };
+  }, [sent]);
+
+  return (
+    <form
+      onSubmit={async (event) => {
+        event.preventDefault();
+        await sendSettings();
+      }}
+    >
+      {validationErrors && (
+        <ShowValidationErrors errors={validationErrors.errors} />
+      )}
+
+      {sent && !sendError && (
+        <div className="notecard success">
+          <h4>Settings update sent</h4>
+          <p>Yay! Settings saved.</p>
+          <button
+            type="button"
+            className="button"
+            onClick={() => {
+              setSent(false);
+            }}
+          >
+            Close
+          </button>
+        </div>
+      )}
+      {sendError && (
+        <div className="notecard error">
+          <h4>Server submission error</h4>
+          <p>Something unexpected happened on the server submission.</p>
+          <p>
+            <code>{sendError.toString()}</code>
+          </p>
+          <a href={window.location.pathname}>Reload this page and try again.</a>
+        </div>
+      )}
+
+      <div>
+        <label htmlFor="id_locale">Language</label>
+        <select
+          id="id_locale"
+          name="locale"
+          value={locale}
+          onChange={(event) => {
+            setLocale(event.target.value);
+          }}
+        >
+          {settingsData.possibleLocales.map((language) => {
+            return (
+              <option key={language.locale} value={language.locale}>
+                {language.English}
+              </option>
+            );
+          })}
+        </select>
+      </div>
+      <button type="submit" className="button">
+        Save changes
+      </button>
+    </form>
+  );
+}
+
+function CloseAccount({ userSettings }: { userSettings: UserSettings }) {
+  const navigate = useNavigate();
+  const locale = useLocale();
+  const [confirm, setConfirm] = React.useState(false);
+  const [certain, setCertain] = React.useState(false);
+
+  const { error: deleteError } = useSWR<null, Error | null>(
+    certain ? "/api/v1/settings" : null,
+    async (url: string) => {
+      const response = await fetch(url, {
+        method: "DELETE",
+        headers: {
+          "X-CSRFToken": userSettings.csrfmiddlewaretoken,
+        },
+      });
+      if (!response.ok) {
+        throw new Error(`${response.status} on ${response.url}`);
+      }
+      alert("Your account has been closed and you are now signed out.");
+
+      // This will "force" a new XHR request in the useUserData hook.
+      mutate("/api/v1/whoami");
+
+      navigate(`/${locale}/`);
+      return null;
+    },
+    {
+      revalidateOnFocus: false,
+    }
+  );
+
+  return (
+    <div>
+      <h3>Close account</h3>
+      <p>Delete your account and all account data.</p>
+
+      {deleteError && (
+        <div className="notecard error">
+          <h3>Server error</h3>
+          <p>A server error occurred trying to close your account.</p>
+          <p>
+            <code>{deleteError.toString()}</code>
+          </p>
+          <a href={window.location.pathname}>Reload this page and try again.</a>
+        </div>
+      )}
+
+      {confirm ? (
+        <p>
+          Are you certain you want to do this?
+          <button
+            type="button"
+            className="button close-account cancel"
+            onClick={() => {
+              setConfirm(false);
+            }}
+          >
+            Cancel
+          </button>{" "}
+          <button
+            type="button"
+            className="button close-account certain"
+            onClick={() => {
+              setCertain(true);
+            }}
+          >
+            Yes
+          </button>
+        </p>
+      ) : (
+        <button
+          type="button"
+          className="button close-account"
+          onClick={() => {
+            setConfirm(true);
+          }}
+        >
+          Close account
+        </button>
+      )}
+    </div>
+  );
+}
+
+function ShowValidationErrors({ errors }: { errors: ValidationError }) {
+  return (
+    <div className="notecard error">
+      <h4>Validation errors</h4>
+      <ul>
+        {Object.entries(errors).map(([key, messages]) => {
+          return (
+            <li key={key}>
+              <b>
+                <code>{key}</code>
+              </b>
+              <ul>
+                {messages.map((message) => {
+                  return <li key={message.code}>{message.message}</li>;
+                })}
+              </ul>
+            </li>
+          );
+        })}
+      </ul>
+    </div>
+  );
+}
diff --git a/client/src/settings/index.tsx b/client/src/settings/index.tsx
new file mode 100644
index 000000000000..449151d15474
--- /dev/null
+++ b/client/src/settings/index.tsx
@@ -0,0 +1,31 @@
+import React from "react";
+
+import { PageContentContainer } from "../ui/atoms/page-content";
+
+const SettingsApp = React.lazy(() => import("./app"));
+
+export function Settings() {
+  React.useEffect(() => {
+    document.title = "Settings";
+  }, []);
+  const isServer = typeof window === "undefined";
+  return (
+    <div className="settings">
+      <PageContentContainer>
+        {/* The reason for displaying this <h1> here
+          is to avoid an unnecessary "flicker".
+          component here is loaded SSR and is immediately present.
+          Only the "guts" below is lazy loaded. By having the header already
+          present the page feels less flickery at a very affordable cost of
+          allowing this to be part of the main JS bundle.
+       */}
+        <h1>Settings</h1>
+        {!isServer && (
+          <React.Suspense fallback={<p>Loading...</p>}>
+            <SettingsApp />
+          </React.Suspense>
+        )}
+      </PageContentContainer>
+    </div>
+  );
+}
diff --git a/server/static.js b/server/static.js
index c82837d92200..994dc46f0498 100644
--- a/server/static.js
+++ b/server/static.js
@@ -2,6 +2,7 @@ const path = require("path");
 
 const express = require("express");
 const compression = require("compression");
+const cookieParser = require("cookie-parser");
 
 const { staticMiddlewares } = require("./middlewares");
 const { resolveFundamental } = require("../content");
@@ -11,6 +12,8 @@ const app = express();
 app.use(express.json());
 app.use(compression());
 
+app.use(express.urlencoded({ extended: true }));
+
 app.use((req, res, next) => {
   // If we have a fundamental redirect mimic out Lambda@Edge and redirect.
   const { url: fundamentalRedirectUrl, status } = resolveFundamental(req.url);
@@ -22,6 +25,8 @@ app.use((req, res, next) => {
 
 app.use(staticMiddlewares);
 
+app.use(cookieParser());
+
 // This endpoint exists solely to accompany the headless tests.
 // They will trigger XHR requests to `/api/v1/search?....`
 // and use different values as a way to make expectations.
@@ -90,7 +95,45 @@ app.get("/api/v1/search", async (req, res) => {
 });
 
 app.get("/api/v1/whoami", async (req, res) => {
-  res.json({ waffle: { flags: {}, switches: {} } });
+  const context = { waffle: { flags: {}, switches: {} } };
+  if (req.cookies.fakesessionid) {
+    context.username = req.cookies.fakesessionid;
+    context.is_authenticated = true;
+    context.email = `${req.cookies.fakesessionid}@example.com`;
+  }
+  res.json(context);
+});
+
+const mockSettingsDatabase = new Map();
+
+app.get("/api/v1/settings", async (req, res) => {
+  const defaultContext = { locale: "en-US" };
+  if (!req.cookies.fakesessionid) {
+    res.status(403).send("oh no you don't");
+  } else {
+    if (mockSettingsDatabase.has(req.cookies.fakesessionid)) {
+      res.json(
+        Object.assign(
+          {},
+          defaultContext,
+          mockSettingsDatabase.get(req.cookies.fakesessionid)
+        )
+      );
+    } else {
+      res.json(defaultContext);
+    }
+  }
+});
+
+app.post("/api/v1/settings", async (req, res) => {
+  if (!req.cookies.fakesessionid) {
+    res.status(403).send("oh no you don't");
+  } else {
+    mockSettingsDatabase.set(req.cookies.fakesessionid, {
+      locale: req.body.locale,
+    });
+    res.json({ ok: true });
+  }
 });
 
 // To mimic what CloudFront does.
diff --git a/ssr/render.js b/ssr/render.js
index fccfc7894dc3..1918621f10bf 100644
--- a/ssr/render.js
+++ b/ssr/render.js
@@ -144,6 +144,7 @@ export default function render(
     pageNotFound = false,
     feedEntries = null,
     pageTitle = null,
+    possibleLocales = null,
   } = {}
 ) {
   const buildHtml = readBuildHTML();
@@ -208,6 +209,13 @@ export default function render(
     }
   }
 
+  if (possibleLocales) {
+    const possibleLocalesTag = `<script>window.__possibleLocales__ = JSON.parse(${serializeDocumentData(
+      possibleLocales
+    )});</script>`;
+    $("#root").after(possibleLocalesTag);
+  }
+
   if (pageDescription) {
     // This overrides the default description. Also assumes there's always
     // one tag there already.
diff --git a/testing/tests/headless.test.js b/testing/tests/headless.test.js
index f48e1f3c9fcd..e037f3c0b91e 100644
--- a/testing/tests/headless.test.js
+++ b/testing/tests/headless.test.js
@@ -289,4 +289,30 @@ describe("Basic viewing of functional pages", () => {
     );
     await expect(page).toMatchElement("button", { text: "Create account" });
   });
+
+  it("should say you're not signed in on the settings page", async () => {
+    await page.goto(testURL("/en-US/settings"));
+    await expect(page).toMatchElement("h1", { text: "Settings" });
+    await expect(page).toMatchElement("a", { text: "Sign in first" });
+  });
+
+  it("should show your settings page", async () => {
+    const url = testURL("/en-US/settings");
+    // A `fakesessionid` is a special trick to tell the static server we use
+    // for mocking the `/api/v1`.
+    await page.setCookie({
+      name: "fakesessionid",
+      value: "peterbe",
+      domain: new URL(url).host,
+    });
+
+    await page.goto(url);
+    await expect(page).toMatchElement("h1", { text: "Settings" });
+    await expect(page).toMatchElement("button", { text: "Close account" });
+
+    // Change locale to French
+    await expect(page).toSelect('select[name="locale"]', "French");
+    await expect(page).toClick("button", { text: "Save changes" });
+    await expect(page).toMatch("Settings update sent");
+  });
 });
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index dcd76fe36236..13696e2ebeac 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -971,6 +971,24 @@ test("sign up page", () => {
   expect($("title").text()).toContain("Sign up");
 });
 
+test("settings page", () => {
+  const builtFolder = path.join(buildRoot, "en-us", "settings");
+  expect(fs.existsSync(builtFolder)).toBeTruthy();
+  const htmlFile = path.join(builtFolder, "index.html");
+  const html = fs.readFileSync(htmlFile, "utf-8");
+  const $ = cheerio.load(html);
+  expect($("h1").text()).toContain("Settings");
+  expect($("title").text()).toContain("Settings");
+
+  const jsonFile = path.join(builtFolder, "index.json");
+  const data = JSON.parse(fs.readFileSync(jsonFile));
+  expect(data.pageTitle).toBe("Settings");
+  expect(data.possibleLocales).toBeTruthy();
+  const possibleLocale = data.possibleLocales.find((p) => p.locale === "en-US");
+  expect(possibleLocale.English).toBe("English (US)");
+  expect(possibleLocale.native).toBe("English (US)");
+});
+
 test("bcd table extraction followed by h3", () => {
   const builtFolder = path.join(
     buildRoot,

From 1d3f9e7f79fc2091f7ba726608628e747d1b94d0 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 18 Mar 2021 11:42:35 -0400
Subject: [PATCH 034/288] include native name for translations (#2893)

---
 build/index.js                                |  11 +-
 .../src/document/organisms/metadata/index.tsx |   7 +-
 client/src/document/types.tsx                 |   2 +-
 .../src/ui/molecules/language-menu/index.tsx  |  41 +-
 .../ui/molecules/language-toggle/index.tsx    |  11 +-
 content/languages.json                        | 518 ++++++++++++++++++
 content/translations.js                       |  12 +-
 testing/tests/headless.test.js                |   6 +-
 testing/tests/index.test.js                   |   2 +-
 9 files changed, 571 insertions(+), 39 deletions(-)
 create mode 100644 content/languages.json

diff --git a/build/index.js b/build/index.js
index 7ebe064858ee..d8766d5afc44 100644
--- a/build/index.js
+++ b/build/index.js
@@ -26,6 +26,13 @@ const buildOptions = require("./build-options");
 const { gather: gatherGitHistory } = require("./git-history");
 const { buildSPAs } = require("./spas");
 const { renderCache: renderKumascriptCache } = require("../kumascript");
+const LANGUAGES_RAW = require("../content/languages.json");
+
+const LANGUAGES = new Map(
+  Object.entries(LANGUAGES_RAW).map(([locale, data]) => {
+    return [locale.toLowerCase(), data];
+  })
+);
 
 const DEFAULT_BRANCH_NAME = "main"; // That's what we use for github.com/mdn/content
 
@@ -351,6 +358,7 @@ async function buildDocument(document, documentOptions = {}) {
   doc.title = metadata.title;
   doc.mdn_url = document.url;
   doc.locale = metadata.locale;
+  doc.native = LANGUAGES.get(doc.locale.toLowerCase()).native;
 
   // Note that 'extractSidebar' will always return a string.
   // And if it finds a sidebar section, it gets removed from '$' too.
@@ -473,9 +481,8 @@ async function buildDocument(document, documentOptions = {}) {
     if (translationOf) {
       otherTranslations.push({
         locale: "en-US",
-        // slug: translationOf.metadata.slug,
-        url: translationOf.url,
         title: translationOf.metadata.title,
+        native: LANGUAGES.get("en-us").native,
       });
     }
   }
diff --git a/client/src/document/organisms/metadata/index.tsx b/client/src/document/organisms/metadata/index.tsx
index 8424b50aa1e9..7860707bc61e 100644
--- a/client/src/document/organisms/metadata/index.tsx
+++ b/client/src/document/organisms/metadata/index.tsx
@@ -26,6 +26,7 @@ function LastModified({ value, locale }) {
 
 export function Metadata({ doc, locale }) {
   const translations = doc.other_translations || [];
+  const { native } = doc;
 
   return (
     <aside className="metadata">
@@ -36,7 +37,11 @@ export function Metadata({ doc, locale }) {
           <a href={`${doc.mdn_url}/contributors.txt`}>by MDN contributors</a>
         </p>
         {translations && !!translations.length && (
-          <LanguageMenu translations={translations} locale={locale} />
+          <LanguageMenu
+            translations={translations}
+            native={native}
+            locale={locale}
+          />
         )}
       </div>
     </aside>
diff --git a/client/src/document/types.tsx b/client/src/document/types.tsx
index 930399f823c3..aa97a824a106 100644
--- a/client/src/document/types.tsx
+++ b/client/src/document/types.tsx
@@ -96,7 +96,7 @@ type Flaws = {
 
 export type Translation = {
   locale: string;
-  url: string;
+  native: string;
 };
 
 export type DocParent = {
diff --git a/client/src/ui/molecules/language-menu/index.tsx b/client/src/ui/molecules/language-menu/index.tsx
index e4f45e8b4343..9d977d36b275 100644
--- a/client/src/ui/molecules/language-menu/index.tsx
+++ b/client/src/ui/molecules/language-menu/index.tsx
@@ -1,40 +1,31 @@
 import React from "react";
-import { useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
 
 import { useGA } from "../../../ga-context";
-
-import LANGUAGES_RAW from "../../../languages.json";
 import { Translation } from "../../../document/types";
 
 import "./index.scss";
 
-const LANGUAGES = new Map(
-  Object.entries(LANGUAGES_RAW).map(([locale, data]) => {
-    return [locale.toLowerCase(), data];
-  })
-);
-
 // This needs to match what's set in 'libs/constants.js' on the server/builder!
 const PREFERRED_LOCALE_COOKIE_NAME = "preferredlocale";
 
 export function LanguageMenu({
   locale,
   translations,
+  native,
 }: {
   locale: string;
   translations: Translation[];
+  native: string;
 }) {
   const ga = useGA();
+  const { pathname } = useLocation();
   const navigate = useNavigate();
-  const [localeURL, setLocaleURL] = React.useState(locale);
+  const [preferredLocale, setPreferredLocale] = React.useState(locale);
 
-  // For the menu label, we want to use the name of the document language.
-  // We need a special case for English because English documents can
-  // appear in pages for other locales, and in that case we need a
-  // translation for the word "English". In all other cases, the
-  // locale of the page and the locale of the document should match
-  // and we can just use the document language string without translation.
-  const verbose = LANGUAGES.get(locale.toLowerCase());
+  function translateURL(destinationLocale: string) {
+    return pathname.replace(`/${locale}/`, `/${destinationLocale}/`);
+  }
 
   return (
     <form
@@ -43,9 +34,10 @@ export function LanguageMenu({
         event.preventDefault();
         // The default is the current locale itself. If that's what's chosen,
         // don't bother redirecting.
-        if (localeURL !== locale) {
+        if (preferredLocale !== locale) {
+          const localeURL = translateURL(preferredLocale);
           for (const translation of translations) {
-            if (translation.url === localeURL) {
+            if (translation.locale === preferredLocale) {
               let cookieValue = `${PREFERRED_LOCALE_COOKIE_NAME}=${
                 translation.locale
               };max-age=${60 * 60 * 24 * 365 * 3};path=/`;
@@ -76,10 +68,10 @@ export function LanguageMenu({
         <select
           id="language-selector"
           name="language"
-          value={localeURL}
+          value={preferredLocale}
           onChange={(event) => {
             const { value } = event.target;
-            setLocaleURL(value);
+            setPreferredLocale(value);
           }}
         >
           {/*
@@ -90,12 +82,11 @@ export function LanguageMenu({
           The onChange callback is a protection for doing nothing if the
           already current locale is chosen.
          */}
-          <option value={locale}>{verbose ? verbose.native : locale}</option>
+          <option value={locale}>{native}</option>
           {translations.map((t) => {
-            const verbose = LANGUAGES.get(t.locale.toLowerCase());
             return (
-              <option key={t.url} value={t.url}>
-                {verbose ? verbose.native : t.locale}
+              <option key={t.locale} value={t.locale}>
+                {t.native}
               </option>
             );
           })}
diff --git a/client/src/ui/molecules/language-toggle/index.tsx b/client/src/ui/molecules/language-toggle/index.tsx
index da16ebe1d7a0..bf9209071a75 100644
--- a/client/src/ui/molecules/language-toggle/index.tsx
+++ b/client/src/ui/molecules/language-toggle/index.tsx
@@ -1,4 +1,4 @@
-import { Link } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 
 import { Translation } from "../../../document/types";
 import { useGA } from "../../../ga-context";
@@ -13,20 +13,25 @@ export function LanguageToggle({
   translations: Translation[];
 }) {
   const ga = useGA();
+  const { pathname } = useLocation();
+  function translateURL(destinationLocale: string) {
+    return pathname.replace(`/${locale}/`, `/${destinationLocale}/`);
+  }
 
   function getEnglishLink() {
     for (const translation of translations) {
       if (translation.locale.toLowerCase() === "en-us") {
+        const translationURL = translateURL(translation.locale);
         return (
           <Link
-            to={translation.url}
+            to={translationURL}
             className="view-in-english"
             onClick={() => {
               ga("send", {
                 hitType: "event",
                 eventCategory: "Language",
                 eventAction: "Switch to English",
-                eventLabel: `${window.location.pathname} to ${translation.url}`,
+                eventLabel: `${window.location.pathname} to ${translationURL}`,
               });
             }}
           >
diff --git a/content/languages.json b/content/languages.json
new file mode 100644
index 000000000000..f1a53eb0e021
--- /dev/null
+++ b/content/languages.json
@@ -0,0 +1,518 @@
+{
+  "ach": {
+    "English": "Acholi",
+    "native": "Acholi"
+  },
+  "ak": {
+    "English": "Akan",
+    "native": "Akan"
+  },
+  "am-et": {
+    "English": "Amharic",
+    "native": "\u12a0\u121b\u122d\u129b"
+  },
+  "an": {
+    "English": "Aragonese",
+    "native": "aragon\u00e9s"
+  },
+  "ar": {
+    "English": "Arabic",
+    "native": "\u0639\u0631\u0628\u064a"
+  },
+  "as": {
+    "English": "Assamese",
+    "native": "\u0985\u09b8\u09ae\u09c0\u09af\u09bc\u09be"
+  },
+  "ast": {
+    "English": "Asturian",
+    "native": "Asturianu"
+  },
+  "azz": {
+    "English": "Highland Puebla Nahuatl",
+    "native": "nahuatl sierra norte Puebla"
+  },
+  "be": {
+    "English": "Belarusian",
+    "native": "\u0411\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f"
+  },
+  "bg": {
+    "English": "Bulgarian",
+    "native": "\u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"
+  },
+  "bm": {
+    "English": "Bambara",
+    "native": "Bamanankan"
+  },
+  "bn": {
+    "English": "Bengali",
+    "native": "\u09ac\u09be\u0982\u09b2\u09be"
+  },
+  "br": {
+    "English": "Breton",
+    "native": "Brezhoneg"
+  },
+  "brx": {
+    "English": "Bodo",
+    "native": "\u092c\u0930'"
+  },
+  "bs": {
+    "English": "Bosnian",
+    "native": "Bosanski"
+  },
+  "ca": {
+    "English": "Catalan",
+    "native": "Catal\u00e0"
+  },
+  "ca-valencia": {
+    "English": "Catalan (Valencian)",
+    "native": "catal\u00e0 (valenci\u00e0)"
+  },
+  "cak": {
+    "English": "Kaqchikel",
+    "native": "Maya Kaqchikel"
+  },
+  "csb": {
+    "English": "Kashubian",
+    "native": "Kasz\u00ebbsczi"
+  },
+  "cy": {
+    "English": "Welsh",
+    "native": "Cymraeg"
+  },
+  "da": {
+    "English": "Danish",
+    "native": "Dansk"
+  },
+  "dbg": {
+    "English": "Debug Robot",
+    "native": "\u1e12\u1e17\u0180\u016d\u0260 \u0158\u01ff\u0180\u01ff\u0167"
+  },
+  "de": {
+    "English": "German",
+    "native": "Deutsch"
+  },
+  "de-AT": {
+    "English": "German (Austria)",
+    "native": "Deutsch (\u00d6sterreich)"
+  },
+  "de-CH": {
+    "English": "German (Switzerland)",
+    "native": "Deutsch (Schweiz)"
+  },
+  "de-DE": {
+    "English": "German (Germany)",
+    "native": "Deutsch (Deutschland)"
+  },
+  "dsb": {
+    "English": "Lower Sorbian",
+    "native": "Dolnoserb\u0161\u0107ina"
+  },
+  "el": {
+    "English": "Greek",
+    "native": "\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"
+  },
+  "en-AU": {
+    "English": "English (Australian)",
+    "native": "English (Australian)"
+  },
+  "en-CA": {
+    "English": "English (Canadian)",
+    "native": "English (Canadian)"
+  },
+  "en-GB": {
+    "English": "English (British)",
+    "native": "English (British)"
+  },
+  "en-NZ": {
+    "English": "English (New Zealand)",
+    "native": "English (New Zealand)"
+  },
+  "en-US": {
+    "English": "English (US)",
+    "native": "English (US)"
+  },
+  "en-ZA": {
+    "English": "English (South African)",
+    "native": "English (South African)"
+  },
+  "eo": {
+    "English": "Esperanto",
+    "native": "Esperanto"
+  },
+  "es": {
+    "English": "Spanish",
+    "native": "Espa\u00f1ol"
+  },
+  "es-AR": {
+    "English": "Spanish (Argentina)",
+    "native": "Espa\u00f1ol (de Argentina)"
+  },
+  "es-CL": {
+    "English": "Spanish (Chile)",
+    "native": "Espa\u00f1ol (de Chile)"
+  },
+  "es-ES": {
+    "English": "Spanish (Spain)",
+    "native": "Espa\u00f1ol (de Espa\u00f1a)"
+  },
+  "es-MX": {
+    "English": "Spanish (Mexico)",
+    "native": "Espa\u00f1ol (de M\u00e9xico)"
+  },
+  "et": {
+    "English": "Estonian",
+    "native": "Eesti keel"
+  },
+  "eu": {
+    "English": "Basque",
+    "native": "Euskara"
+  },
+  "fa": {
+    "English": "Persian",
+    "native": "\u0641\u0627\u0631\u0633\u06cc"
+  },
+  "fi": {
+    "English": "Finnish",
+    "native": "suomi"
+  },
+  "fj-FJ": {
+    "English": "Fijian",
+    "native": "Vosa vaka-Viti"
+  },
+  "fr": {
+    "English": "French",
+    "native": "Fran\u00e7ais"
+  },
+  "fur-IT": {
+    "English": "Friulian",
+    "native": "Furlan"
+  },
+  "ga": {
+    "English": "Irish",
+    "native": "Gaeilge"
+  },
+  "gd": {
+    "English": "Gaelic (Scotland)",
+    "native": "G\u00e0idhlig"
+  },
+  "gl": {
+    "English": "Galician",
+    "native": "Galego"
+  },
+  "gn": {
+    "English": "Guarani",
+    "native": "Ava\u00f1e'\u1ebd"
+  },
+  "gu": {
+    "English": "Gujarati",
+    "native": "\u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0"
+  },
+  "gu-IN": {
+    "English": "Gujarati (India)",
+    "native": "\u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0 (\u0aad\u0abe\u0ab0\u0aa4)"
+  },
+  "he": {
+    "English": "Hebrew",
+    "native": "\u05e2\u05d1\u05e8\u05d9\u05ea"
+  },
+  "hi": {
+    "English": "Hindi",
+    "native": "\u0939\u093f\u0928\u094d\u0926\u0940"
+  },
+  "hi-IN": {
+    "English": "Hindi (India)",
+    "native": "\u0939\u093f\u0928\u094d\u0926\u0940 (\u092d\u093e\u0930\u0924)"
+  },
+  "hsb": {
+    "English": "Upper Sorbian",
+    "native": "Hornjoserbsce"
+  },
+  "hu": {
+    "English": "Hungarian",
+    "native": "magyar"
+  },
+  "hy-AM": {
+    "English": "Armenian",
+    "native": "\u0540\u0561\u0575\u0565\u0580\u0565\u0576"
+  },
+  "ia": {
+    "English": "Interlingua",
+    "native": "Interlingua"
+  },
+  "id": {
+    "English": "Indonesian",
+    "native": "Bahasa Indonesia"
+  },
+  "is": {
+    "English": "Icelandic",
+    "native": "\u00edslenska"
+  },
+  "it": {
+    "English": "Italian",
+    "native": "Italiano"
+  },
+  "ja": {
+    "English": "Japanese",
+    "native": "\u65e5\u672c\u8a9e"
+  },
+  "ja-JP-mac": {
+    "English": "Japanese",
+    "native": "\u65e5\u672c\u8a9e"
+  },
+  "kab": {
+    "English": "Kabyle",
+    "native": "Taqbaylit"
+  },
+  "kk": {
+    "English": "Kazakh",
+    "native": "\u049a\u0430\u0437\u0430\u049b"
+  },
+  "km": {
+    "English": "Khmer",
+    "native": "\u1781\u17d2\u1798\u17c2\u179a"
+  },
+  "kn": {
+    "English": "Kannada",
+    "native": "\u0c95\u0ca8\u0ccd\u0ca8\u0ca1"
+  },
+  "ko": {
+    "English": "Korean",
+    "native": "\ud55c\uad6d\uc5b4"
+  },
+  "kok": {
+    "English": "Konkani",
+    "native": "\u0915\u094b\u0902\u0915\u0928\u0940"
+  },
+  "ku": {
+    "English": "Kurdish",
+    "native": "Kurd\u00ee"
+  },
+  "ks": {
+    "English": "Kashmiri",
+    "native": "\u0643\u0634\u0645\u06cc\u0631\u06cc"
+  },
+  "la": {
+    "English": "Latin",
+    "native": "Latina"
+  },
+  "lg": {
+    "English": "Luganda",
+    "native": "Luganda"
+  },
+  "lij": {
+    "English": "Ligurian",
+    "native": "Ligure"
+  },
+  "lo": {
+    "English": "Lao",
+    "native": "\u0e9e\u0eb2\u0eaa\u0eb2\u0ea5\u0eb2\u0ea7"
+  },
+  "lt": {
+    "English": "Lithuanian",
+    "native": "Lietuvi\u0173"
+  },
+  "ltg": {
+    "English": "Latgalian",
+    "native": "Latgalie\u0161u valoda"
+  },
+  "lv": {
+    "English": "Latvian",
+    "native": "Latvie\u0161u"
+  },
+  "mai": {
+    "English": "Maithili",
+    "native": "\u092e\u0948\u0925\u093f\u0932\u0940 \u09ae\u09c8\u09a5\u09bf\u09b2\u09c0"
+  },
+  "mi": {
+    "English": "Maori (Aotearoa)",
+    "native": "M\u0101ori (Aotearoa)"
+  },
+  "mk": {
+    "English": "Macedonian",
+    "native": "\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438"
+  },
+  "mn": {
+    "English": "Mongolian",
+    "native": "\u041c\u043e\u043d\u0433\u043e\u043b"
+  },
+  "mr": {
+    "English": "Marathi",
+    "native": "\u092e\u0930\u093e\u0920\u0940"
+  },
+  "ms": {
+    "English": "Malay",
+    "native": "Melayu"
+  },
+  "my": {
+    "English": "Burmese",
+    "native": "\u1019\u103c\u1014\u103a\u1019\u102c\u1018\u102c\u101e\u102c"
+  },
+  "nb-NO": {
+    "English": "Norwegian (Bokm\u00e5l)",
+    "native": "Norsk bokm\u00e5l"
+  },
+  "ne-NP": {
+    "English": "Nepali",
+    "native": "\u0928\u0947\u092a\u093e\u0932\u0940"
+  },
+  "nn-NO": {
+    "English": "Norwegian (Nynorsk)",
+    "native": "Norsk nynorsk"
+  },
+  "nl": {
+    "English": "Dutch",
+    "native": "Nederlands"
+  },
+  "nr": {
+    "English": "Ndebele, South",
+    "native": "isiNdebele"
+  },
+  "nso": {
+    "English": "Northern Sotho",
+    "native": "Sepedi"
+  },
+  "oc": {
+    "English": "Occitan (Lengadocian)",
+    "native": "occitan (lengadocian)"
+  },
+  "or": {
+    "English": "Odia",
+    "native": "\u0b13\u0b21\u0b3c\u0b3f\u0b06"
+  },
+  "pa": {
+    "English": "Punjabi",
+    "native": "\u0a2a\u0a70\u0a1c\u0a3e\u0a2c\u0a40"
+  },
+  "pa-IN": {
+    "English": "Punjabi (India)",
+    "native": "\u0a2a\u0a70\u0a1c\u0a3e\u0a2c\u0a40 (\u0a2d\u0a3e\u0a30\u0a24)"
+  },
+  "pl": {
+    "English": "Polish",
+    "native": "Polski"
+  },
+  "pt-BR": {
+    "English": "Portuguese (Brazilian)",
+    "native": "Portugu\u00eas (do\u00a0Brasil)"
+  },
+  "pt-PT": {
+    "English": "Portuguese (Portugal)",
+    "native": "Portugu\u00eas (Europeu)"
+  },
+  "rm": {
+    "English": "Romansh",
+    "native": "rumantsch"
+  },
+  "ru": {
+    "English": "Russian",
+    "native": "\u0420\u0443\u0441\u0441\u043a\u0438\u0439"
+  },
+  "rw": {
+    "English": "Kinyarwanda",
+    "native": "Ikinyarwanda"
+  },
+  "sa": {
+    "English": "Sanskrit",
+    "native": "\u0938\u0902\u0938\u094d\u0915\u0943\u0924"
+  },
+  "sat": {
+    "English": "Santali",
+    "native": "\u0938\u0902\u0924\u093e\u0932\u0940"
+  },
+  "sah": {
+    "English": "Sakha",
+    "native": "\u0421\u0430\u0445\u0430\u043b\u044b\u044b"
+  },
+  "si": {
+    "English": "Sinhala",
+    "native": "\u0dc3\u0dd2\u0d82\u0dc4\u0dbd"
+  },
+  "sk": {
+    "English": "Slovak",
+    "native": "sloven\u010dina"
+  },
+  "sl": {
+    "English": "Slovenian",
+    "native": "Sloven\u0161\u010dina"
+  },
+  "sr-Cyrl": {
+    "English": "Serbian",
+    "native": "\u0421\u0440\u043f\u0441\u043a\u0438"
+  },
+  "ss": {
+    "English": "Siswati",
+    "native": "siSwati"
+  },
+  "st": {
+    "English": "Southern Sotho",
+    "native": "Sesotho"
+  },
+  "sv-SE": {
+    "English": "Swedish",
+    "native": "Svenska"
+  },
+  "ta-IN": {
+    "English": "Tamil (India)",
+    "native": "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd (\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe)"
+  },
+  "ta-LK": {
+    "English": "Tamil (Sri Lanka)",
+    "native": "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd (\u0b87\u0bb2\u0b99\u0bcd\u0b95\u0bc8)"
+  },
+  "th": {
+    "English": "Thai",
+    "native": "\u0e44\u0e17\u0e22"
+  },
+  "tr": {
+    "English": "Turkish",
+    "native": "T\u00fcrk\u00e7e"
+  },
+  "trs": {
+    "English": "Triqui",
+    "native": "Triqui"
+  },
+  "ts": {
+    "English": "Tsonga",
+    "native": "Xitsonga"
+  },
+  "tsz": {
+    "English": "Pur\u00e9pecha",
+    "native": "Pur\u00e9pecha"
+  },
+  "tt-RU": {
+    "English": "Tatar",
+    "native": "Tatar\u00e7a"
+  },
+  "uk": {
+    "English": "Ukrainian",
+    "native": "\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430"
+  },
+  "ur": {
+    "English": "Urdu",
+    "native": "\u0627\u064f\u0631\u062f\u0648"
+  },
+  "uz": {
+    "English": "Uzbek",
+    "native": "O\u02bbzbek tili"
+  },
+  "ve": {
+    "English": "Venda",
+    "native": "Tshiven\u1e13a"
+  },
+  "vi": {
+    "English": "Vietnamese",
+    "native": "Ti\u1ebfng Vi\u1ec7t"
+  },
+  "x-testing": {
+    "English": "Testing",
+    "native": "\u0166\u1e17\u015f\u0167\u012b\u019e\u0260"
+  },
+  "zh-CN": {
+    "English": "Chinese (Simplified)",
+    "native": "\u4e2d\u6587 (\u7b80\u4f53)"
+  },
+  "zh-TW": {
+    "English": "Chinese (Traditional)",
+    "native": "\u6b63\u9ad4\u4e2d\u6587 (\u7e41\u9ad4)"
+  }
+}
diff --git a/content/translations.js b/content/translations.js
index 2e04aeedace3..0fb1ef757b21 100644
--- a/content/translations.js
+++ b/content/translations.js
@@ -1,5 +1,12 @@
 const Document = require("./document");
 const { VALID_LOCALES } = require("./constants");
+const LANGUAGES_RAW = require("./languages.json");
+
+const LANGUAGES = new Map(
+  Object.entries(LANGUAGES_RAW).map(([locale, data]) => {
+    return [locale.toLowerCase(), data];
+  })
+);
 
 const TRANSLATIONS_OF = new Map();
 
@@ -7,12 +14,11 @@ function gatherTranslations() {
   const iter = Document.findAll().iter();
   for (const {
     metadata: { slug, locale, title },
-    url,
   } of iter) {
     const translation = {
       title,
-      url,
       locale,
+      native: LANGUAGES.get(locale.toLowerCase()).native,
     };
     const translations = TRANSLATIONS_OF.get(slug.toLowerCase());
     if (translations) {
@@ -57,7 +63,7 @@ function findDocumentTranslations(document) {
       translations.push({
         locale,
         title: translatedDocument.metadata.title,
-        url: translatedDocument.url,
+        native: LANGUAGES.get(locale.toLowerCase()).native,
       });
     }
   }
diff --git a/testing/tests/headless.test.js b/testing/tests/headless.test.js
index e037f3c0b91e..85ff6886260e 100644
--- a/testing/tests/headless.test.js
+++ b/testing/tests/headless.test.js
@@ -37,7 +37,7 @@ describe("Basic viewing of functional pages", () => {
     // Note! It's important that this happens *after* the `.toMatchElement`
     // on the line above because expect-puppeteer doesn't have a wait to
     // properly wait for the (pushState) URL to have changed.
-    expect(page.url()).toBe(testURL("/en-US/docs/Web/Foo"));
+    expect(page.url()).toBe(testURL("/en-US/docs/Web/Foo/"));
   });
 
   it("open the /en-US/docs/Web/InteractiveExample page", async () => {
@@ -246,13 +246,13 @@ describe("Basic viewing of functional pages", () => {
     await expect(page).toSelect('select[name="language"]', "English (US)");
     await expect(page).toClick("button", { text: "Change language" });
     await expect(page).toMatch("<foo>: A test tag");
-    expect(page.url()).toBe(testURL("/en-US/docs/Web/Foo"));
+    expect(page.url()).toBe(testURL("/en-US/docs/Web/Foo/"));
 
     // And change back to French
     await expect(page).toSelect('select[name="language"]', "Français");
     await expect(page).toClick("button", { text: "Change language" });
     await expect(page).toMatch("<foo>: Une page de test");
-    expect(page.url()).toBe(testURL("/fr/docs/Web/Foo"));
+    expect(page.url()).toBe(testURL("/fr/docs/Web/Foo/"));
   });
 
   it("clicking 'Sign in' should offer links to all identity providers", async () => {
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 13696e2ebeac..877b75cc1a7c 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -181,7 +181,7 @@ test("content built French foo page", () => {
   expect(doc.title).toBe("<foo>: Une page de test");
   expect(doc.isTranslated).toBe(true);
   expect(doc.other_translations[0].locale).toBe("en-US");
-  expect(doc.other_translations[0].url).toBe("/en-US/docs/Web/Foo");
+  expect(doc.other_translations[0].native).toBe("English (US)");
   expect(doc.other_translations[0].title).toBe("<foo>: A test tag");
 
   const htmlFile = path.join(builtFolder, "index.html");

From 0987df89a71fea66b91db118a0a20cd273f570ae Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 18 Mar 2021 16:07:30 -0400
Subject: [PATCH 035/288] --prune should leave archived S3 keys (#3266)

* --prune should leave archived S3 keys

Part of #2224

* Update deployer/src/deployer/upload.py

Co-authored-by: Ryan Johnson <escattone@gmail.com>

* Update deployer/src/deployer/upload.py

Co-authored-by: Ryan Johnson <escattone@gmail.com>

* parse_archived_txt_file as a generator

* only one 1 set

* add a nice warning about --prune without --archived-files

Co-authored-by: Ryan Johnson <escattone@gmail.com>
---
 .github/workflows/dev-build.yml   |  2 +-
 .github/workflows/stage-build.yml |  2 +-
 deployer/src/deployer/main.py     | 31 ++++++++++++++++++
 deployer/src/deployer/upload.py   | 54 +++++++++++++++++++++++++++++++
 4 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index f38427d16951..647da09e1673 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -204,7 +204,7 @@ jobs:
           # XXX would be nice to validate here that $DEPLOYER_BUCKET_PREFIX is truthy
           echo "DEPLOYER_BUCKET_PREFIX=$DEPLOYER_BUCKET_PREFIX"
 
-          poetry run deployer upload --prune ../client/build
+          poetry run deployer upload --prune --archived-files ../content/archived.txt ../client/build
           poetry run deployer update-lambda-functions ./aws-lambda
           # TODO
           # Execute command to tell the Dev CloudFront distribution to use the
diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
index 29b5790b82f8..c20244921e14 100644
--- a/.github/workflows/stage-build.yml
+++ b/.github/workflows/stage-build.yml
@@ -240,7 +240,7 @@ jobs:
           # XXX would be nice to validate here that $DEPLOYER_BUCKET_PREFIX is truthy
           echo "DEPLOYER_BUCKET_PREFIX=$DEPLOYER_BUCKET_PREFIX"
 
-          poetry run deployer upload  --prune ../client/build
+          poetry run deployer upload  --prune --archived-files ../content/archived.txt ../client/build
           poetry run deployer update-lambda-functions ./aws-lambda
 
           # TODO: Depending on how long the upload takes, consider switching to
diff --git a/deployer/src/deployer/main.py b/deployer/src/deployer/main.py
index e401c510f307..c3c053a7d81d 100644
--- a/deployer/src/deployer/main.py
+++ b/deployer/src/deployer/main.py
@@ -39,6 +39,22 @@ def validate_optional_directory(ctx, param, value):
         return validate_directory(ctx, param, value)
 
 
+def validate_file(ctz, param, value):
+    if not value:
+        raise click.BadParameter(f"{value!r}")
+    path = Path(value)
+    if not path.exists():
+        raise click.BadParameter(f"{value} does not exist")
+    elif not path.is_file():
+        raise click.BadParameter(f"{value} is not a file")
+    return path
+
+
+def validate_optional_file(ctx, param, value):
+    if value:
+        return validate_file(ctx, param, value)
+
+
 @click.group()
 @click.option(
     "--dry-run",
@@ -151,6 +167,15 @@ def whatsdeployed(ctx, directory: Path, output: str):
     show_default=True,
     is_flag=True,
 )
+@click.option(
+    "--archived-files",
+    help=(
+        "The path to the file that lists which files are archived. "
+        "(Only relevant in conjunction with --prune)"
+    ),
+    default=None,
+    callback=validate_optional_file,
+)
 @click.argument("directory", type=click.Path(), callback=validate_directory)
 @click.pass_context
 def upload(ctx, directory: Path, **kwargs):
@@ -160,6 +185,12 @@ def upload(ctx, directory: Path, **kwargs):
         content_roots.append(kwargs["content_translated_root"])
     if kwargs["content_archived_root"]:
         content_roots.append(kwargs["content_archived_root"])
+
+    if kwargs["prune"] and not kwargs["archived_files"]:
+        log.warning(
+            "Warning! Running with --prune but NOT ----archived-files will "
+            "possibly delete all archived content."
+        )
     ctx.obj.update(kwargs)
     upload_content(directory, content_roots, ctx.obj)
 
diff --git a/deployer/src/deployer/upload.py b/deployer/src/deployer/upload.py
index 31c0631f3c30..59db69ca6657 100644
--- a/deployer/src/deployer/upload.py
+++ b/deployer/src/deployer/upload.py
@@ -498,6 +498,14 @@ def delete(self, keys, on_task_complete=None, dry_run=False):
         return timer
 
 
+def parse_archived_txt_file(file: Path):
+    with open(file) as f:
+        for line in f:
+            line = line.strip()
+            if line and not line.startswith("#"):
+                yield line
+
+
 def upload_content(build_directory, content_roots, config):
     full_timer = StopWatch().start()
 
@@ -508,6 +516,7 @@ def upload_content(build_directory, content_roots, config):
     show_progress_bar = not config["no_progressbar"]
     upload_redirects = not config["no_redirects"]
     prune = config["prune"]
+    archived_txt_file = config["archived_files"]
 
     log.info(f"Upload files from: {build_directory}")
     if upload_redirects:
@@ -583,6 +592,15 @@ def on_task_complete(task):
         # now deleted.
         now = datetime.datetime.utcnow().replace(tzinfo=UTC)
         delete_keys = []
+
+        archived_files_as_keys = set()
+        if archived_txt_file:
+            for file in parse_archived_txt_file(archived_txt_file):
+                locale, slug = file.replace("/index.html", "").split("/", 1)
+                archived_files_as_keys.add(f"{bucket_prefix}/{locale}/docs/{slug}")
+            if not archived_files_as_keys:
+                raise Exception(f"found no entries inside {archived_txt_file}")
+
         for key in existing_bucket_objects:
             if key.startswith(f"{bucket_prefix}/_whatsdeployed/"):
                 # These are special and wouldn't have been uploaded
@@ -603,6 +621,42 @@ def on_task_complete(task):
                 if delta.days < 30:
                     continue
 
+            # Remember, if `key` is from a "index.html" file it will be represented
+            # something like this: `main/en-us/docs/web/api/documentorshadowroot`
+            # with the `/index.html` portion removed.
+            # But every page usually has a `index.json` file, which might look
+            # something like this: `main/en-us/docs/web/api/index.json` or
+            # `main/en-us/docs/web/api/screenshot.png`
+
+            # This if statement protects against possible deleting anything that
+            # isn't a document.
+            if "/docs/" in key:
+                is_archived = False
+                # Trying to avoid having to do another for-loop with key.startswith()
+                # so first look for the low-hanging fruit.
+                if key in archived_files_as_keys:
+                    # This is the easiest and fastest lookup
+                    is_archived = True
+                elif (
+                    re.sub(r"/(index\.json|contributors\.txt|bcd\.json)$", "", key)
+                    in archived_files_as_keys
+                ):
+                    # This is easy and fast too and covers 99% of the other
+                    # possible keys.
+                    is_archived = True
+                else:
+                    # This is for things like:
+                    # `main/en-us/docs/web/api/screenshot.png` where you can't
+                    # confidently use `path.dirname()` because the key could
+                    # be something like `main/fr/docs/web/api/manifest.json` which
+                    # is actually a "folder".
+                    for archive_file_as_key in archived_files_as_keys:
+                        if key.startswith(archive_file_as_key):
+                            is_archived = True
+                            break
+                if is_archived:
+                    continue
+
             assert key.startswith(bucket_prefix)
 
             delete_keys.append(key)

From 20f5599adc6b5042f27ccfb35368d1ba17b97380 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 18 Mar 2021 16:16:54 -0400
Subject: [PATCH 036/288] fix tools links in writer-home page (#3274)

---
 client/src/writers-homepage/index.tsx | 49 +++++++++++++++++----------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/client/src/writers-homepage/index.tsx b/client/src/writers-homepage/index.tsx
index 487ebc84996a..b3113b2bad34 100644
--- a/client/src/writers-homepage/index.tsx
+++ b/client/src/writers-homepage/index.tsx
@@ -1,15 +1,16 @@
-import React, { lazy, Suspense } from "react";
+import React from "react";
 import { Link } from "react-router-dom";
 import { PageContentContainer } from "../ui/atoms/page-content";
 import { Search } from "../ui/molecules/search";
-
+import { useLocale } from "../hooks";
 import "./index.scss";
 
 // Lazy sub-components
-const ViewedDocuments = lazy(() => import("./viewed-documents"));
+const ViewedDocuments = React.lazy(() => import("./viewed-documents"));
 
 export default function WritersHomepage() {
   const isServer = typeof window === "undefined";
+  const locale = useLocale();
 
   return (
     <PageContentContainer>
@@ -19,62 +20,74 @@ export default function WritersHomepage() {
         <Search />
 
         {!isServer && (
-          <Suspense fallback={null}>
+          <React.Suspense fallback={null}>
             <ViewedDocuments />
-          </Suspense>
+          </React.Suspense>
         )}
 
         <h3>Sample pages</h3>
         <ul>
           <li>
-            <Link to="/en-US/docs/MDN/Kitchensink">The Kitchensink</Link>
+            <Link to="/en-US/docs/MDN/Kitchensink">
+              The Kitchensink (en-US)
+            </Link>
           </li>
           <li>
-            <Link to="/en-US/docs/Web/HTML">Web/HTML index</Link>
+            <Link to={`/${locale}/docs/Web/HTML`}>Web/HTML index</Link>
             <ul>
               <li>
-                <Link to="/en-US/docs/Web/HTML/Element/video">HTML/video</Link>
+                <Link to={`/${locale}/docs/Web/HTML/Element/video`}>
+                  HTML/video
+                </Link>
               </li>
             </ul>
           </li>
 
           <li>
-            <Link to="/en-US/docs/Web/API">Web/API index</Link>
+            <Link to={`/${locale}/docs/Web/API`}>Web/API index</Link>
             <ul>
               <li>
-                <Link to="/en-US/docs/Web/API/Fetch_API/Using_Fetch">
+                <Link to={`/${locale}/docs/Web/API/Fetch_API/Using_Fetch`}>
                   Using Fetch API
                 </Link>
               </li>
             </ul>
           </li>
           <li>
-            <Link to="/en-US/docs/Web/CSS">Web/CSS index</Link>
+            <Link to={`/${locale}/docs/Web/CSS`}>Web/CSS index</Link>
             <ul>
               <li>
-                <Link to="/en-US/docs/Web/CSS/Specificity">
+                <Link to={`/${locale}/docs/Web/CSS/Specificity`}>
                   CSS Specificity
                 </Link>
               </li>
             </ul>
           </li>
           <li>
-            <Link to="/en-US/docs/Web/JavaScript">Web/JavaScript index</Link>
+            <Link to={`/${locale}/docs/Web/JavaScript`}>
+              Web/JavaScript index
+            </Link>
             <ul>
               <li>
-                <Link to="/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach">
+                <Link
+                  to={`/${locale}/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach`}
+                >
                   Array.prototype.forEach()
                 </Link>
               </li>
             </ul>
           </li>
           <li>
-            <Link to="/en-US/docs/Mozilla/Add-ons/WebExtensions/Browser_support_for_JavaScript_APIs">
+            <Link
+              to={`/${locale}/docs/Mozilla/Add-ons/WebExtensions/Browser_support_for_JavaScript_APIs`}
+            >
               Page with lots of BCD tables
             </Link>
           </li>
           <li>
-            <Link to="/en-US/docs/Web/API/Document/#Browser_compatibility">
+            <Link
+              to={`/${locale}/docs/Web/API/Document/#Browser_compatibility`}
+            >
               Largest BCD table
             </Link>
           </li>
@@ -82,10 +95,10 @@ export default function WritersHomepage() {
         <h3>Tools</h3>
         <ul>
           <li>
-            <Link to="/en-US/_sitemap">Sitemap</Link>
+            <Link to={`/${locale}/_sitemap`}>Sitemap</Link>
           </li>
           <li>
-            <Link to="/en-US/_flaws">Flaws Dashboard</Link>
+            <Link to={`/${locale}/_flaws`}>Flaws Dashboard</Link>
           </li>
         </ul>
       </div>

From c1ac216156dbfac204286e6db9ae21cc51c6c1fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 05:49:59 +0000
Subject: [PATCH 037/288] build(deps): bump @mdn/browser-compat-data from 3.2.0
 to 3.2.1 (#3284)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9547951774fd..e91940744c69 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
   "dependencies": {
     "@caporal/core": "2.0.2",
     "@fast-csv/parse": "4.3.6",
-    "@mdn/browser-compat-data": "3.2.0",
+    "@mdn/browser-compat-data": "3.2.1",
     "accept-language-parser": "1.5.0",
     "chalk": "4.1.0",
     "cheerio": "1.0.0-rc.5",
diff --git a/yarn.lock b/yarn.lock
index 7edd6204053b..971c78c0ba18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1882,10 +1882,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@mdn/browser-compat-data@3.2.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.2.0.tgz#42b8f6c2866a77873a67d962428e417fd73201c2"
-  integrity sha512-pb3IvMWuDxNwWw8MfD7juJO8i5D0mo02LWNjV6T/LYzUeHSu/LL5e5ufUAyrDjsBw3T1+gqqmUBvj5WtuuPGgQ==
+"@mdn/browser-compat-data@3.2.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.2.1.tgz#18707a79db035b430d6bab370d00cd14c39e0553"
+  integrity sha512-rIfqD67k64yP6RfFyZOVSLykDoNfAkeqRrTZnKs13rfa+EAFF/FOYAKTOpKMwMUfTM2/+FGYRGaiFmETnGRjsQ==
   dependencies:
     extend "3.0.2"
 

From 9e48dff88e91e060ce5bd12c98aaea58585e51d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 06:48:44 +0000
Subject: [PATCH 038/288] build(deps): bump boto3 from 1.17.30 to 1.17.32 in
 /deployer (#3285)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 4395de5c1f06..db277b7fcdb0 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.30"
+version = "1.17.32"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.30,<1.21.0"
+botocore = ">=1.20.32,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.30"
+version = "1.20.32"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -482,7 +482,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "fece341f13f2a5cc7d43fc902fbbec6318d921445d32969a5215c8bcae13adb2"
+content-hash = "fc6df7112afa97a2dc58eee6d5df9c38764dd9eb417d9093b42f6d0367e69e5a"
 
 [metadata.files]
 appdirs = [
@@ -501,12 +501,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.30-py2.py3-none-any.whl", hash = "sha256:fe1898c5b10035528207995c9931b78f2f50bb70cf93bac353152aea47c04780"},
-    {file = "boto3-1.17.30.tar.gz", hash = "sha256:d39c04b51e60197f5503f8489f043bc904981567cc8431d389367767dc3fd5ae"},
+    {file = "boto3-1.17.32-py2.py3-none-any.whl", hash = "sha256:85069e044c871571b7a72b600123761e1747ad18328fa5188f13b097a394251d"},
+    {file = "boto3-1.17.32.tar.gz", hash = "sha256:2df49a4360ef0640902c26bf93ac0791b37755db3a2efd0d51a03eddeb9f807e"},
 ]
 botocore = [
-    {file = "botocore-1.20.30-py2.py3-none-any.whl", hash = "sha256:63951595a736dfc9759f57e33bec6eaea4f09c4800626ef5309437060b263e48"},
-    {file = "botocore-1.20.30.tar.gz", hash = "sha256:98ff1eb210d394a1ffe736b33c8a7be68f30f0a03550b559c5bb6fdf0c29328d"},
+    {file = "botocore-1.20.32-py2.py3-none-any.whl", hash = "sha256:fc162b69adc54c9ef037fec31f93d46df0bf8a9c3d201ecb16d0a9ec5f2936ec"},
+    {file = "botocore-1.20.32.tar.gz", hash = "sha256:1cef96e716f7481bfb3b8d3c3d45e640d588aa5af613cd6d7f33d784aa2e8d12"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index e197857897b6..ebe259e4a66d 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.30"
+boto3 = "^1.17.32"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 68052d9309d6b935797905429c2c45158ff10712 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 19 Mar 2021 13:16:59 -0400
Subject: [PATCH 039/288] Ability to build by specific locale(s) (#3268)

Fixes #3267
---
 build/cli.js        | 33 ++++++++++++++++++++++++++-------
 content/document.js | 21 +++++++++++++++++++--
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/build/cli.js b/build/cli.js
index bb55b76a41d0..9b6c03fcaf03 100644
--- a/build/cli.js
+++ b/build/cli.js
@@ -15,10 +15,9 @@ const {
   CONTENT_TRANSLATED_ROOT,
   CONTENT_ARCHIVED_ROOT,
 } = require("../content");
-
+const { VALID_LOCALES } = require("../libs/constants");
 // eslint-disable-next-line node/no-missing-require
 const { renderDocHTML } = require("../ssr/dist/main");
-
 const options = require("./build-options");
 const { buildDocument, renderContributorsTxt } = require("./index");
 const SearchIndex = require("./search-index");
@@ -77,13 +76,15 @@ async function buildDocumentInteractive(
 async function buildDocuments(
   files = null,
   quiet = false,
-  interactive = false
+  interactive = false,
+  locales = new Map()
 ) {
   // If a list of files was set, it came from the CLI.
   // Override whatever was in the build options.
-  const findAllOptions = files
-    ? Object.assign({}, options, { files: new Set(files) })
-    : options;
+  const findAllOptions = Object.assign({}, options, { locales });
+  if (files) {
+    findAllOptions.files = new Set(files);
+  }
 
   const documents = Document.findAll(findAllOptions);
   const progressBar = new cliProgress.SingleBar(
@@ -278,6 +279,10 @@ program
   .option("-i, --interactive", "Ask what to do when encountering flaws", {
     default: false,
   })
+  .option("-l, --locale <locale...>", "Filtered specific locales", {
+    default: [],
+    validator: [...VALID_LOCALES.keys()],
+  })
   .argument("[files...]", "specific files to build")
   .action(async ({ args, options }) => {
     try {
@@ -296,11 +301,25 @@ program
         }
       }
       const { files } = args;
+
+      // 'true' means we include this locale and all others get excluded.
+      // Some day we might make it an option to set `--not-locale` to
+      // filter out specific locales.
+      const locales = new Map(
+        // The `options.locale` is either an empty array (e.g. no --locale used),
+        // a string (e.g. one single --locale) or an array of strings
+        // (e.g. multiple --locale options).
+        (Array.isArray(options.locale)
+          ? options.locale
+          : [options.locale]
+        ).map((locale) => [locale, true])
+      );
       const t0 = new Date();
       const { slugPerLocale, peakHeapBytes, totalFlaws } = await buildDocuments(
         files,
         Boolean(options.quiet),
-        Boolean(options.interactive)
+        Boolean(options.interactive),
+        locales
       );
       const t1 = new Date();
       const count = Object.values(slugPerLocale).reduce(
diff --git a/content/document.js b/content/document.js
index 02044ffa3f8a..6b2c63b74a04 100644
--- a/content/document.js
+++ b/content/document.js
@@ -358,7 +358,11 @@ function findByURL(url, ...args) {
   return doc;
 }
 
-function findAll({ files = new Set(), folderSearch = null } = {}) {
+function findAll({
+  files = new Set(),
+  folderSearch = null,
+  locales = new Map(),
+} = {}) {
   if (!(files instanceof Set)) throw new TypeError("'files' not a Set");
   if (folderSearch && typeof folderSearch !== "string")
     throw new TypeError("'folderSearch' not a string");
@@ -373,9 +377,22 @@ function findAll({ files = new Set(), folderSearch = null } = {}) {
   }
   roots.push(CONTENT_ROOT);
   for (const root of roots) {
+    const searchPattern = [""];
+    if (locales.size) {
+      const localePrefixes = [];
+      for (const [locale, include] of locales) {
+        if (!include) {
+          throw new Error("ability to exclude locales is not supported yet");
+        }
+        localePrefixes.push(locale);
+      }
+      searchPattern.push(`+(${localePrefixes.join("|")})`);
+    }
+    searchPattern.push("**");
+    searchPattern.push(HTML_FILENAME);
     filePaths.push(
       ...glob
-        .sync(path.join(root, "**", HTML_FILENAME))
+        .sync(searchPattern.join(path.sep), { root })
         .filter((filePath) => {
           // The 'files' set is either a list of absolute full paths or a
           // list of endings.

From 7b73ce0198756d72b04de56544c75581aad397c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 15:12:58 -0400
Subject: [PATCH 040/288] build(deps): bump open from 7.4.2 to 8.0.3 (#3283)

Bumps [open](https://github.com/sindresorhus/open) from 7.4.2 to 8.0.3.
- [Release notes](https://github.com/sindresorhus/open/releases)
- [Commits](https://github.com/sindresorhus/open/compare/v7.4.2...v8.0.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index e91940744c69..fbfbdca3aef8 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "loglevel": "^1.7.1",
     "lru-cache": "^6.0.0",
     "mdn-data": "2.0.17",
-    "open": "^7.4.2",
+    "open": "^8.0.3",
     "open-editor": "3.0.0",
     "prismjs": "1.23.0",
     "read-chunk": "3.2.0",
diff --git a/yarn.lock b/yarn.lock
index 971c78c0ba18..e0c52aa18bbb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6566,6 +6566,11 @@ defer-to-connect@^2.0.0:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.0.tgz#83d6b199db041593ac84d781b5222308ccf4c2c1"
   integrity sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==
 
+define-lazy-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
+  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
+
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -10057,7 +10062,7 @@ is-directory@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
-is-docker@^2.0.0:
+is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
   integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
@@ -12845,7 +12850,7 @@ open-editor@3.0.0:
     line-column-path "^2.0.0"
     open "^7.3.0"
 
-open@^7.0.2, open@^7.0.3, open@^7.3.0, open@^7.4.2:
+open@^7.0.2, open@^7.0.3, open@^7.3.0:
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
   integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
@@ -12853,6 +12858,15 @@ open@^7.0.2, open@^7.0.3, open@^7.3.0, open@^7.4.2:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
 
+open@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.0.3.tgz#04f4406c950666c35041aad8a621700022116afd"
+  integrity sha512-7nsHNw3rOIPTwhF5iYkgE+LVM/oUHWC3cgrWNxPqa+W+Wl5Ekvo32qayB5PYX8zNjXzUkrTaJsWpaGmuw8Aspg==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
+
 opencollective-postinstall@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"

From 307e1972f4ed297b87cdad2a3d802a853820bded Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 19 Mar 2021 15:19:14 -0400
Subject: [PATCH 041/288] Analyze pr build (#3282)

* deployer analyze-pr-build

* hacky fixes

* add the new file

* add octokitpy

* louder

* post comment

* int

* testing something

* smarter

* bit louder

* bit louder

* bit louder

* bit louder

* use glob

* it works

* github_url

* updates

* Apply suggestions from code review

Co-authored-by: Ryan Johnson <escattone@gmail.com>

* move print to CLI

* basic tests

Co-authored-by: Ryan Johnson <escattone@gmail.com>
---
 deployer/README.md                       |  65 +++
 deployer/poetry.lock                     | 659 +++++++++++++----------
 deployer/pyproject.toml                  |   1 +
 deployer/src/deployer/analyze_pr.py      | 184 +++++++
 deployer/src/deployer/constants.py       |   5 +
 deployer/src/deployer/main.py            |  62 ++-
 deployer/src/deployer/test_analyze_pr.py | 112 ++++
 7 files changed, 798 insertions(+), 290 deletions(-)
 create mode 100644 deployer/src/deployer/analyze_pr.py
 create mode 100644 deployer/src/deployer/test_analyze_pr.py

diff --git a/deployer/README.md b/deployer/README.md
index 62396ca89320..efe4bf1804eb 100644
--- a/deployer/README.md
+++ b/deployer/README.md
@@ -168,6 +168,71 @@ This will first index all the files whose `index.json` file path (relative
 to the root) matches `en-us/docs/web`. Then it does all that match `en-us/docs`.
 And lastly, it does all the files that don't match any of the prefixes.
 
+## Analyze PR builds
+
+When you've built files you can analyze those built files to produce a Markdown
+comment that you can post as a PR issue comment. To do that, run:
+
+```sh
+poetry run deployer analyze-pr-build ../client/build
+```
+
+But the actions are controlled by various options. You can mix and match these:
+
+### `--analyze-flaws`
+
+This will open each built `index.json` and look through the `.flaws` and try to
+convert each flaw into a list.
+
+### `--analyze-dangerous-content`
+
+It will analyze all the content and look for content that could be "dangerous".
+For example, it will list all external URLs found in the content.
+
+### `--prefix`
+
+The `prefix` refers to a prefix in the Deployer upload. I.e. what you set when
+you run `poetry run deployer upload --prefix=THIS`.
+The `prefix` is used to specify the proper Dev subdomain (`{prefix}.content.dev.mdn.mozit.cloud`) for the URLs of the built documents. For example,
+if `--prefix experiment1` is specified, it will list:
+
+```md
+## Preview deployment
+
+- <https://experiment1.content.dev.mdn.mozit.cloud/en-US/docs/MDN/Kitchensink>
+```
+
+...assuming the only page that was built was `build/en-us/docs/mdn/kitchensink`.
+Note that this assumes the PR build has been deployed to the Dev server.
+
+### `--repo`
+
+This is useful for debugging when the PR you made wasn't on `mdn/content`. For example:
+
+```sh
+poetry run deployer analyze-pr-build ../client/build --repo peterbe/content ...
+```
+
+### `--github-token`
+
+By default it will pick up the `$GITHUB_TOKEN` environment variable but with this
+option you can override it.
+
+### `--pr-number`
+
+This is needed to be able to find the PR (on <https://github.com/mdn/content/pulls>)
+to post the comment to.
+
+### A complete example
+
+This example demonstrates all options.
+
+```sh
+poetry run deployer --dry-run analyze-pr-build ../client/build \
+  --analyze-flaws --analyze-dangerous-content --github-token="xxx" \
+  --repo=peterbe/content --pr-number=3
+```
+
 ## Environment variables
 
 The following environment variables are supported.
diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index db277b7fcdb0..244f31633031 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -1,40 +1,41 @@
 [[package]]
-name = "appdirs"
-version = "1.4.4"
-description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
+description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+name = "appdirs"
 optional = false
 python-versions = "*"
+version = "1.4.4"
 
 [[package]]
-name = "atomicwrites"
-version = "1.4.0"
-description = "Atomic file writes."
 category = "dev"
+description = "Atomic file writes."
+marker = "sys_platform == \"win32\""
+name = "atomicwrites"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "1.4.0"
 
 [[package]]
-name = "attrs"
-version = "20.3.0"
-description = "Classes Without Boilerplate"
 category = "dev"
+description = "Classes Without Boilerplate"
+name = "attrs"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "20.3.0"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"]
+dev = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"]
 docs = ["furo", "sphinx", "zope.interface"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"]
+tests = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"]
+tests_no_zope = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"]
 
 [[package]]
-name = "black"
-version = "20.8b1"
-description = "The uncompromising code formatter."
 category = "dev"
+description = "The uncompromising code formatter."
+name = "black"
 optional = false
 python-versions = ">=3.6"
+version = "20.8b1"
 
 [package.dependencies]
 appdirs = "*"
@@ -51,12 +52,12 @@ colorama = ["colorama (>=0.4.3)"]
 d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
-name = "boto3"
-version = "1.17.32"
-description = "The AWS SDK for Python"
 category = "main"
+description = "The AWS SDK for Python"
+name = "boto3"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+version = "1.17.32"
 
 [package.dependencies]
 botocore = ">=1.20.32,<1.21.0"
@@ -64,12 +65,12 @@ jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
-name = "botocore"
-version = "1.20.32"
-description = "Low-level, data-driven core of boto 3."
 category = "main"
+description = "Low-level, data-driven core of boto 3."
+name = "botocore"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+version = "1.20.32"
 
 [package.dependencies]
 jmespath = ">=0.7.1,<1.0.0"
@@ -77,77 +78,92 @@ python-dateutil = ">=2.1,<3.0.0"
 urllib3 = ">=1.25.4,<1.27"
 
 [package.extras]
-crt = ["awscrt (==0.10.8)"]
+crt = ["awscrt (0.10.8)"]
 
 [[package]]
-name = "certifi"
-version = "2020.12.5"
-description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
+description = "Python package for providing Mozilla's CA Bundle."
+name = "certifi"
 optional = false
 python-versions = "*"
+version = "2020.12.5"
 
 [[package]]
-name = "cffi"
-version = "1.14.4"
-description = "Foreign Function Interface for Python calling C code."
 category = "main"
+description = "Foreign Function Interface for Python calling C code."
+name = "cffi"
 optional = false
 python-versions = "*"
+version = "1.14.5"
 
 [package.dependencies]
 pycparser = "*"
 
 [[package]]
-name = "chardet"
-version = "4.0.0"
-description = "Universal encoding detector for Python 2 and 3"
 category = "main"
+description = "Universal encoding detector for Python 2 and 3"
+name = "chardet"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+version = "4.0.0"
 
 [[package]]
-name = "click"
-version = "7.1.2"
-description = "Composable command line interface toolkit"
 category = "main"
+description = "Composable command line interface toolkit"
+name = "click"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+version = "7.1.2"
 
 [[package]]
-name = "colorama"
-version = "0.4.4"
-description = "Cross-platform colored terminal text."
 category = "dev"
+description = "Cross-platform colored terminal text."
+marker = "sys_platform == \"win32\""
+name = "colorama"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+version = "0.4.4"
 
 [[package]]
-name = "cryptography"
-version = "3.3.1"
-description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 category = "main"
+description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
+name = "cryptography"
 optional = false
-python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*"
+python-versions = ">=3.6"
+version = "3.4.6"
 
 [package.dependencies]
 cffi = ">=1.12"
-six = ">=1.4.1"
 
 [package.extras]
-docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
+docs = ["sphinx (>=1.6.5,<1.8.0 || >1.8.0,<3.1.0 || >3.1.0,<3.1.1 || >3.1.1)", "sphinx-rtd-theme"]
 docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
 pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
+sdist = ["setuptools-rust (>=0.11.4)"]
 ssh = ["bcrypt (>=3.1.5)"]
-test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
+test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"]
+
+[[package]]
+category = "main"
+description = "Python @deprecated decorator to deprecate old python classes, functions or methods."
+name = "deprecated"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "1.2.12"
+
+[package.dependencies]
+wrapt = ">=1.10,<2"
+
+[package.extras]
+dev = ["tox", "bump2version (<1)", "sphinx (<2)", "importlib-metadata (<3)", "importlib-resources (<4)", "configparser (<5)", "sphinxcontrib-websupport (<2)", "zipp (<2)", "PyTest (<5)", "PyTest-Cov (<2.6)", "pytest", "pytest-cov"]
 
 [[package]]
-name = "elasticsearch"
-version = "7.10.1"
-description = "Python client for Elasticsearch"
 category = "main"
+description = "Python client for Elasticsearch"
+name = "elasticsearch"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4"
+version = "7.11.0"
 
 [package.dependencies]
 certifi = "*"
@@ -160,12 +176,12 @@ docs = ["sphinx (<1.7)", "sphinx-rtd-theme"]
 requests = ["requests (>=2.4.0,<3.0.0)"]
 
 [[package]]
-name = "elasticsearch-dsl"
-version = "7.3.0"
-description = "Python client for Elasticsearch"
 category = "main"
+description = "Python client for Elasticsearch"
+name = "elasticsearch-dsl"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "7.3.0"
 
 [package.dependencies]
 elasticsearch = ">=7.0.0,<8.0.0"
@@ -176,147 +192,185 @@ six = "*"
 develop = ["mock", "pytest (>=3.0.0)", "pytest-cov", "pytest-mock (<3.0.0)", "pytz", "coverage (<5.0.0)", "sphinx", "sphinx-rtd-theme"]
 
 [[package]]
-name = "flake8"
-version = "3.9.0"
-description = "the modular source code checker: pep8 pyflakes and co"
 category = "dev"
+description = "the modular source code checker: pep8 pyflakes and co"
+name = "flake8"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+version = "3.9.0"
 
 [package.dependencies]
-importlib-metadata = {version = "*", markers = "python_version < \"3.8\""}
 mccabe = ">=0.6.0,<0.7.0"
 pycodestyle = ">=2.7.0,<2.8.0"
 pyflakes = ">=2.3.0,<2.4.0"
 
+[package.dependencies.importlib-metadata]
+python = "<3.8"
+version = "*"
+
 [[package]]
-name = "idna"
-version = "2.10"
-description = "Internationalized Domain Names in Applications (IDNA)"
 category = "main"
+description = "Internationalized Domain Names in Applications (IDNA)"
+name = "idna"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "2.10"
 
 [[package]]
-name = "importlib-metadata"
-version = "3.3.0"
-description = "Read metadata from Python packages"
 category = "dev"
+description = "Read metadata from Python packages"
+marker = "python_version < \"3.8\""
+name = "importlib-metadata"
 optional = false
 python-versions = ">=3.6"
+version = "3.7.3"
 
 [package.dependencies]
-typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""}
 zipp = ">=0.5"
 
+[package.dependencies.typing-extensions]
+python = "<3.8"
+version = ">=3.6.4"
+
 [package.extras]
-docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "jaraco.test (>=3.2.0)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
+docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
+testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
 
 [[package]]
-name = "iniconfig"
-version = "1.1.1"
-description = "iniconfig: brain-dead simple config-ini parsing"
 category = "dev"
+description = "iniconfig: brain-dead simple config-ini parsing"
+name = "iniconfig"
 optional = false
 python-versions = "*"
+version = "1.1.1"
 
 [[package]]
-name = "jmespath"
-version = "0.10.0"
-description = "JSON Matching Expressions"
 category = "main"
+description = "JSON Matching Expressions"
+name = "jmespath"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+version = "0.10.0"
 
 [[package]]
-name = "mccabe"
-version = "0.6.1"
-description = "McCabe checker, plugin for flake8"
 category = "dev"
+description = "McCabe checker, plugin for flake8"
+name = "mccabe"
 optional = false
 python-versions = "*"
+version = "0.6.1"
 
 [[package]]
-name = "mypy-extensions"
-version = "0.4.3"
-description = "Experimental type system extensions for programs checked with the mypy typechecker."
 category = "dev"
+description = "Experimental type system extensions for programs checked with the mypy typechecker."
+name = "mypy-extensions"
 optional = false
 python-versions = "*"
+version = "0.4.3"
 
 [[package]]
-name = "packaging"
-version = "20.8"
-description = "Core utilities for Python packages"
 category = "dev"
+description = "Core utilities for Python packages"
+name = "packaging"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "20.9"
 
 [package.dependencies]
 pyparsing = ">=2.0.2"
 
 [[package]]
-name = "pathspec"
-version = "0.8.1"
-description = "Utility library for gitignore style pattern matching of file paths."
 category = "dev"
+description = "Utility library for gitignore style pattern matching of file paths."
+name = "pathspec"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+version = "0.8.1"
 
 [[package]]
-name = "pluggy"
-version = "0.13.1"
-description = "plugin and hook calling mechanisms for python"
 category = "dev"
+description = "plugin and hook calling mechanisms for python"
+name = "pluggy"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "0.13.1"
 
 [package.dependencies]
-importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""}
+[package.dependencies.importlib-metadata]
+python = "<3.8"
+version = ">=0.12"
 
 [package.extras]
 dev = ["pre-commit", "tox"]
 
 [[package]]
-name = "py"
-version = "1.10.0"
-description = "library with cross-python path, ini-parsing, io, code, log facilities"
 category = "dev"
+description = "library with cross-python path, ini-parsing, io, code, log facilities"
+name = "py"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "1.10.0"
 
 [[package]]
-name = "pycodestyle"
-version = "2.7.0"
-description = "Python style guide checker"
 category = "dev"
+description = "Python style guide checker"
+name = "pycodestyle"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "2.7.0"
 
 [[package]]
-name = "pycparser"
-version = "2.20"
-description = "C parser in Python"
 category = "main"
+description = "C parser in Python"
+name = "pycparser"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "2.20"
 
 [[package]]
-name = "pyflakes"
-version = "2.3.0"
-description = "passive checker of Python programs"
 category = "dev"
+description = "passive checker of Python programs"
+name = "pyflakes"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "2.3.0"
 
 [[package]]
-name = "pyopenssl"
-version = "20.0.1"
-description = "Python wrapper module around the OpenSSL library"
 category = "main"
+description = "Use the full Github API v3"
+name = "pygithub"
+optional = false
+python-versions = ">=3.6"
+version = "1.54.1"
+
+[package.dependencies]
+deprecated = "*"
+pyjwt = "<2.0"
+requests = ">=2.14.0"
+
+[package.extras]
+integrations = ["cryptography"]
+
+[[package]]
+category = "main"
+description = "JSON Web Token implementation in Python"
+name = "pyjwt"
+optional = false
+python-versions = "*"
+version = "1.7.1"
+
+[package.extras]
+crypto = ["cryptography (>=1.4)"]
+flake8 = ["flake8", "flake8-import-order", "pep8-naming"]
+test = ["pytest (>=4.0.1,<5.0.0)", "pytest-cov (>=2.6.0,<3.0.0)", "pytest-runner (>=4.2,<5.0.0)"]
+
+[[package]]
+category = "main"
+description = "Python wrapper module around the OpenSSL library"
+name = "pyopenssl"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*"
+version = "20.0.1"
 
 [package.dependencies]
 cryptography = ">=3.2"
@@ -327,162 +381,179 @@ docs = ["sphinx", "sphinx-rtd-theme"]
 test = ["flaky", "pretend", "pytest (>=3.0.1)"]
 
 [[package]]
-name = "pyparsing"
-version = "2.4.7"
-description = "Python parsing module"
 category = "dev"
+description = "Python parsing module"
+name = "pyparsing"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+version = "2.4.7"
 
 [[package]]
-name = "pytest"
-version = "6.2.2"
-description = "pytest: simple powerful testing with Python"
 category = "dev"
+description = "pytest: simple powerful testing with Python"
+name = "pytest"
 optional = false
 python-versions = ">=3.6"
+version = "6.2.2"
 
 [package.dependencies]
-atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""}
+atomicwrites = ">=1.0"
 attrs = ">=19.2.0"
-colorama = {version = "*", markers = "sys_platform == \"win32\""}
-importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""}
+colorama = "*"
 iniconfig = "*"
 packaging = "*"
 pluggy = ">=0.12,<1.0.0a1"
 py = ">=1.8.2"
 toml = "*"
 
+[package.dependencies.importlib-metadata]
+python = "<3.8"
+version = ">=0.12"
+
 [package.extras]
 testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"]
 
 [[package]]
-name = "python-dateutil"
-version = "2.8.1"
-description = "Extensions to the standard Python datetime module"
 category = "main"
+description = "Extensions to the standard Python datetime module"
+name = "python-dateutil"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+version = "2.8.1"
 
 [package.dependencies]
 six = ">=1.5"
 
 [[package]]
-name = "python-decouple"
-version = "3.4"
-description = "Strict separation of settings from code."
 category = "main"
+description = "Strict separation of settings from code."
+name = "python-decouple"
 optional = false
 python-versions = "*"
+version = "3.4"
 
 [[package]]
-name = "regex"
-version = "2020.11.13"
-description = "Alternative regular expression module, to replace re."
 category = "dev"
+description = "Alternative regular expression module, to replace re."
+name = "regex"
 optional = false
 python-versions = "*"
+version = "2021.3.17"
 
 [[package]]
-name = "requests"
-version = "2.25.1"
-description = "Python HTTP for Humans."
 category = "main"
+description = "Python HTTP for Humans."
+name = "requests"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+version = "2.25.1"
 
 [package.dependencies]
 certifi = ">=2017.4.17"
 chardet = ">=3.0.2,<5"
-cryptography = {version = ">=1.3.4", optional = true, markers = "extra == \"security\""}
 idna = ">=2.5,<3"
-pyOpenSSL = {version = ">=0.14", optional = true, markers = "extra == \"security\""}
 urllib3 = ">=1.21.1,<1.27"
 
+[package.dependencies.cryptography]
+optional = true
+version = ">=1.3.4"
+
+[package.dependencies.pyOpenSSL]
+optional = true
+version = ">=0.14"
+
 [package.extras]
 security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"]
-socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
+socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"]
 
 [[package]]
-name = "s3transfer"
-version = "0.3.3"
-description = "An Amazon S3 Transfer Manager"
 category = "main"
+description = "An Amazon S3 Transfer Manager"
+name = "s3transfer"
 optional = false
 python-versions = "*"
+version = "0.3.6"
 
 [package.dependencies]
 botocore = ">=1.12.36,<2.0a.0"
 
 [[package]]
-name = "selectolax"
-version = "0.2.10"
-description = "Fast HTML5 parser with CSS selectors."
 category = "main"
+description = "Fast HTML5 parser with CSS selectors."
+name = "selectolax"
 optional = false
 python-versions = "*"
+version = "0.2.10"
 
 [[package]]
-name = "six"
-version = "1.15.0"
-description = "Python 2 and 3 compatibility utilities"
 category = "main"
+description = "Python 2 and 3 compatibility utilities"
+name = "six"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+version = "1.15.0"
 
 [[package]]
-name = "toml"
-version = "0.10.2"
-description = "Python Library for Tom's Obvious, Minimal Language"
 category = "dev"
+description = "Python Library for Tom's Obvious, Minimal Language"
+name = "toml"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+version = "0.10.2"
 
 [[package]]
-name = "typed-ast"
-version = "1.4.1"
-description = "a fork of Python 2 and 3 ast modules with type comment support"
 category = "dev"
+description = "a fork of Python 2 and 3 ast modules with type comment support"
+name = "typed-ast"
 optional = false
 python-versions = "*"
+version = "1.4.2"
 
 [[package]]
-name = "typing-extensions"
-version = "3.7.4.3"
-description = "Backported and Experimental Type Hints for Python 3.5+"
 category = "dev"
+description = "Backported and Experimental Type Hints for Python 3.5+"
+name = "typing-extensions"
 optional = false
 python-versions = "*"
+version = "3.7.4.3"
 
 [[package]]
-name = "urllib3"
-version = "1.26.2"
-description = "HTTP library with thread-safe connection pooling, file post, and more."
 category = "main"
+description = "HTTP library with thread-safe connection pooling, file post, and more."
+name = "urllib3"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
+version = "1.26.4"
 
 [package.extras]
 brotli = ["brotlipy (>=0.6.0)"]
 secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
-socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
+socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"]
+
+[[package]]
+category = "main"
+description = "Module for decorators, wrappers and monkey patching."
+name = "wrapt"
+optional = false
+python-versions = "*"
+version = "1.12.1"
 
 [[package]]
-name = "zipp"
-version = "3.4.0"
-description = "Backport of pathlib-compatible object wrapper for zip files"
 category = "dev"
+description = "Backport of pathlib-compatible object wrapper for zip files"
+marker = "python_version < \"3.8\""
+name = "zipp"
 optional = false
 python-versions = ">=3.6"
+version = "3.4.1"
 
 [package.extras]
-docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "jaraco.test (>=3.2.0)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"]
+docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
+testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"]
 
 [metadata]
-lock-version = "1.1"
+content-hash = "7119424a717c77cc43df1bc868c91d9f2a3a6a79d3397fc143858718ecb45fe0"
 python-versions = "^3.7"
-content-hash = "fc6df7112afa97a2dc58eee6d5df9c38764dd9eb417d9093b42f6d0367e69e5a"
 
 [metadata.files]
 appdirs = [
@@ -513,43 +584,43 @@ certifi = [
     {file = "certifi-2020.12.5.tar.gz", hash = "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"},
 ]
 cffi = [
-    {file = "cffi-1.14.4-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775"},
-    {file = "cffi-1.14.4-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06"},
-    {file = "cffi-1.14.4-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26"},
-    {file = "cffi-1.14.4-cp27-cp27m-win32.whl", hash = "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c"},
-    {file = "cffi-1.14.4-cp27-cp27m-win_amd64.whl", hash = "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b"},
-    {file = "cffi-1.14.4-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d"},
-    {file = "cffi-1.14.4-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca"},
-    {file = "cffi-1.14.4-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698"},
-    {file = "cffi-1.14.4-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b"},
-    {file = "cffi-1.14.4-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293"},
-    {file = "cffi-1.14.4-cp35-cp35m-win32.whl", hash = "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2"},
-    {file = "cffi-1.14.4-cp35-cp35m-win_amd64.whl", hash = "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7"},
-    {file = "cffi-1.14.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f"},
-    {file = "cffi-1.14.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362"},
-    {file = "cffi-1.14.4-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec"},
-    {file = "cffi-1.14.4-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b"},
-    {file = "cffi-1.14.4-cp36-cp36m-win32.whl", hash = "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668"},
-    {file = "cffi-1.14.4-cp36-cp36m-win_amd64.whl", hash = "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009"},
-    {file = "cffi-1.14.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb"},
-    {file = "cffi-1.14.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d"},
-    {file = "cffi-1.14.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03"},
-    {file = "cffi-1.14.4-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01"},
-    {file = "cffi-1.14.4-cp37-cp37m-win32.whl", hash = "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e"},
-    {file = "cffi-1.14.4-cp37-cp37m-win_amd64.whl", hash = "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35"},
-    {file = "cffi-1.14.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d"},
-    {file = "cffi-1.14.4-cp38-cp38-manylinux1_i686.whl", hash = "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b"},
-    {file = "cffi-1.14.4-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53"},
-    {file = "cffi-1.14.4-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e"},
-    {file = "cffi-1.14.4-cp38-cp38-win32.whl", hash = "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d"},
-    {file = "cffi-1.14.4-cp38-cp38-win_amd64.whl", hash = "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375"},
-    {file = "cffi-1.14.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909"},
-    {file = "cffi-1.14.4-cp39-cp39-manylinux1_i686.whl", hash = "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd"},
-    {file = "cffi-1.14.4-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a"},
-    {file = "cffi-1.14.4-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:7ef7d4ced6b325e92eb4d3502946c78c5367bc416398d387b39591532536734e"},
-    {file = "cffi-1.14.4-cp39-cp39-win32.whl", hash = "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3"},
-    {file = "cffi-1.14.4-cp39-cp39-win_amd64.whl", hash = "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b"},
-    {file = "cffi-1.14.4.tar.gz", hash = "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c"},
+    {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"},
+    {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"},
+    {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"},
+    {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"},
+    {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"},
+    {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"},
+    {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"},
+    {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"},
+    {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"},
+    {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"},
+    {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"},
+    {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"},
+    {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"},
+    {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"},
+    {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"},
+    {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"},
+    {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"},
+    {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"},
+    {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"},
+    {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"},
+    {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"},
+    {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"},
+    {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"},
+    {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"},
+    {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"},
+    {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"},
+    {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"},
+    {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"},
+    {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"},
+    {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"},
+    {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"},
+    {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"},
+    {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"},
+    {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"},
+    {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"},
+    {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"},
+    {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"},
 ]
 chardet = [
     {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"},
@@ -561,27 +632,28 @@ click = [
 ]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
-    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
 ]
 cryptography = [
-    {file = "cryptography-3.3.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:c366df0401d1ec4e548bebe8f91d55ebcc0ec3137900d214dd7aac8427ef3030"},
-    {file = "cryptography-3.3.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9f6b0492d111b43de5f70052e24c1f0951cb9e6022188ebcb1cc3a3d301469b0"},
-    {file = "cryptography-3.3.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a69bd3c68b98298f490e84519b954335154917eaab52cf582fa2c5c7efc6e812"},
-    {file = "cryptography-3.3.1-cp27-cp27m-win32.whl", hash = "sha256:84ef7a0c10c24a7773163f917f1cb6b4444597efd505a8aed0a22e8c4780f27e"},
-    {file = "cryptography-3.3.1-cp27-cp27m-win_amd64.whl", hash = "sha256:594a1db4511bc4d960571536abe21b4e5c3003e8750ab8365fafce71c5d86901"},
-    {file = "cryptography-3.3.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d"},
-    {file = "cryptography-3.3.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:83d9d2dfec70364a74f4e7c70ad04d3ca2e6a08b703606993407bf46b97868c5"},
-    {file = "cryptography-3.3.1-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:dc42f645f8f3a489c3dd416730a514e7a91a59510ddaadc09d04224c098d3302"},
-    {file = "cryptography-3.3.1-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:788a3c9942df5e4371c199d10383f44a105d67d401fb4304178020142f020244"},
-    {file = "cryptography-3.3.1-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:69e836c9e5ff4373ce6d3ab311c1a2eed274793083858d3cd4c7d12ce20d5f9c"},
-    {file = "cryptography-3.3.1-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:9e21301f7a1e7c03dbea73e8602905a4ebba641547a462b26dd03451e5769e7c"},
-    {file = "cryptography-3.3.1-cp36-abi3-win32.whl", hash = "sha256:b4890d5fb9b7a23e3bf8abf5a8a7da8e228f1e97dc96b30b95685df840b6914a"},
-    {file = "cryptography-3.3.1-cp36-abi3-win_amd64.whl", hash = "sha256:0e85aaae861d0485eb5a79d33226dd6248d2a9f133b81532c8f5aae37de10ff7"},
-    {file = "cryptography-3.3.1.tar.gz", hash = "sha256:7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6"},
+    {file = "cryptography-3.4.6-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:57ad77d32917bc55299b16d3b996ffa42a1c73c6cfa829b14043c561288d2799"},
+    {file = "cryptography-3.4.6-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:4169a27b818de4a1860720108b55a2801f32b6ae79e7f99c00d79f2a2822eeb7"},
+    {file = "cryptography-3.4.6-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:93cfe5b7ff006de13e1e89830810ecbd014791b042cbe5eec253be11ac2b28f3"},
+    {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:5ecf2bcb34d17415e89b546dbb44e73080f747e504273e4d4987630493cded1b"},
+    {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:fec7fb46b10da10d9e1d078d1ff8ed9e05ae14f431fdbd11145edd0550b9a964"},
+    {file = "cryptography-3.4.6-cp36-abi3-win32.whl", hash = "sha256:df186fcbf86dc1ce56305becb8434e4b6b7504bc724b71ad7a3239e0c9d14ef2"},
+    {file = "cryptography-3.4.6-cp36-abi3-win_amd64.whl", hash = "sha256:66b57a9ca4b3221d51b237094b0303843b914b7d5afd4349970bb26518e350b0"},
+    {file = "cryptography-3.4.6-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:066bc53f052dfeda2f2d7c195cf16fb3e5ff13e1b6b7415b468514b40b381a5b"},
+    {file = "cryptography-3.4.6-pp36-pypy36_pp73-manylinux2014_x86_64.whl", hash = "sha256:600cf9bfe75e96d965509a4c0b2b183f74a4fa6f5331dcb40fb7b77b7c2484df"},
+    {file = "cryptography-3.4.6-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:0923ba600d00718d63a3976f23cab19aef10c1765038945628cd9be047ad0336"},
+    {file = "cryptography-3.4.6-pp37-pypy37_pp73-manylinux2014_x86_64.whl", hash = "sha256:9e98b452132963678e3ac6c73f7010fe53adf72209a32854d55690acac3f6724"},
+    {file = "cryptography-3.4.6.tar.gz", hash = "sha256:2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"},
+]
+deprecated = [
+    {file = "Deprecated-1.2.12-py2.py3-none-any.whl", hash = "sha256:08452d69b6b5bc66e8330adde0a4f8642e969b9e1702904d137eeb29c8ffc771"},
+    {file = "Deprecated-1.2.12.tar.gz", hash = "sha256:6d2de2de7931a968874481ef30208fd4e08da39177d61d3d4ebdf4366e7dbca1"},
 ]
 elasticsearch = [
-    {file = "elasticsearch-7.10.1-py2.py3-none-any.whl", hash = "sha256:4ebd34fd223b31c99d9f3b6b6236d3ac18b3046191a37231e8235b06ae7db955"},
-    {file = "elasticsearch-7.10.1.tar.gz", hash = "sha256:a725dd923d349ca0652cf95d6ce23d952e2153740cf4ab6daf4a2d804feeed48"},
+    {file = "elasticsearch-7.11.0-py2.py3-none-any.whl", hash = "sha256:a113cfcee9ba8565cd48a67b60e9903b67a81b3b80ddc6d3fb2c16789a58b763"},
+    {file = "elasticsearch-7.11.0.tar.gz", hash = "sha256:1e24b33a82bf381b42d3b0d390f76fdb9d6a9d47b310dea8eaeb0a5933c394c0"},
 ]
 elasticsearch-dsl = [
     {file = "elasticsearch-dsl-7.3.0.tar.gz", hash = "sha256:0ed75f6ff037e36b2397a8e92cae0ddde79b83adc70a154b8946064cb62f7301"},
@@ -596,8 +668,8 @@ idna = [
     {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"},
 ]
 importlib-metadata = [
-    {file = "importlib_metadata-3.3.0-py3-none-any.whl", hash = "sha256:bf792d480abbd5eda85794e4afb09dd538393f7d6e6ffef6e9f03d2014cf9450"},
-    {file = "importlib_metadata-3.3.0.tar.gz", hash = "sha256:5c5a2720817414a6c41f0a49993908068243ae02c1635a228126519b509c8aed"},
+    {file = "importlib_metadata-3.7.3-py3-none-any.whl", hash = "sha256:b74159469b464a99cb8cc3e21973e4d96e05d3024d337313fedb618a6e86e6f4"},
+    {file = "importlib_metadata-3.7.3.tar.gz", hash = "sha256:742add720a20d0467df2f444ae41704000f50e1234f46174b51f9c6031a1bd71"},
 ]
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
@@ -616,8 +688,8 @@ mypy-extensions = [
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
 packaging = [
-    {file = "packaging-20.8-py2.py3-none-any.whl", hash = "sha256:24e0da08660a87484d1602c30bb4902d74816b6985b93de36926f5bc95741858"},
-    {file = "packaging-20.8.tar.gz", hash = "sha256:78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093"},
+    {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"},
+    {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"},
 ]
 pathspec = [
     {file = "pathspec-0.8.1-py2.py3-none-any.whl", hash = "sha256:aa0cb481c4041bf52ffa7b0d8fa6cd3e88a2ca4879c533c9153882ee2556790d"},
@@ -643,6 +715,14 @@ pyflakes = [
     {file = "pyflakes-2.3.0-py2.py3-none-any.whl", hash = "sha256:910208209dcea632721cb58363d0f72913d9e8cf64dc6f8ae2e02a3609aba40d"},
     {file = "pyflakes-2.3.0.tar.gz", hash = "sha256:e59fd8e750e588358f1b8885e5a4751203a0516e0ee6d34811089ac294c8806f"},
 ]
+pygithub = [
+    {file = "PyGithub-1.54.1-py3-none-any.whl", hash = "sha256:87afd6a67ea582aa7533afdbf41635725f13d12581faed7e3e04b1579c0c0627"},
+    {file = "PyGithub-1.54.1.tar.gz", hash = "sha256:300bc16e62886ca6537b0830e8f516ea4bc3ef12d308e0c5aff8bdbd099173d4"},
+]
+pyjwt = [
+    {file = "PyJWT-1.7.1-py2.py3-none-any.whl", hash = "sha256:5c6eca3c2940464d106b99ba83b00c6add741c9becaec087fb7ccdefea71350e"},
+    {file = "PyJWT-1.7.1.tar.gz", hash = "sha256:8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"},
+]
 pyopenssl = [
     {file = "pyOpenSSL-20.0.1-py2.py3-none-any.whl", hash = "sha256:818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b"},
     {file = "pyOpenSSL-20.0.1.tar.gz", hash = "sha256:4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51"},
@@ -664,55 +744,55 @@ python-decouple = [
     {file = "python_decouple-3.4-py3-none-any.whl", hash = "sha256:a8268466e6389a639a20deab9d880faee186eb1eb6a05e54375bdf158d691981"},
 ]
 regex = [
-    {file = "regex-2020.11.13-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:8b882a78c320478b12ff024e81dc7d43c1462aa4a3341c754ee65d857a521f85"},
-    {file = "regex-2020.11.13-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a63f1a07932c9686d2d416fb295ec2c01ab246e89b4d58e5fa468089cab44b70"},
-    {file = "regex-2020.11.13-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:6e4b08c6f8daca7d8f07c8d24e4331ae7953333dbd09c648ed6ebd24db5a10ee"},
-    {file = "regex-2020.11.13-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:bba349276b126947b014e50ab3316c027cac1495992f10e5682dc677b3dfa0c5"},
-    {file = "regex-2020.11.13-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:56e01daca75eae420bce184edd8bb341c8eebb19dd3bce7266332258f9fb9dd7"},
-    {file = "regex-2020.11.13-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:6a8ce43923c518c24a2579fda49f093f1397dad5d18346211e46f134fc624e31"},
-    {file = "regex-2020.11.13-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:1ab79fcb02b930de09c76d024d279686ec5d532eb814fd0ed1e0051eb8bd2daa"},
-    {file = "regex-2020.11.13-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:9801c4c1d9ae6a70aeb2128e5b4b68c45d4f0af0d1535500884d644fa9b768c6"},
-    {file = "regex-2020.11.13-cp36-cp36m-win32.whl", hash = "sha256:49cae022fa13f09be91b2c880e58e14b6da5d10639ed45ca69b85faf039f7a4e"},
-    {file = "regex-2020.11.13-cp36-cp36m-win_amd64.whl", hash = "sha256:749078d1eb89484db5f34b4012092ad14b327944ee7f1c4f74d6279a6e4d1884"},
-    {file = "regex-2020.11.13-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b2f4007bff007c96a173e24dcda236e5e83bde4358a557f9ccf5e014439eae4b"},
-    {file = "regex-2020.11.13-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:38c8fd190db64f513fe4e1baa59fed086ae71fa45083b6936b52d34df8f86a88"},
-    {file = "regex-2020.11.13-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:5862975b45d451b6db51c2e654990c1820523a5b07100fc6903e9c86575202a0"},
-    {file = "regex-2020.11.13-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:262c6825b309e6485ec2493ffc7e62a13cf13fb2a8b6d212f72bd53ad34118f1"},
-    {file = "regex-2020.11.13-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:bafb01b4688833e099d79e7efd23f99172f501a15c44f21ea2118681473fdba0"},
-    {file = "regex-2020.11.13-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:e32f5f3d1b1c663af7f9c4c1e72e6ffe9a78c03a31e149259f531e0fed826512"},
-    {file = "regex-2020.11.13-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:3bddc701bdd1efa0d5264d2649588cbfda549b2899dc8d50417e47a82e1387ba"},
-    {file = "regex-2020.11.13-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:02951b7dacb123d8ea6da44fe45ddd084aa6777d4b2454fa0da61d569c6fa538"},
-    {file = "regex-2020.11.13-cp37-cp37m-win32.whl", hash = "sha256:0d08e71e70c0237883d0bef12cad5145b84c3705e9c6a588b2a9c7080e5af2a4"},
-    {file = "regex-2020.11.13-cp37-cp37m-win_amd64.whl", hash = "sha256:1fa7ee9c2a0e30405e21031d07d7ba8617bc590d391adfc2b7f1e8b99f46f444"},
-    {file = "regex-2020.11.13-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:baf378ba6151f6e272824b86a774326f692bc2ef4cc5ce8d5bc76e38c813a55f"},
-    {file = "regex-2020.11.13-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e3faaf10a0d1e8e23a9b51d1900b72e1635c2d5b0e1bea1c18022486a8e2e52d"},
-    {file = "regex-2020.11.13-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:2a11a3e90bd9901d70a5b31d7dd85114755a581a5da3fc996abfefa48aee78af"},
-    {file = "regex-2020.11.13-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:d1ebb090a426db66dd80df8ca85adc4abfcbad8a7c2e9a5ec7513ede522e0a8f"},
-    {file = "regex-2020.11.13-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:b2b1a5ddae3677d89b686e5c625fc5547c6e492bd755b520de5332773a8af06b"},
-    {file = "regex-2020.11.13-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:2c99e97d388cd0a8d30f7c514d67887d8021541b875baf09791a3baad48bb4f8"},
-    {file = "regex-2020.11.13-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:c084582d4215593f2f1d28b65d2a2f3aceff8342aa85afd7be23a9cad74a0de5"},
-    {file = "regex-2020.11.13-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:a3d748383762e56337c39ab35c6ed4deb88df5326f97a38946ddd19028ecce6b"},
-    {file = "regex-2020.11.13-cp38-cp38-win32.whl", hash = "sha256:7913bd25f4ab274ba37bc97ad0e21c31004224ccb02765ad984eef43e04acc6c"},
-    {file = "regex-2020.11.13-cp38-cp38-win_amd64.whl", hash = "sha256:6c54ce4b5d61a7129bad5c5dc279e222afd00e721bf92f9ef09e4fae28755683"},
-    {file = "regex-2020.11.13-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1862a9d9194fae76a7aaf0150d5f2a8ec1da89e8b55890b1786b8f88a0f619dc"},
-    {file = "regex-2020.11.13-cp39-cp39-manylinux1_i686.whl", hash = "sha256:4902e6aa086cbb224241adbc2f06235927d5cdacffb2425c73e6570e8d862364"},
-    {file = "regex-2020.11.13-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:7a25fcbeae08f96a754b45bdc050e1fb94b95cab046bf56b016c25e9ab127b3e"},
-    {file = "regex-2020.11.13-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:d2d8ce12b7c12c87e41123997ebaf1a5767a5be3ec545f64675388970f415e2e"},
-    {file = "regex-2020.11.13-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:f7d29a6fc4760300f86ae329e3b6ca28ea9c20823df123a2ea8693e967b29917"},
-    {file = "regex-2020.11.13-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:717881211f46de3ab130b58ec0908267961fadc06e44f974466d1887f865bd5b"},
-    {file = "regex-2020.11.13-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:3128e30d83f2e70b0bed9b2a34e92707d0877e460b402faca908c6667092ada9"},
-    {file = "regex-2020.11.13-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:8f6a2229e8ad946e36815f2a03386bb8353d4bde368fdf8ca5f0cb97264d3b5c"},
-    {file = "regex-2020.11.13-cp39-cp39-win32.whl", hash = "sha256:f8f295db00ef5f8bae530fc39af0b40486ca6068733fb860b42115052206466f"},
-    {file = "regex-2020.11.13-cp39-cp39-win_amd64.whl", hash = "sha256:a15f64ae3a027b64496a71ab1f722355e570c3fac5ba2801cafce846bf5af01d"},
-    {file = "regex-2020.11.13.tar.gz", hash = "sha256:83d6b356e116ca119db8e7c6fc2983289d87b27b3fac238cfe5dca529d884562"},
+    {file = "regex-2021.3.17-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b97ec5d299c10d96617cc851b2e0f81ba5d9d6248413cd374ef7f3a8871ee4a6"},
+    {file = "regex-2021.3.17-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:cb4ee827857a5ad9b8ae34d3c8cc51151cb4a3fe082c12ec20ec73e63cc7c6f0"},
+    {file = "regex-2021.3.17-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:633497504e2a485a70a3268d4fc403fe3063a50a50eed1039083e9471ad0101c"},
+    {file = "regex-2021.3.17-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:a59a2ee329b3de764b21495d78c92ab00b4ea79acef0f7ae8c1067f773570afa"},
+    {file = "regex-2021.3.17-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:f85d6f41e34f6a2d1607e312820971872944f1661a73d33e1e82d35ea3305e14"},
+    {file = "regex-2021.3.17-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:4651f839dbde0816798e698626af6a2469eee6d9964824bb5386091255a1694f"},
+    {file = "regex-2021.3.17-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:39c44532d0e4f1639a89e52355b949573e1e2c5116106a395642cbbae0ff9bcd"},
+    {file = "regex-2021.3.17-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:3d9a7e215e02bd7646a91fb8bcba30bc55fd42a719d6b35cf80e5bae31d9134e"},
+    {file = "regex-2021.3.17-cp36-cp36m-win32.whl", hash = "sha256:159fac1a4731409c830d32913f13f68346d6b8e39650ed5d704a9ce2f9ef9cb3"},
+    {file = "regex-2021.3.17-cp36-cp36m-win_amd64.whl", hash = "sha256:13f50969028e81765ed2a1c5fcfdc246c245cf8d47986d5172e82ab1a0c42ee5"},
+    {file = "regex-2021.3.17-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b9d8d286c53fe0cbc6d20bf3d583cabcd1499d89034524e3b94c93a5ab85ca90"},
+    {file = "regex-2021.3.17-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:201e2619a77b21a7780580ab7b5ce43835e242d3e20fef50f66a8df0542e437f"},
+    {file = "regex-2021.3.17-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:d47d359545b0ccad29d572ecd52c9da945de7cd6cf9c0cfcb0269f76d3555689"},
+    {file = "regex-2021.3.17-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:ea2f41445852c660ba7c3ebf7d70b3779b20d9ca8ba54485a17740db49f46932"},
+    {file = "regex-2021.3.17-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:486a5f8e11e1f5bbfcad87f7c7745eb14796642323e7e1829a331f87a713daaa"},
+    {file = "regex-2021.3.17-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:18e25e0afe1cf0f62781a150c1454b2113785401ba285c745acf10c8ca8917df"},
+    {file = "regex-2021.3.17-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:a2ee026f4156789df8644d23ef423e6194fad0bc53575534101bb1de5d67e8ce"},
+    {file = "regex-2021.3.17-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:4c0788010a93ace8a174d73e7c6c9d3e6e3b7ad99a453c8ee8c975ddd9965643"},
+    {file = "regex-2021.3.17-cp37-cp37m-win32.whl", hash = "sha256:575a832e09d237ae5fedb825a7a5bc6a116090dd57d6417d4f3b75121c73e3be"},
+    {file = "regex-2021.3.17-cp37-cp37m-win_amd64.whl", hash = "sha256:8e65e3e4c6feadf6770e2ad89ad3deb524bcb03d8dc679f381d0568c024e0deb"},
+    {file = "regex-2021.3.17-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a0df9a0ad2aad49ea3c7f65edd2ffb3d5c59589b85992a6006354f6fb109bb18"},
+    {file = "regex-2021.3.17-cp38-cp38-manylinux1_i686.whl", hash = "sha256:b98bc9db003f1079caf07b610377ed1ac2e2c11acc2bea4892e28cc5b509d8d5"},
+    {file = "regex-2021.3.17-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:808404898e9a765e4058bf3d7607d0629000e0a14a6782ccbb089296b76fa8fe"},
+    {file = "regex-2021.3.17-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:5770a51180d85ea468234bc7987f5597803a4c3d7463e7323322fe4a1b181578"},
+    {file = "regex-2021.3.17-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:976a54d44fd043d958a69b18705a910a8376196c6b6ee5f2596ffc11bff4420d"},
+    {file = "regex-2021.3.17-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:63f3ca8451e5ff7133ffbec9eda641aeab2001be1a01878990f6c87e3c44b9d5"},
+    {file = "regex-2021.3.17-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:bcd945175c29a672f13fce13a11893556cd440e37c1b643d6eeab1988c8b209c"},
+    {file = "regex-2021.3.17-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:3d9356add82cff75413bec360c1eca3e58db4a9f5dafa1f19650958a81e3249d"},
+    {file = "regex-2021.3.17-cp38-cp38-win32.whl", hash = "sha256:f5d0c921c99297354cecc5a416ee4280bd3f20fd81b9fb671ca6be71499c3fdf"},
+    {file = "regex-2021.3.17-cp38-cp38-win_amd64.whl", hash = "sha256:14de88eda0976020528efc92d0a1f8830e2fb0de2ae6005a6fc4e062553031fa"},
+    {file = "regex-2021.3.17-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4c2e364491406b7888c2ad4428245fc56c327e34a5dfe58fd40df272b3c3dab3"},
+    {file = "regex-2021.3.17-cp39-cp39-manylinux1_i686.whl", hash = "sha256:8bd4f91f3fb1c9b1380d6894bd5b4a519409135bec14c0c80151e58394a4e88a"},
+    {file = "regex-2021.3.17-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:882f53afe31ef0425b405a3f601c0009b44206ea7f55ee1c606aad3cc213a52c"},
+    {file = "regex-2021.3.17-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:07ef35301b4484bce843831e7039a84e19d8d33b3f8b2f9aab86c376813d0139"},
+    {file = "regex-2021.3.17-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:360a01b5fa2ad35b3113ae0c07fb544ad180603fa3b1f074f52d98c1096fa15e"},
+    {file = "regex-2021.3.17-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:709f65bb2fa9825f09892617d01246002097f8f9b6dde8d1bb4083cf554701ba"},
+    {file = "regex-2021.3.17-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:c66221e947d7207457f8b6f42b12f613b09efa9669f65a587a2a71f6a0e4d106"},
+    {file = "regex-2021.3.17-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:c782da0e45aff131f0bed6e66fbcfa589ff2862fc719b83a88640daa01a5aff7"},
+    {file = "regex-2021.3.17-cp39-cp39-win32.whl", hash = "sha256:dc9963aacb7da5177e40874585d7407c0f93fb9d7518ec58b86e562f633f36cd"},
+    {file = "regex-2021.3.17-cp39-cp39-win_amd64.whl", hash = "sha256:a0d04128e005142260de3733591ddf476e4902c0c23c1af237d9acf3c96e1b38"},
+    {file = "regex-2021.3.17.tar.gz", hash = "sha256:4b8a1fb724904139149a43e172850f35aa6ea97fb0545244dc0b805e0154ed68"},
 ]
 requests = [
     {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"},
     {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"},
 ]
 s3transfer = [
-    {file = "s3transfer-0.3.3-py2.py3-none-any.whl", hash = "sha256:2482b4259524933a022d59da830f51bd746db62f047d6eb213f2f8855dcb8a13"},
-    {file = "s3transfer-0.3.3.tar.gz", hash = "sha256:921a37e2aefc64145e7b73d50c71bb4f26f46e4c9f414dc648c6245ff92cf7db"},
+    {file = "s3transfer-0.3.6-py2.py3-none-any.whl", hash = "sha256:5d48b1fd2232141a9d5fb279709117aaba506cacea7f86f11bc392f06bfa8fc2"},
+    {file = "s3transfer-0.3.6.tar.gz", hash = "sha256:c5dadf598762899d8cfaecf68eba649cd25b0ce93b6c954b156aaa3eed160547"},
 ]
 selectolax = [
     {file = "selectolax-0.2.10-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:a18f75af342476356e5a437fc5215a3b79b58f52b56d9ea6e1a985cc21895952"},
@@ -769,36 +849,36 @@ toml = [
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
 ]
 typed-ast = [
-    {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3"},
-    {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aaee9905aee35ba5905cfb3c62f3e83b3bec7b39413f0a7f19be4e547ea01ebb"},
-    {file = "typed_ast-1.4.1-cp35-cp35m-win32.whl", hash = "sha256:0c2c07682d61a629b68433afb159376e24e5b2fd4641d35424e462169c0a7919"},
-    {file = "typed_ast-1.4.1-cp35-cp35m-win_amd64.whl", hash = "sha256:4083861b0aa07990b619bd7ddc365eb7fa4b817e99cf5f8d9cf21a42780f6e01"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:fcf135e17cc74dbfbc05894ebca928ffeb23d9790b3167a674921db19082401f"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-win32.whl", hash = "sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:f208eb7aff048f6bea9586e61af041ddf7f9ade7caed625742af423f6bae3298"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-win32.whl", hash = "sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355"},
-    {file = "typed_ast-1.4.1-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6"},
-    {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907"},
-    {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d"},
-    {file = "typed_ast-1.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:7e4c9d7658aaa1fc80018593abdf8598bf91325af6af5cce4ce7c73bc45ea53d"},
-    {file = "typed_ast-1.4.1-cp38-cp38-win32.whl", hash = "sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c"},
-    {file = "typed_ast-1.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4"},
-    {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34"},
-    {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:92c325624e304ebf0e025d1224b77dd4e6393f18aab8d829b5b7e04afe9b7a2c"},
-    {file = "typed_ast-1.4.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:d648b8e3bf2fe648745c8ffcee3db3ff903d0817a01a12dd6a6ea7a8f4889072"},
-    {file = "typed_ast-1.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fac11badff8313e23717f3dada86a15389d0708275bddf766cca67a84ead3e91"},
-    {file = "typed_ast-1.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:0d8110d78a5736e16e26213114a38ca35cb15b6515d535413b090bd50951556d"},
-    {file = "typed_ast-1.4.1-cp39-cp39-win32.whl", hash = "sha256:b52ccf7cfe4ce2a1064b18594381bccf4179c2ecf7f513134ec2f993dd4ab395"},
-    {file = "typed_ast-1.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:3742b32cf1c6ef124d57f95be609c473d7ec4c14d0090e5a5e05a15269fb4d0c"},
-    {file = "typed_ast-1.4.1.tar.gz", hash = "sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b"},
+    {file = "typed_ast-1.4.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:7703620125e4fb79b64aa52427ec192822e9f45d37d4b6625ab37ef403e1df70"},
+    {file = "typed_ast-1.4.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:c9aadc4924d4b5799112837b226160428524a9a45f830e0d0f184b19e4090487"},
+    {file = "typed_ast-1.4.2-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:9ec45db0c766f196ae629e509f059ff05fc3148f9ffd28f3cfe75d4afb485412"},
+    {file = "typed_ast-1.4.2-cp35-cp35m-win32.whl", hash = "sha256:85f95aa97a35bdb2f2f7d10ec5bbdac0aeb9dafdaf88e17492da0504de2e6400"},
+    {file = "typed_ast-1.4.2-cp35-cp35m-win_amd64.whl", hash = "sha256:9044ef2df88d7f33692ae3f18d3be63dec69c4fb1b5a4a9ac950f9b4ba571606"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c1c876fd795b36126f773db9cbb393f19808edd2637e00fd6caba0e25f2c7b64"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:5dcfc2e264bd8a1db8b11a892bd1647154ce03eeba94b461effe68790d8b8e07"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:8db0e856712f79c45956da0c9a40ca4246abc3485ae0d7ecc86a20f5e4c09abc"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:d003156bb6a59cda9050e983441b7fa2487f7800d76bdc065566b7d728b4581a"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-win32.whl", hash = "sha256:4c790331247081ea7c632a76d5b2a265e6d325ecd3179d06e9cf8d46d90dd151"},
+    {file = "typed_ast-1.4.2-cp36-cp36m-win_amd64.whl", hash = "sha256:d175297e9533d8d37437abc14e8a83cbc68af93cc9c1c59c2c292ec59a0697a3"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cf54cfa843f297991b7388c281cb3855d911137223c6b6d2dd82a47ae5125a41"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:b4fcdcfa302538f70929eb7b392f536a237cbe2ed9cba88e3bf5027b39f5f77f"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:987f15737aba2ab5f3928c617ccf1ce412e2e321c77ab16ca5a293e7bbffd581"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:37f48d46d733d57cc70fd5f30572d11ab8ed92da6e6b28e024e4a3edfb456e37"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-win32.whl", hash = "sha256:36d829b31ab67d6fcb30e185ec996e1f72b892255a745d3a82138c97d21ed1cd"},
+    {file = "typed_ast-1.4.2-cp37-cp37m-win_amd64.whl", hash = "sha256:8368f83e93c7156ccd40e49a783a6a6850ca25b556c0fa0240ed0f659d2fe496"},
+    {file = "typed_ast-1.4.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:963c80b583b0661918718b095e02303d8078950b26cc00b5e5ea9ababe0de1fc"},
+    {file = "typed_ast-1.4.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e683e409e5c45d5c9082dc1daf13f6374300806240719f95dc783d1fc942af10"},
+    {file = "typed_ast-1.4.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:84aa6223d71012c68d577c83f4e7db50d11d6b1399a9c779046d75e24bed74ea"},
+    {file = "typed_ast-1.4.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:a38878a223bdd37c9709d07cd357bb79f4c760b29210e14ad0fb395294583787"},
+    {file = "typed_ast-1.4.2-cp38-cp38-win32.whl", hash = "sha256:a2c927c49f2029291fbabd673d51a2180038f8cd5a5b2f290f78c4516be48be2"},
+    {file = "typed_ast-1.4.2-cp38-cp38-win_amd64.whl", hash = "sha256:c0c74e5579af4b977c8b932f40a5464764b2f86681327410aa028a22d2f54937"},
+    {file = "typed_ast-1.4.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:07d49388d5bf7e863f7fa2f124b1b1d89d8aa0e2f7812faff0a5658c01c59aa1"},
+    {file = "typed_ast-1.4.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:240296b27397e4e37874abb1df2a608a92df85cf3e2a04d0d4d61055c8305ba6"},
+    {file = "typed_ast-1.4.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:d746a437cdbca200622385305aedd9aef68e8a645e385cc483bdc5e488f07166"},
+    {file = "typed_ast-1.4.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:14bf1522cdee369e8f5581238edac09150c765ec1cb33615855889cf33dcb92d"},
+    {file = "typed_ast-1.4.2-cp39-cp39-win32.whl", hash = "sha256:cc7b98bf58167b7f2db91a4327da24fb93368838eb84a44c472283778fc2446b"},
+    {file = "typed_ast-1.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:7147e2a76c75f0f64c4319886e7639e490fee87c9d25cb1d4faef1d8cf83a440"},
+    {file = "typed_ast-1.4.2.tar.gz", hash = "sha256:9fc0b3cb5d1720e7141d103cf4819aea239f7d136acf9ee4a69b047b7986175a"},
 ]
 typing-extensions = [
     {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"},
@@ -806,10 +886,13 @@ typing-extensions = [
     {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"},
 ]
 urllib3 = [
-    {file = "urllib3-1.26.2-py2.py3-none-any.whl", hash = "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473"},
-    {file = "urllib3-1.26.2.tar.gz", hash = "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08"},
+    {file = "urllib3-1.26.4-py2.py3-none-any.whl", hash = "sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df"},
+    {file = "urllib3-1.26.4.tar.gz", hash = "sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"},
+]
+wrapt = [
+    {file = "wrapt-1.12.1.tar.gz", hash = "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7"},
 ]
 zipp = [
-    {file = "zipp-3.4.0-py3-none-any.whl", hash = "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108"},
-    {file = "zipp-3.4.0.tar.gz", hash = "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"},
+    {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"},
+    {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"},
 ]
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index ebe259e4a66d..b63b4d94ed7e 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -15,6 +15,7 @@ python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"
 selectolax = "^0.2.10"
+PyGithub = "^1.54.1"
 
 [tool.poetry.dev-dependencies]
 black = "^20.8b1"
diff --git a/deployer/src/deployer/analyze_pr.py b/deployer/src/deployer/analyze_pr.py
new file mode 100644
index 000000000000..07929a9d9b62
--- /dev/null
+++ b/deployer/src/deployer/analyze_pr.py
@@ -0,0 +1,184 @@
+import json
+from collections import defaultdict
+from pathlib import Path
+
+from github import Github
+from selectolax.parser import HTMLParser
+
+from .utils import log
+
+
+def analyze_pr(build_directory: Path, config):
+    """Given a directory of documents built from a PR, look through it and
+    post a GitHub PR comment or just print it to stdout."""
+
+    combined_comments = []
+
+    if config["prefix"]:
+        combined_comments.append(post_about_deployment(build_directory, **config))
+
+    if config["analyze_flaws"]:
+        combined_comments.append(post_about_flaws(build_directory, **config))
+
+    if config["analyze_dangerous_content"]:
+        combined_comments.append(
+            post_about_dangerous_content(build_directory, **config)
+        )
+
+    combined_comment = "\n\n".join(x for x in combined_comments if x)
+
+    if not combined_comment:
+        print("Warning! Nothing to comment at all!")
+        return
+
+    if not config["repo"]:
+        print("Warning! No 'repo' config")
+    elif not config["pr_number"]:
+        print("Warning! No 'pr_number' config")
+    elif config["repo"] and config["pr_number"]:
+        pr_url = f"https://github.com/{config['repo']}/pull/{config['pr_number']}"
+        if config["dry_run"]:
+            log.warning(f"Dry-run! Not actually posting any comment to {pr_url}")
+        else:
+            if not config["github_token"]:
+                raise Exception("No 'github_token' so no posting of comments")
+
+            print(f"Posting to {pr_url}")
+            github = Github(config["github_token"])
+            github_repo = github.get_repo(config["repo"])
+            github_issue = github_repo.get_issue(number=int(config["pr_number"]))
+            github_issue.create_comment(combined_comment)
+
+    return combined_comment
+
+
+def post_about_deployment(build_directory: Path, **config):
+    template = "https://{prefix}.content.dev.mdn.mozit.cloud{mdn_url}"
+
+    links = []
+    for doc in get_built_docs(build_directory):
+        url = template.format(prefix=config["prefix"], mdn_url=doc["mdn_url"])
+        links.append(f"- <{url}>")
+
+    heading = "## Preview deployment URLs\n\n"
+    if links:
+        return heading + "\n".join(links)
+
+    return heading + "*seems not a single file was built!* 🙀"
+
+
+def post_about_dangerous_content(build_directory: Path, **config):
+
+    OK_URL_PREFIXES = [
+        "https://github.com/mdn/",
+    ]
+
+    comments = []
+
+    for doc in get_built_docs(build_directory):
+        rendered_html = "\n".join(
+            x["value"]["content"]
+            for x in doc["body"]
+            if x["type"] == "prose" and x["value"]["content"]
+        )
+        tree = HTMLParser(rendered_html)
+        external_urls = defaultdict(int)
+        for node in tree.css("a[href]"):
+            href = node.attributes.get("href")
+            href = href.split("#")[0]
+            # We're only interested in external URLs at the moment
+            if href.startswith("//") or "://" in href:
+                if any(href.lower().startswith(x.lower()) for x in OK_URL_PREFIXES):
+                    # exceptions are skipped
+                    continue
+                external_urls[href] += 1
+
+        if external_urls:
+            external_urls_list = []
+            for url in sorted(external_urls):
+                count = external_urls[url]
+
+                external_urls_list.append(
+                    f"  - <{url}> ({count} time{'' if count==1 else 's'})"
+                )
+            comments.append((doc, "\n".join(external_urls_list)))
+        else:
+            comments.append((doc, "No external URLs"))
+
+    heading = "## External URLs\n\n"
+    if comments:
+        per_doc_comments = []
+        for doc, comment in comments:
+            per_doc_comments.append(
+                f"URL: `{doc['mdn_url']}`\n"
+                f"Title: `{doc['title']}`\n"
+                f"[on GitHub]({doc['source']['github_url']})\n"
+                "\n"
+                f"{comment}"
+            )
+        return heading + "\n---\n".join(per_doc_comments)
+    else:
+        return heading + "*no external links in the built pages* 👱🏽"
+
+
+def post_about_flaws(build_directory: Path, **config):
+
+    comments = []
+
+    for doc in get_built_docs(build_directory):
+        if not doc.get("flaws"):
+            comments.append((doc, "No flaws!"))
+            continue
+        else:
+            flaws_list = []
+            for flaw_name, flaw_values in doc["flaws"].items():
+                flaws_list.append(f"- **{flaw_name}**:")
+                for flaw_value in flaw_values:
+                    if isinstance(flaw_value, dict):
+                        explanation = flaw_value.get("explanation")
+                    else:
+                        explanation = str(flaw_value)
+                    if explanation:
+                        flaws_list.append(f"  - `{explanation}`")
+                    else:
+                        flaws_list.append("  - *no explanation!*")
+
+            comments.append((doc, "\n".join(flaws_list)))
+
+    def count_flaws(flaws):
+        count = 0
+        for flaw in flaws.values():
+            count += len(flaw)
+        return count
+
+    heading = "## Flaws\n\n"
+
+    if comments:
+        # Now turn all of these individual comments into one big one
+        per_doc_comments = []
+        for doc, comment in comments:
+            per_doc_comments.append(
+                f"URL: `{doc['mdn_url']}`\n"
+                f"Title: `{doc['title']}`\n"
+                f"[on GitHub]({doc['source']['github_url']})\n"
+                f"Flaw count: {count_flaws(doc['flaws'])}\n"
+                "\n"
+                f"{comment}"
+            )
+        return heading + "\n---\n".join(per_doc_comments)
+    else:
+        return heading + "*none!* 🎉"
+
+
+def get_built_docs(build_directory: Path):
+    assert build_directory.exists, f"{build_directory} does not exist"
+    docs = []
+    for path in build_directory.rglob("index.json"):
+        with open(path) as f:
+            data = json.load(f)
+            if "doc" not in data:
+                # Not every build index.json file is for a document.
+                continue
+            doc = data["doc"]
+            docs.append(doc)
+    return docs
diff --git a/deployer/src/deployer/constants.py b/deployer/src/deployer/constants.py
index 0911d8caeeda..af9ed8ac98b7 100644
--- a/deployer/src/deployer/constants.py
+++ b/deployer/src/deployer/constants.py
@@ -49,3 +49,8 @@
 # instance of Elasticsearch 7 and start it. Then set this environment variable
 # value to `http://localhost:9200`
 ELASTICSEARCH_URL = config("DEPLOYER_ELASTICSEARCH_URL", default=None)
+
+
+DEFAULT_REPO = config("GITHUB_REPOSITORY", default=None)
+
+DEFAULT_GITHUB_TOKEN = config("GITHUB_TOKEN", default=None)
diff --git a/deployer/src/deployer/main.py b/deployer/src/deployer/main.py
index c3c053a7d81d..0fec041f18f1 100644
--- a/deployer/src/deployer/main.py
+++ b/deployer/src/deployer/main.py
@@ -11,6 +11,8 @@
     DEFAULT_BUCKET_NAME,
     DEFAULT_BUCKET_PREFIX,
     DEFAULT_NO_PROGRESSBAR,
+    DEFAULT_REPO,
+    DEFAULT_GITHUB_TOKEN,
     SPEEDCURVE_DEPLOY_API_KEY,
     SPEEDCURVE_DEPLOY_SITE_ID,
     ELASTICSEARCH_URL,
@@ -20,6 +22,7 @@
 from .utils import log
 from .whatsdeployed import dump as dump_whatsdeployed
 from .speedcurve import deploy_ping as speedcurve_deploy_ping
+from .analyze_pr import analyze_pr
 from . import search
 
 
@@ -129,7 +132,7 @@ def whatsdeployed(ctx, directory: Path, output: str):
     help="The path to the root folder of the main content (defaults to CONTENT_ROOT)",
     default=CONTENT_ROOT,
     show_default=True,
-    callback=validate_directory,
+    callback=validate_optional_directory,
 )
 @click.option(
     "--content-translated-root",
@@ -180,11 +183,17 @@ def whatsdeployed(ctx, directory: Path, output: str):
 @click.pass_context
 def upload(ctx, directory: Path, **kwargs):
     log.info(f"Deployer ({__version__})", bold=True)
-    content_roots = [kwargs["content_root"]]
+    content_roots = []
+    if kwargs["content_root"]:
+        content_roots.append(kwargs["content_root"])
     if kwargs["content_translated_root"]:
         content_roots.append(kwargs["content_translated_root"])
     if kwargs["content_archived_root"]:
         content_roots.append(kwargs["content_archived_root"])
+    if not kwargs["no_redirects"] and not content_roots:
+        raise Exception(
+            "if you don't use --no-redirects you have to have at least one content root"
+        )
 
     if kwargs["prune"] and not kwargs["archived_files"]:
         log.warning(
@@ -195,6 +204,55 @@ def upload(ctx, directory: Path, **kwargs):
     upload_content(directory, content_roots, ctx.obj)
 
 
+@cli.command()
+@click.option(
+    "--prefix",
+    help="What prefix was it uploaded as",
+    default=None,
+    show_default=True,
+)
+@click.option(
+    "--repo",
+    help="Name of the repo (e.g. mdn/content)",
+    default=DEFAULT_REPO,
+    show_default=True,
+)
+@click.option(
+    "--pr-number",
+    help="Number for the PR",
+    default=None,
+)
+@click.option(
+    "--github-token",
+    help="Token used to post PR comments",
+    default=DEFAULT_GITHUB_TOKEN,
+    show_default=False,
+)
+@click.option(
+    "--analyze-flaws",
+    help="Analyze the .doc.flaws keys in the index.json files",
+    default=False,
+    show_default=True,
+    is_flag=True,
+)
+@click.option(
+    "--analyze-dangerous-content",
+    help='Look through the built content and list "dangerous things"',
+    default=False,
+    show_default=True,
+    is_flag=True,
+)
+@click.argument("directory", type=click.Path(), callback=validate_directory)
+@click.pass_context
+def analyze_pr_build(ctx, directory: Path, **kwargs):
+    log.info(f"Deployer ({__version__})", bold=True)
+    ctx.obj.update(kwargs)
+    combined_comment = analyze_pr(directory, ctx.obj)
+    log.info("POST".center(80, "_"), "\n")
+    log.info(combined_comment)
+    log.info("\n", "END POST".center(80, "_"))
+
+
 @cli.command()
 @click.option(
     "--api-key",
diff --git a/deployer/src/deployer/test_analyze_pr.py b/deployer/src/deployer/test_analyze_pr.py
new file mode 100644
index 000000000000..9c6734d399fe
--- /dev/null
+++ b/deployer/src/deployer/test_analyze_pr.py
@@ -0,0 +1,112 @@
+import json
+import tempfile
+from contextlib import contextmanager
+from pathlib import Path
+from unittest.mock import patch
+
+from deployer.analyze_pr import analyze_pr
+
+DEFAULT_CONFIG = {
+    "prefix": None,
+    "analyze_flaws": False,
+    "analyze_dangerous_content": False,
+    "repo": "mdn/content",
+    "pr_number": None,
+    "dry_run": False,
+    "github_token": "",
+}
+
+
+@contextmanager
+def mock_build_directory(*docs):
+    with tempfile.TemporaryDirectory() as tmpdirname:
+        dirname = Path(tmpdirname)
+        for i, doc in enumerate(docs):
+            doc_dirname = dirname / f"doc{i}"
+            doc_dirname.mkdir()
+            with open(doc_dirname / "index.json", "w") as f:
+                json.dump(doc, f)
+        yield dirname
+
+
+def test_analyze_pr_prefix():
+    doc = {"doc": {"mdn_url": "/en-US/docs/Foo"}}
+    with mock_build_directory(doc) as build_directory:
+        comment = analyze_pr(build_directory, dict(DEFAULT_CONFIG, prefix="pr007"))
+        assert "## Preview deployment URLs" in comment
+        assert "- <https://pr007.content.dev.mdn.mozit.cloud/en-US/docs/Foo>" in comment
+
+
+def test_analyze_pr_flaws():
+    doc = {
+        "doc": {
+            "mdn_url": "/en-US/docs/Foo",
+            "title": "Foo",
+            "flaws": {
+                "faux_pas": [
+                    {"explanation": "Socks in sandals"},
+                    {"explanation": "Congrats on losing your cat"},
+                ],
+            },
+            "source": {"github_url": "https://github.com/foo"},
+        }
+    }
+    no_flaws_doc = {
+        "doc": {
+            "mdn_url": "/en-US/docs/Bar",
+            "title": "Bar",
+            "flaws": {},
+            "source": {"github_url": "https://github.com/bar"},
+        }
+    }
+    with mock_build_directory(no_flaws_doc, doc) as build_directory:
+        comment = analyze_pr(build_directory, dict(DEFAULT_CONFIG, analyze_flaws=True))
+        assert "## Flaws" in comment
+        assert "Flaw count: 0" in comment
+        assert "Flaw count: 2" in comment
+        assert len(comment.split("\n---\n")) == 2
+        assert "- **faux_pas**:" in comment
+        assert "  - `Socks in sandals`" in comment
+        assert "  - `Congrats on losing your cat`" in comment
+
+
+def test_analyze_pr_dangerous_content():
+    doc = {
+        "doc": {
+            "mdn_url": "/en-US/docs/Foo",
+            "title": "Foo",
+            "body": [
+                {
+                    "type": "prose",
+                    "value": {
+                        "content": """
+            <p>
+            <a href="https://www.peterbe.com">Peterbe.com</a>
+            </p>
+            """
+                    },
+                }
+            ],
+            "source": {"github_url": "https://github.com/foo"},
+        }
+    }
+    with mock_build_directory(doc) as build_directory:
+        comment = analyze_pr(
+            build_directory, dict(DEFAULT_CONFIG, analyze_dangerous_content=True)
+        )
+        assert "## External URLs" in comment
+        assert "  - <https://www.peterbe.com> (1 time)" in comment
+
+
+@patch("deployer.analyze_pr.Github")
+def test_analyze_pr_prefix_and_postcomment(mocked_github):
+    doc = {"doc": {"mdn_url": "/en-US/docs/Foo"}}
+    with mock_build_directory(doc) as build_directory:
+        comment = analyze_pr(
+            build_directory,
+            dict(DEFAULT_CONFIG, prefix="pr007", pr_number=123, github_token="abc123"),
+        )
+        assert "## Preview deployment URLs" in comment
+        assert "- <https://pr007.content.dev.mdn.mozit.cloud/en-US/docs/Foo>" in comment
+
+    mocked_github().get_repo().get_issue().create_comment.assert_called()

From 6d4fde03da6178c1a77c6ac4dbfd5acfdc98abbf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 06:53:25 +0000
Subject: [PATCH 042/288] build(deps-dev): bump html-validate from 4.7.0 to
 4.7.1 (#3291)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fbfbdca3aef8..e4e024b196ae 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "fuzzyjs": "4.0.4",
     "fuzzysearch": "1.0.3",
     "history": "5.0.0",
-    "html-validate": "4.7.0",
+    "html-validate": "4.7.1",
     "husky": "4.3.8",
     "ignore-loader": "^0.1.2",
     "jest-environment-jsdom-sixteen": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index e0c52aa18bbb..3f466f193a8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9333,10 +9333,10 @@ html-tags@^3.1.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
   integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
 
-html-validate@4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.7.0.tgz#98df8689a2021f069962294d824697412a2c820d"
-  integrity sha512-tu6xLlHQY4RkfXtR5d8WjJ8+w2BbZZGtAdgtL3C7tRjepFtVluu3vLpGPEfi3NP9wZf9Xk2/Dgm9RK48StqVpA==
+html-validate@4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.7.1.tgz#7d7a504ce9555fe83e40a5d1c4c3544929491141"
+  integrity sha512-GelR6b//NLRrgbdn9K//dCJd/FhU6IPNliPIryLq0EUb/6a9hD1+ihoqIHHoqZHMIdk5e7epKEJpaxEZeRJ1Fg==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@html-validate/stylish" "1.0.0"

From 179385b3e46325f04ce3c18e2a9c6380d69fc1dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 06:54:11 +0000
Subject: [PATCH 043/288] build(deps): bump open from 8.0.3 to 8.0.4 (#3292)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e4e024b196ae..dcb0353806b7 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "loglevel": "^1.7.1",
     "lru-cache": "^6.0.0",
     "mdn-data": "2.0.17",
-    "open": "^8.0.3",
+    "open": "^8.0.4",
     "open-editor": "3.0.0",
     "prismjs": "1.23.0",
     "read-chunk": "3.2.0",
diff --git a/yarn.lock b/yarn.lock
index 3f466f193a8d..3b0c6f70e2bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12858,10 +12858,10 @@ open@^7.0.2, open@^7.0.3, open@^7.3.0:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
 
-open@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.0.3.tgz#04f4406c950666c35041aad8a621700022116afd"
-  integrity sha512-7nsHNw3rOIPTwhF5iYkgE+LVM/oUHWC3cgrWNxPqa+W+Wl5Ekvo32qayB5PYX8zNjXzUkrTaJsWpaGmuw8Aspg==
+open@^8.0.4:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.0.4.tgz#2fb90debffcf20f4d7be537502ed3e3ee9e5dcbc"
+  integrity sha512-Txc9FOcvjrr5Kv+Zb3w89uKMKiP7wH8mLdYj1xJa+YnhhntEYhbB6cQHjS4O6P+jFwMEzEQVVcpfnu9WkKNuLQ==
   dependencies:
     define-lazy-prop "^2.0.0"
     is-docker "^2.1.1"

From d28cb84cdff0b6236272d3dda0a48b580f6e5600 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 06:55:17 +0000
Subject: [PATCH 044/288] build(deps-dev): bump swr from 0.5.3 to 0.5.4 (#3293)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index dcb0353806b7..734dd25a3d9f 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "stylelint-config-sass-guidelines": "^8.0.0",
     "stylelint-prettier": "^1.2.0",
     "stylelint-scss": "^3.19.0",
-    "swr": "^0.5.3",
+    "swr": "^0.5.4",
     "ts-loader": "^8.0.18",
     "typescript": "^4.2.3",
     "use-debounce": "^5.2.1",
diff --git a/yarn.lock b/yarn.lock
index 3b0c6f70e2bc..eede4d1412b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16916,10 +16916,10 @@ svgo@^2.1.0:
     csso "^4.2.0"
     stable "^0.1.8"
 
-swr@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/swr/-/swr-0.5.3.tgz#7290a9a61329d930583ef365317e636b8dbaa8bb"
-  integrity sha512-RUE3RWn3jt9e4qLPat2A9vbHG/5N6konsc27xKjE65jFSiGv0P7HLD8IGvwAv6DRKktL7Od2UcayX0plKb2awg==
+swr@^0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/swr/-/swr-0.5.4.tgz#9516af6ffd84ba2c23a804ff771be2eb83ba8d46"
+  integrity sha512-TUSxxuC8uP/4JKV22ml91WQ0tbif+9HVhm683xm8KYfwZIW5ogwcnU634dg3x6N7azpIDIOLokoIi+z5vCz/yA==
 
 symbol-tree@^3.2.4:
   version "3.2.4"

From db7148375a30a6674bbb32aa75de30366a76d826 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 06:57:41 +0000
Subject: [PATCH 045/288] build(deps-dev): bump downshift from 6.1.0 to 6.1.1
 (#3295)

---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 734dd25a3d9f..1d08f7c2c3f5 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "braces": "^3.0.2",
     "cross-env": "^7.0.3",
     "diff": "^5.0.0",
-    "downshift": "^6.1.0",
+    "downshift": "^6.1.1",
     "eslint": "^7.18.0",
     "eslint-gitignore": "^0.1.0",
     "eslint-plugin-jest": "24.3.2",
diff --git a/yarn.lock b/yarn.lock
index eede4d1412b9..faf5813253c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5708,10 +5708,10 @@ compression@1.7.4, compression@^1.7.4:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-compute-scroll-into-view@^1.0.16:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz#5b7bf4f7127ea2c19b750353d7ce6776a90ee088"
-  integrity sha512-a85LHKY81oQnikatZYA90pufpZ6sQx++BoCxOEMsjpZx+ZnaKGQnCyCehTRr/1p9GBIAHTjcU9k71kSYWloLiQ==
+compute-scroll-into-view@^1.0.17:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab"
+  integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -6961,13 +6961,13 @@ download@^7.1.0:
     p-event "^2.1.0"
     pify "^3.0.0"
 
-downshift@^6.0.6, downshift@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.1.0.tgz#f008063d9b63935910d9db12ead07979ab51ce66"
-  integrity sha512-MnEJERij+1pTVAsOPsH3q9MJGNIZuu2sT90uxOCEOZYH6sEzkVGtUcTBVDRQkE8y96zpB7uEbRn24aE9VpHnZg==
+downshift@^6.0.6, downshift@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.1.1.tgz#3c8f5a64cc678e1b45a87b80647ea5351af13e5e"
+  integrity sha512-ch8Sh/j7gVqQd7Kcv3A5TkGfldmxmlQrRPZJYWEhzh24+h7WA4vXssuhcGNJrD8YPJlZYQGHcaX8BNhS0IcOvg==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    compute-scroll-into-view "^1.0.16"
+    compute-scroll-into-view "^1.0.17"
     prop-types "^15.7.2"
     react-is "^17.0.1"
 

From 60d2c008ce1473d3b7c2cbb6042823a3dc1a7ec9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 08:28:14 +0000
Subject: [PATCH 046/288] build(deps): bump boto3 from 1.17.32 to 1.17.33 in
 /deployer (#3296)

---
 deployer/poetry.lock    | 353 +++++++++++++++++++---------------------
 deployer/pyproject.toml |   2 +-
 2 files changed, 168 insertions(+), 187 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 244f31633031..4f01ef85dbef 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -1,41 +1,40 @@
 [[package]]
-category = "dev"
-description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 name = "appdirs"
+version = "1.4.4"
+description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+category = "dev"
 optional = false
 python-versions = "*"
-version = "1.4.4"
 
 [[package]]
-category = "dev"
-description = "Atomic file writes."
-marker = "sys_platform == \"win32\""
 name = "atomicwrites"
+version = "1.4.0"
+description = "Atomic file writes."
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.4.0"
 
 [[package]]
-category = "dev"
-description = "Classes Without Boilerplate"
 name = "attrs"
+version = "20.3.0"
+description = "Classes Without Boilerplate"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "20.3.0"
 
 [package.extras]
-dev = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "furo", "sphinx", "pre-commit"]
 docs = ["furo", "sphinx", "zope.interface"]
-tests = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"]
-tests_no_zope = ["coverage (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six"]
 
 [[package]]
-category = "dev"
-description = "The uncompromising code formatter."
 name = "black"
+version = "20.8b1"
+description = "The uncompromising code formatter."
+category = "dev"
 optional = false
 python-versions = ">=3.6"
-version = "20.8b1"
 
 [package.dependencies]
 appdirs = "*"
@@ -52,25 +51,25 @@ colorama = ["colorama (>=0.4.3)"]
 d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
-category = "main"
-description = "The AWS SDK for Python"
 name = "boto3"
+version = "1.17.33"
+description = "The AWS SDK for Python"
+category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
-version = "1.17.32"
 
 [package.dependencies]
-botocore = ">=1.20.32,<1.21.0"
+botocore = ">=1.20.33,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
-category = "main"
-description = "Low-level, data-driven core of boto 3."
 name = "botocore"
+version = "1.20.33"
+description = "Low-level, data-driven core of boto 3."
+category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
-version = "1.20.32"
 
 [package.dependencies]
 jmespath = ">=0.7.1,<1.0.0"
@@ -78,78 +77,77 @@ python-dateutil = ">=2.1,<3.0.0"
 urllib3 = ">=1.25.4,<1.27"
 
 [package.extras]
-crt = ["awscrt (0.10.8)"]
+crt = ["awscrt (==0.10.8)"]
 
 [[package]]
-category = "main"
-description = "Python package for providing Mozilla's CA Bundle."
 name = "certifi"
+version = "2020.12.5"
+description = "Python package for providing Mozilla's CA Bundle."
+category = "main"
 optional = false
 python-versions = "*"
-version = "2020.12.5"
 
 [[package]]
-category = "main"
-description = "Foreign Function Interface for Python calling C code."
 name = "cffi"
+version = "1.14.5"
+description = "Foreign Function Interface for Python calling C code."
+category = "main"
 optional = false
 python-versions = "*"
-version = "1.14.5"
 
 [package.dependencies]
 pycparser = "*"
 
 [[package]]
-category = "main"
-description = "Universal encoding detector for Python 2 and 3"
 name = "chardet"
+version = "4.0.0"
+description = "Universal encoding detector for Python 2 and 3"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "4.0.0"
 
 [[package]]
-category = "main"
-description = "Composable command line interface toolkit"
 name = "click"
+version = "7.1.2"
+description = "Composable command line interface toolkit"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "7.1.2"
 
 [[package]]
-category = "dev"
-description = "Cross-platform colored terminal text."
-marker = "sys_platform == \"win32\""
 name = "colorama"
+version = "0.4.4"
+description = "Cross-platform colored terminal text."
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "0.4.4"
 
 [[package]]
-category = "main"
-description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 name = "cryptography"
+version = "3.4.6"
+description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
+category = "main"
 optional = false
 python-versions = ">=3.6"
-version = "3.4.6"
 
 [package.dependencies]
 cffi = ">=1.12"
 
 [package.extras]
-docs = ["sphinx (>=1.6.5,<1.8.0 || >1.8.0,<3.1.0 || >3.1.0,<3.1.1 || >3.1.1)", "sphinx-rtd-theme"]
+docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"]
 docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
 pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"]
 sdist = ["setuptools-rust (>=0.11.4)"]
 ssh = ["bcrypt (>=3.1.5)"]
-test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"]
+test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"]
 
 [[package]]
-category = "main"
-description = "Python @deprecated decorator to deprecate old python classes, functions or methods."
 name = "deprecated"
+version = "1.2.12"
+description = "Python @deprecated decorator to deprecate old python classes, functions or methods."
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.2.12"
 
 [package.dependencies]
 wrapt = ">=1.10,<2"
@@ -158,12 +156,12 @@ wrapt = ">=1.10,<2"
 dev = ["tox", "bump2version (<1)", "sphinx (<2)", "importlib-metadata (<3)", "importlib-resources (<4)", "configparser (<5)", "sphinxcontrib-websupport (<2)", "zipp (<2)", "PyTest (<5)", "PyTest-Cov (<2.6)", "pytest", "pytest-cov"]
 
 [[package]]
-category = "main"
-description = "Python client for Elasticsearch"
 name = "elasticsearch"
+version = "7.11.0"
+description = "Python client for Elasticsearch"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4"
-version = "7.11.0"
 
 [package.dependencies]
 certifi = "*"
@@ -176,12 +174,12 @@ docs = ["sphinx (<1.7)", "sphinx-rtd-theme"]
 requests = ["requests (>=2.4.0,<3.0.0)"]
 
 [[package]]
-category = "main"
-description = "Python client for Elasticsearch"
 name = "elasticsearch-dsl"
+version = "7.3.0"
+description = "Python client for Elasticsearch"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "7.3.0"
 
 [package.dependencies]
 elasticsearch = ">=7.0.0,<8.0.0"
@@ -192,156 +190,147 @@ six = "*"
 develop = ["mock", "pytest (>=3.0.0)", "pytest-cov", "pytest-mock (<3.0.0)", "pytz", "coverage (<5.0.0)", "sphinx", "sphinx-rtd-theme"]
 
 [[package]]
-category = "dev"
-description = "the modular source code checker: pep8 pyflakes and co"
 name = "flake8"
+version = "3.9.0"
+description = "the modular source code checker: pep8 pyflakes and co"
+category = "dev"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
-version = "3.9.0"
 
 [package.dependencies]
+importlib-metadata = {version = "*", markers = "python_version < \"3.8\""}
 mccabe = ">=0.6.0,<0.7.0"
 pycodestyle = ">=2.7.0,<2.8.0"
 pyflakes = ">=2.3.0,<2.4.0"
 
-[package.dependencies.importlib-metadata]
-python = "<3.8"
-version = "*"
-
 [[package]]
-category = "main"
-description = "Internationalized Domain Names in Applications (IDNA)"
 name = "idna"
+version = "2.10"
+description = "Internationalized Domain Names in Applications (IDNA)"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.10"
 
 [[package]]
-category = "dev"
-description = "Read metadata from Python packages"
-marker = "python_version < \"3.8\""
 name = "importlib-metadata"
+version = "3.7.3"
+description = "Read metadata from Python packages"
+category = "dev"
 optional = false
 python-versions = ">=3.6"
-version = "3.7.3"
 
 [package.dependencies]
+typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""}
 zipp = ">=0.5"
 
-[package.dependencies.typing-extensions]
-python = "<3.8"
-version = ">=3.6.4"
-
 [package.extras]
 docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
-testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
+testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"]
 
 [[package]]
-category = "dev"
-description = "iniconfig: brain-dead simple config-ini parsing"
 name = "iniconfig"
+version = "1.1.1"
+description = "iniconfig: brain-dead simple config-ini parsing"
+category = "dev"
 optional = false
 python-versions = "*"
-version = "1.1.1"
 
 [[package]]
-category = "main"
-description = "JSON Matching Expressions"
 name = "jmespath"
+version = "0.10.0"
+description = "JSON Matching Expressions"
+category = "main"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-version = "0.10.0"
 
 [[package]]
-category = "dev"
-description = "McCabe checker, plugin for flake8"
 name = "mccabe"
+version = "0.6.1"
+description = "McCabe checker, plugin for flake8"
+category = "dev"
 optional = false
 python-versions = "*"
-version = "0.6.1"
 
 [[package]]
-category = "dev"
-description = "Experimental type system extensions for programs checked with the mypy typechecker."
 name = "mypy-extensions"
+version = "0.4.3"
+description = "Experimental type system extensions for programs checked with the mypy typechecker."
+category = "dev"
 optional = false
 python-versions = "*"
-version = "0.4.3"
 
 [[package]]
-category = "dev"
-description = "Core utilities for Python packages"
 name = "packaging"
+version = "20.9"
+description = "Core utilities for Python packages"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "20.9"
 
 [package.dependencies]
 pyparsing = ">=2.0.2"
 
 [[package]]
-category = "dev"
-description = "Utility library for gitignore style pattern matching of file paths."
 name = "pathspec"
+version = "0.8.1"
+description = "Utility library for gitignore style pattern matching of file paths."
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "0.8.1"
 
 [[package]]
-category = "dev"
-description = "plugin and hook calling mechanisms for python"
 name = "pluggy"
+version = "0.13.1"
+description = "plugin and hook calling mechanisms for python"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "0.13.1"
 
 [package.dependencies]
-[package.dependencies.importlib-metadata]
-python = "<3.8"
-version = ">=0.12"
+importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""}
 
 [package.extras]
 dev = ["pre-commit", "tox"]
 
 [[package]]
-category = "dev"
-description = "library with cross-python path, ini-parsing, io, code, log facilities"
 name = "py"
+version = "1.10.0"
+description = "library with cross-python path, ini-parsing, io, code, log facilities"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.10.0"
 
 [[package]]
-category = "dev"
-description = "Python style guide checker"
 name = "pycodestyle"
+version = "2.7.0"
+description = "Python style guide checker"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.7.0"
 
 [[package]]
-category = "main"
-description = "C parser in Python"
 name = "pycparser"
+version = "2.20"
+description = "C parser in Python"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.20"
 
 [[package]]
-category = "dev"
-description = "passive checker of Python programs"
 name = "pyflakes"
+version = "2.3.0"
+description = "passive checker of Python programs"
+category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.3.0"
 
 [[package]]
-category = "main"
-description = "Use the full Github API v3"
 name = "pygithub"
+version = "1.54.1"
+description = "Use the full Github API v3"
+category = "main"
 optional = false
 python-versions = ">=3.6"
-version = "1.54.1"
 
 [package.dependencies]
 deprecated = "*"
@@ -352,12 +341,12 @@ requests = ">=2.14.0"
 integrations = ["cryptography"]
 
 [[package]]
-category = "main"
-description = "JSON Web Token implementation in Python"
 name = "pyjwt"
+version = "1.7.1"
+description = "JSON Web Token implementation in Python"
+category = "main"
 optional = false
 python-versions = "*"
-version = "1.7.1"
 
 [package.extras]
 crypto = ["cryptography (>=1.4)"]
@@ -365,12 +354,12 @@ flake8 = ["flake8", "flake8-import-order", "pep8-naming"]
 test = ["pytest (>=4.0.1,<5.0.0)", "pytest-cov (>=2.6.0,<3.0.0)", "pytest-runner (>=4.2,<5.0.0)"]
 
 [[package]]
-category = "main"
-description = "Python wrapper module around the OpenSSL library"
 name = "pyopenssl"
+version = "20.0.1"
+description = "Python wrapper module around the OpenSSL library"
+category = "main"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*"
-version = "20.0.1"
 
 [package.dependencies]
 cryptography = ">=3.2"
@@ -381,179 +370,170 @@ docs = ["sphinx", "sphinx-rtd-theme"]
 test = ["flaky", "pretend", "pytest (>=3.0.1)"]
 
 [[package]]
-category = "dev"
-description = "Python parsing module"
 name = "pyparsing"
+version = "2.4.7"
+description = "Python parsing module"
+category = "dev"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-version = "2.4.7"
 
 [[package]]
-category = "dev"
-description = "pytest: simple powerful testing with Python"
 name = "pytest"
+version = "6.2.2"
+description = "pytest: simple powerful testing with Python"
+category = "dev"
 optional = false
 python-versions = ">=3.6"
-version = "6.2.2"
 
 [package.dependencies]
-atomicwrites = ">=1.0"
+atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""}
 attrs = ">=19.2.0"
-colorama = "*"
+colorama = {version = "*", markers = "sys_platform == \"win32\""}
+importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""}
 iniconfig = "*"
 packaging = "*"
 pluggy = ">=0.12,<1.0.0a1"
 py = ">=1.8.2"
 toml = "*"
 
-[package.dependencies.importlib-metadata]
-python = "<3.8"
-version = ">=0.12"
-
 [package.extras]
 testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"]
 
 [[package]]
-category = "main"
-description = "Extensions to the standard Python datetime module"
 name = "python-dateutil"
+version = "2.8.1"
+description = "Extensions to the standard Python datetime module"
+category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
-version = "2.8.1"
 
 [package.dependencies]
 six = ">=1.5"
 
 [[package]]
-category = "main"
-description = "Strict separation of settings from code."
 name = "python-decouple"
+version = "3.4"
+description = "Strict separation of settings from code."
+category = "main"
 optional = false
 python-versions = "*"
-version = "3.4"
 
 [[package]]
-category = "dev"
-description = "Alternative regular expression module, to replace re."
 name = "regex"
+version = "2021.3.17"
+description = "Alternative regular expression module, to replace re."
+category = "dev"
 optional = false
 python-versions = "*"
-version = "2021.3.17"
 
 [[package]]
-category = "main"
-description = "Python HTTP for Humans."
 name = "requests"
+version = "2.25.1"
+description = "Python HTTP for Humans."
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "2.25.1"
 
 [package.dependencies]
 certifi = ">=2017.4.17"
 chardet = ">=3.0.2,<5"
+cryptography = {version = ">=1.3.4", optional = true, markers = "extra == \"security\""}
 idna = ">=2.5,<3"
+pyOpenSSL = {version = ">=0.14", optional = true, markers = "extra == \"security\""}
 urllib3 = ">=1.21.1,<1.27"
 
-[package.dependencies.cryptography]
-optional = true
-version = ">=1.3.4"
-
-[package.dependencies.pyOpenSSL]
-optional = true
-version = ">=0.14"
-
 [package.extras]
 security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"]
-socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"]
+socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
 
 [[package]]
-category = "main"
-description = "An Amazon S3 Transfer Manager"
 name = "s3transfer"
+version = "0.3.6"
+description = "An Amazon S3 Transfer Manager"
+category = "main"
 optional = false
 python-versions = "*"
-version = "0.3.6"
 
 [package.dependencies]
 botocore = ">=1.12.36,<2.0a.0"
 
 [[package]]
-category = "main"
-description = "Fast HTML5 parser with CSS selectors."
 name = "selectolax"
+version = "0.2.10"
+description = "Fast HTML5 parser with CSS selectors."
+category = "main"
 optional = false
 python-versions = "*"
-version = "0.2.10"
 
 [[package]]
-category = "main"
-description = "Python 2 and 3 compatibility utilities"
 name = "six"
+version = "1.15.0"
+description = "Python 2 and 3 compatibility utilities"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
-version = "1.15.0"
 
 [[package]]
-category = "dev"
-description = "Python Library for Tom's Obvious, Minimal Language"
 name = "toml"
+version = "0.10.2"
+description = "Python Library for Tom's Obvious, Minimal Language"
+category = "dev"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-version = "0.10.2"
 
 [[package]]
-category = "dev"
-description = "a fork of Python 2 and 3 ast modules with type comment support"
 name = "typed-ast"
+version = "1.4.2"
+description = "a fork of Python 2 and 3 ast modules with type comment support"
+category = "dev"
 optional = false
 python-versions = "*"
-version = "1.4.2"
 
 [[package]]
-category = "dev"
-description = "Backported and Experimental Type Hints for Python 3.5+"
 name = "typing-extensions"
+version = "3.7.4.3"
+description = "Backported and Experimental Type Hints for Python 3.5+"
+category = "dev"
 optional = false
 python-versions = "*"
-version = "3.7.4.3"
 
 [[package]]
-category = "main"
-description = "HTTP library with thread-safe connection pooling, file post, and more."
 name = "urllib3"
+version = "1.26.4"
+description = "HTTP library with thread-safe connection pooling, file post, and more."
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
-version = "1.26.4"
 
 [package.extras]
-brotli = ["brotlipy (>=0.6.0)"]
 secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
-socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"]
+socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
+brotli = ["brotlipy (>=0.6.0)"]
 
 [[package]]
-category = "main"
-description = "Module for decorators, wrappers and monkey patching."
 name = "wrapt"
+version = "1.12.1"
+description = "Module for decorators, wrappers and monkey patching."
+category = "main"
 optional = false
 python-versions = "*"
-version = "1.12.1"
 
 [[package]]
-category = "dev"
-description = "Backport of pathlib-compatible object wrapper for zip files"
-marker = "python_version < \"3.8\""
 name = "zipp"
+version = "3.4.1"
+description = "Backport of pathlib-compatible object wrapper for zip files"
+category = "dev"
 optional = false
 python-versions = ">=3.6"
-version = "3.4.1"
 
 [package.extras]
 docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
 testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"]
 
 [metadata]
-content-hash = "7119424a717c77cc43df1bc868c91d9f2a3a6a79d3397fc143858718ecb45fe0"
+lock-version = "1.1"
 python-versions = "^3.7"
+content-hash = "6ec3c53b11db10e780442e1608e422d4b7559576e9c469b75675dca567817257"
 
 [metadata.files]
 appdirs = [
@@ -572,12 +552,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.32-py2.py3-none-any.whl", hash = "sha256:85069e044c871571b7a72b600123761e1747ad18328fa5188f13b097a394251d"},
-    {file = "boto3-1.17.32.tar.gz", hash = "sha256:2df49a4360ef0640902c26bf93ac0791b37755db3a2efd0d51a03eddeb9f807e"},
+    {file = "boto3-1.17.33-py2.py3-none-any.whl", hash = "sha256:3306dad87f993703b102a0a70ca19c549b7f41e7f70fa7b4c579735c9f79351d"},
+    {file = "boto3-1.17.33.tar.gz", hash = "sha256:0cac2fffc1ba915f7bb5ecee539318532db51f218c928a228fafe3e501e9472e"},
 ]
 botocore = [
-    {file = "botocore-1.20.32-py2.py3-none-any.whl", hash = "sha256:fc162b69adc54c9ef037fec31f93d46df0bf8a9c3d201ecb16d0a9ec5f2936ec"},
-    {file = "botocore-1.20.32.tar.gz", hash = "sha256:1cef96e716f7481bfb3b8d3c3d45e640d588aa5af613cd6d7f33d784aa2e8d12"},
+    {file = "botocore-1.20.33-py2.py3-none-any.whl", hash = "sha256:a33e862685259fe22d9790d9c9f3567feda8b824d44d3c62a3617af1133543a4"},
+    {file = "botocore-1.20.33.tar.gz", hash = "sha256:e355305309699d3aca1e0050fc21d48595b40db046cb0d2491cd57ff5b26920b"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
@@ -632,6 +612,7 @@ click = [
 ]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
+    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
 ]
 cryptography = [
     {file = "cryptography-3.4.6-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:57ad77d32917bc55299b16d3b996ffa42a1c73c6cfa829b14043c561288d2799"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index b63b4d94ed7e..c5ebc653442e 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.32"
+boto3 = "^1.17.33"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 7be490ae3f2e3dcab652423088110ea0cde2ea3b Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 22 Mar 2021 09:13:19 -0400
Subject: [PATCH 047/288] /pagenotfound is rendering the homepage route (#3288)

* /pagenotfound is rendering the homepage route

Fixes #3224
Fixes #3287

* refactor
---
 client/src/app.tsx                          | 38 +++++++++++--------
 client/src/constants.ts                     | 41 +++++++++++++++++++++
 client/src/hooks.ts                         | 17 ++++++++-
 client/src/page-not-found/fallback-link.tsx |  2 +-
 server/index.js                             | 13 ++++---
 5 files changed, 88 insertions(+), 23 deletions(-)

diff --git a/client/src/app.tsx b/client/src/app.tsx
index 15b36a19dfa3..2fbf8c25f227 100644
--- a/client/src/app.tsx
+++ b/client/src/app.tsx
@@ -58,9 +58,9 @@ function DocumentLayout({ children }) {
  * originally not found. Perhaps, this new location that the client is
  * requesting is going to work.
  */
-function DocumentOrPageNotFound(props) {
+function PageOrPageNotFound({ pageNotFound, children }) {
   // It's true by default if the SSR rendering says so.
-  const [notFound, setNotFound] = React.useState<boolean>(!!props.pageNotFound);
+  const [notFound, setNotFound] = React.useState<boolean>(!!pageNotFound);
   const { pathname } = useLocation();
   const initialPathname = React.useRef(pathname);
   React.useEffect(() => {
@@ -74,9 +74,7 @@ function DocumentOrPageNotFound(props) {
       <PageNotFound />
     </StandardLayout>
   ) : (
-    <DocumentLayout>
-      <Document {...props} />
-    </DocumentLayout>
+    children
   );
 }
 
@@ -97,7 +95,17 @@ export function App(appProps) {
   // But if the App is loaded from the code that builds the SPAs, then `isServer`
   // is true. So you have to have `isServer && CRUD_MODE` at the same time.
   const homePage =
-    !isServer && CRUD_MODE ? <WritersHomepage /> : <Homepage {...appProps} />;
+    !isServer && CRUD_MODE ? (
+      <Layout pageType="standard-page">
+        <WritersHomepage />
+      </Layout>
+    ) : (
+      <PageOrPageNotFound pageNotFound={appProps.pageNotFound}>
+        <Layout pageType="standard-page">
+          <Homepage {...appProps} />
+        </Layout>
+      </PageOrPageNotFound>
+    );
 
   const routes = (
     <Routes>
@@ -107,10 +115,7 @@ export function App(appProps) {
         having a locale. So it'll be `/en-US` (for example) by the
         time it hits any React code.
        */}
-      <Route
-        path="/"
-        element={<Layout pageType="standard-page">{homePage}</Layout>}
-      />
+      <Route path="/" element={homePage} />
       <Route
         path="/:locale/*"
         element={
@@ -196,10 +201,7 @@ export function App(appProps) {
                 />
               </>
             )}
-            <Route
-              path="/"
-              element={<StandardLayout>{homePage}</StandardLayout>}
-            />
+            <Route path="/" element={homePage} />
             <Route
               path="/search"
               element={
@@ -234,7 +236,13 @@ export function App(appProps) {
             />
             <Route
               path="/docs/*"
-              element={<DocumentOrPageNotFound {...appProps} />}
+              element={
+                <PageOrPageNotFound pageNotFound={appProps.pageNotFound}>
+                  <DocumentLayout>
+                    <Document {...appProps} />
+                  </DocumentLayout>
+                </PageOrPageNotFound>
+              }
             />
             <Route
               path="*"
diff --git a/client/src/constants.ts b/client/src/constants.ts
index caf3cefad5b0..d455a90a1a50 100644
--- a/client/src/constants.ts
+++ b/client/src/constants.ts
@@ -15,3 +15,44 @@ export const AUTOCOMPLETE_SEARCH_WIDGET = JSON.parse(
 export const DEBUG_SEARCH_RESULTS = JSON.parse(
   process.env.REACT_APP_DEBUG_SEARCH_RESULTS || "false"
 );
+
+// Remember to keep this in sync with the list inside the Node code.
+// E.g. libs/constants.js
+// Hardcoding the list in both places is most convenient and most performant.
+// We could encode the list in the SSR rendering but that means the client side
+// code needs to depend on having access to the `window` global first.
+export const VALID_LOCALES = new Set([
+  "ar",
+  "bg",
+  "bn",
+  "ca",
+  "de",
+  "el",
+  "en-US",
+  "es",
+  "fa",
+  "fi",
+  "fr",
+  "he",
+  "hi-IN",
+  "hu",
+  "id",
+  "it",
+  "ja",
+  "kab",
+  "ko",
+  "ms",
+  "my",
+  "nl",
+  "pl",
+  "pt-BR",
+  "pt-PT",
+  "ru",
+  "sv-SE",
+  "th",
+  "tr",
+  "uk",
+  "vi",
+  "zh-CN",
+  "zh-TW",
+]);
diff --git a/client/src/hooks.ts b/client/src/hooks.ts
index a88b92938dc6..eda79c1f8283 100644
--- a/client/src/hooks.ts
+++ b/client/src/hooks.ts
@@ -1,5 +1,20 @@
 import { useParams } from "react-router-dom";
 
+// This is a bit of a necessary hack!
+// The only reason this list is needed is because of the PageNotFound rendering.
+// If someone requests `https://domain/some-random-word` what will happen is that
+// Lambda@Edge will send the `build/en-us/_spas/404.html` rendered page. That
+// rendered page has all the React stuff like routing.
+// The <App/> component can know what it needs to render but what's problematic
+// is that all and any other app will think that the locale is `some-random-word`
+// just because it's the first portion of the URL.
+// So, for example, the top navbar will think it can use the `useLocale()` hook
+// and get the current locale from the react-router context. Now the navbar menu
+// items, for example, will think the locale is `some-random-word` and make links
+// like `/some-random-word/docs/Web`.
+import { VALID_LOCALES } from "./constants";
+
 export function useLocale() {
-  return useParams().locale || "en-US";
+  const { locale } = useParams();
+  return locale && VALID_LOCALES.has(locale) ? locale : "en-US";
 }
diff --git a/client/src/page-not-found/fallback-link.tsx b/client/src/page-not-found/fallback-link.tsx
index 8df0170c463e..8ae959325a27 100644
--- a/client/src/page-not-found/fallback-link.tsx
+++ b/client/src/page-not-found/fallback-link.tsx
@@ -42,7 +42,7 @@ export default function FallbackLink({ url }: { url: string }) {
   );
 
   React.useEffect(() => {
-    if (url && locale.toLowerCase() !== "en-us") {
+    if (url && url.includes("/docs/") && locale.toLowerCase() !== "en-us") {
       // What if we attempt to see if it would be something there in English?
       // We'll use the `index.json` version of the URL
       let enUSURL = url.replace(`/${locale}/`, "/en-US/");
diff --git a/server/index.js b/server/index.js
index 21d6b1147948..f6f0aeafc90a 100644
--- a/server/index.js
+++ b/server/index.js
@@ -162,7 +162,7 @@ app.get("/*/contributors.txt", async (req, res) => {
 });
 
 app.get("/*", async (req, res) => {
-  if (req.url.startsWith("_")) {
+  if (req.url.startsWith("/_")) {
     // URLs starting with _ is exclusively for the meta-work and if there
     // isn't already a handler, it's something wrong.
     return res.status(404).send("Page not found");
@@ -182,11 +182,12 @@ app.get("/*", async (req, res) => {
   }
 
   if (!req.url.includes("/docs/")) {
-    // This should really only be expected for "single page apps".
-    // All *documents* should be handled by the
-    // `if (req.url.includes("/docs/"))` test above.
-    res.sendFile(path.join(STATIC_ROOT, "/index.html"));
-    return;
+    // If it's a known SPA, like `/en-US/search` then that should have been
+    // matched to its file and not end up here in the catchall handler.
+    // Simulate what we do in the Lambda@Edge.
+    return res
+      .status(404)
+      .sendFile(path.join(STATIC_ROOT, "en-us", "_spas", "404.html"));
   }
 
   // TODO: Would be nice to have a list of all supported file extensions

From 8e45ae190ad8bb9d669c3680a441adc24525c2e2 Mon Sep 17 00:00:00 2001
From: Schalk Neethling <sneethling@mozilla.com>
Date: Mon, 22 Mar 2021 16:55:04 +0200
Subject: [PATCH 048/288] fix: heading underline on hover and focus (#3289)

Add underline on hover and focus for linked headings

Fix #3205
---
 client/src/document/index.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/src/document/index.scss b/client/src/document/index.scss
index 2fabb76d400a..8ebc651a793a 100644
--- a/client/src/document/index.scss
+++ b/client/src/document/index.scss
@@ -125,6 +125,11 @@
     a:visited {
       text-decoration: none;
     }
+
+    a:hover,
+    a:focus {
+      text-decoration: underline;
+    }
   }
 
   table {

From f3b6f22a81370dc254ed6943440f372ce0e5737b Mon Sep 17 00:00:00 2001
From: Ryan Johnson <rjohnson@mozilla.com>
Date: Mon, 22 Mar 2021 13:54:44 -0700
Subject: [PATCH 049/288] start pruning prod builds (#3302)

---
 .github/workflows/prod-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
index c69e4e379b7a..54ea3f46eef3 100644
--- a/.github/workflows/prod-build.yml
+++ b/.github/workflows/prod-build.yml
@@ -227,7 +227,7 @@ jobs:
           # XXX would be nice to validate here that $DEPLOYER_BUCKET_PREFIX is truthy
           echo "DEPLOYER_BUCKET_PREFIX=$DEPLOYER_BUCKET_PREFIX"
 
-          poetry run deployer upload ../client/build
+          poetry run deployer upload --prune --archived-files ../content/archived.txt ../client/build
           poetry run deployer update-lambda-functions ./aws-lambda
 
           # TODO: Depending on how long the upload takes, consider switching to

From 61131c214c841a35a711e32e6fcee358bcf7fd83 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 22 Mar 2021 17:22:32 -0400
Subject: [PATCH 050/288] correct spacing for simpler diff (#3303)

---
 .github/workflows/stage-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
index c20244921e14..7c3e89fc70b2 100644
--- a/.github/workflows/stage-build.yml
+++ b/.github/workflows/stage-build.yml
@@ -240,7 +240,7 @@ jobs:
           # XXX would be nice to validate here that $DEPLOYER_BUCKET_PREFIX is truthy
           echo "DEPLOYER_BUCKET_PREFIX=$DEPLOYER_BUCKET_PREFIX"
 
-          poetry run deployer upload  --prune --archived-files ../content/archived.txt ../client/build
+          poetry run deployer upload --prune --archived-files ../content/archived.txt ../client/build
           poetry run deployer update-lambda-functions ./aws-lambda
 
           # TODO: Depending on how long the upload takes, consider switching to

From ab5b6df96ee525e1996ccb292d4d208d5528b2fd Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 22 Mar 2021 17:48:50 -0400
Subject: [PATCH 051/288] don't even attempt files URIs that start with //
 (#3305)

* don't even attempt files URIs that start with //

Fixes #3225

* Update deployer/aws-lambda/content-origin-request/index.js

Co-authored-by: Ryan Johnson <escattone@gmail.com>
---
 .../aws-lambda/content-origin-request/index.js     | 13 ++++---------
 .../content-origin-request/server.test.js          | 14 +++++++++-----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/deployer/aws-lambda/content-origin-request/index.js b/deployer/aws-lambda/content-origin-request/index.js
index 5a352d8e842b..79ba52eb3ee4 100644
--- a/deployer/aws-lambda/content-origin-request/index.js
+++ b/deployer/aws-lambda/content-origin-request/index.js
@@ -80,7 +80,7 @@ exports.handler = async (event) => {
 
   // If the URL was something like `https://domain/en-US/search/`, our code
   // would make a that a redirect to `/en-US/search` (stripping the trailing slash).
-  // But if it was `https://domain//en-US/search/` it'd make a redirect
+  // But if it was `https://domain//en-US/search/` it *would* make a redirect
   // to `//en-US/search`.
   // However, if pathname starts with `//` the Location header might look
   // relative but it's actually an absolute URL.
@@ -88,15 +88,10 @@ exports.handler = async (event) => {
   // opening `https://evil.com/` in the browser, because the browser will
   // treat `//evil.com/ == https://evil.com/`.
   // Prevent any pathnames that start with a double //.
+  // This essentially means that a request for `GET /////anything` becomes
+  // 302 with `Location: /anything`.
   if (request.uri.startsWith("//")) {
-    return {
-      status: 404,
-      statusDescription: "Not found",
-      headers: {
-        "content-type": [{ key: "Content-Type", value: "text/plain" }],
-      },
-      body: "URL pathname can't start with //\n",
-    };
+    return redirect(`/${request.uri.replace(/^\/+/g, "")}`);
   }
 
   const { url, status } = resolveFundamental(request.uri);
diff --git a/deployer/aws-lambda/content-origin-request/server.test.js b/deployer/aws-lambda/content-origin-request/server.test.js
index 15d2bb580803..a350cf57e481 100644
--- a/deployer/aws-lambda/content-origin-request/server.test.js
+++ b/deployer/aws-lambda/content-origin-request/server.test.js
@@ -188,11 +188,15 @@ describe("always check for fundamental redirects first", () => {
   });
 });
 
-describe("avoid double-slash redirects", () => {
-  it("should 404 on any pathname that starts with //", async () => {
+describe("redirect double-slash prefix URIs", () => {
+  it("should 302 redirect anything that starts with //", async () => {
     const r = await get(`//en-US/search/`);
-    expect(r.statusCode).toBe(404);
-    expect(r.headers["location"]).toBeFalsy();
-    expect(r.body).toContain("URL pathname can't start with //");
+    expect(r.statusCode).toBe(302);
+    expect(r.headers["location"]).toBe("/en-US/search/");
+  });
+  it("should 302 redirect anything that starts with // on anything", async () => {
+    const r = await get(`//blablabla`);
+    expect(r.statusCode).toBe(302);
+    expect(r.headers["location"]).toBe("/blablabla");
   });
 });

From 7befe0e53f4dfd42d8057d948d303f2814604767 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Mon, 22 Mar 2021 19:29:50 -0400
Subject: [PATCH 052/288] fix: Don't double brace some CSS refs (#3281)

* fix: Don't double brace some CSS refs

* Update kumascript/macros/cssxref.ejs

* fix: Use endsWith for function check

Co-authored-by: Ryan Johnson <escattone@gmail.com>

* fix cssxref.test.js

Co-authored-by: Ryan Johnson <escattone@gmail.com>
Co-authored-by: rjohnson <rjohnson@mozilla.com>
---
 kumascript/macros/cssxref.ejs           | 2 +-
 kumascript/tests/macros/cssxref.test.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kumascript/macros/cssxref.ejs b/kumascript/macros/cssxref.ejs
index 19a30db78a34..c77d1b8aed67 100644
--- a/kumascript/macros/cssxref.ejs
+++ b/kumascript/macros/cssxref.ejs
@@ -60,7 +60,7 @@ const thisPage = (!$1 || !$2) ? wiki.getPage(urlWithoutAnchor) : null;
 
 if (!$1) {
     // Append parameter brackets to CSS functions
-    if (page.hasTag(thisPage, "CSS Function")) {
+    if (page.hasTag(thisPage, "CSS Function") && !str.endsWith("()")) {
         str += "()";
     }
     // Enclose CSS data types in arrow brackets
diff --git a/kumascript/tests/macros/cssxref.test.js b/kumascript/tests/macros/cssxref.test.js
index 8dcadcb8e985..a4fdaa4d2d4d 100644
--- a/kumascript/tests/macros/cssxref.test.js
+++ b/kumascript/tests/macros/cssxref.test.js
@@ -37,9 +37,9 @@ const MOCK_PAGES = {
     },
   },
   attr: {
-    url: [CSS_BASE_URL, "attr"].join("/"),
+    url: [CSS_BASE_URL, "attr()"].join("/"),
     data: {
-      url: [CSS_BASE_URL, "attr"].join("/"),
+      url: [CSS_BASE_URL, "attr()"].join("/"),
       summary:
         'The <strong><code>attr()</code></strong> <a href="/en-US/docs/Web/CSS">CSS</a> function is used to retrieve the value of an attribute of the selected element and use it in the style sheet.',
       tags: ["CSS", "Reference", "Web", "CSS Function", "Layout"],
@@ -107,7 +107,7 @@ const TEST_CASE = [
   },
   {
     title: "One argument (CSS function)",
-    input: ["attr"],
+    input: ["attr()"],
     output: makeExpect(
       MOCK_PAGES.attr.url,
       MOCK_PAGES.attr.data.summary,

From e1fec4e73afc44618da4938cba8507b0934a11ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Mar 2021 06:04:57 +0000
Subject: [PATCH 053/288] build(deps-dev): bump react-is from 17.0.1 to 17.0.2
 (#3307)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1d08f7c2c3f5..74bf9de44652 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "puppeteer": "2",
     "react": "17.0.1",
     "react-dom": "17.0.1",
-    "react-is": "^17.0.1",
+    "react-is": "^17.0.2",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
     "react-scripts": "4.0.3",
diff --git a/yarn.lock b/yarn.lock
index faf5813253c8..bbb285648f73 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14813,10 +14813,10 @@ react-is@^16.7.0, react-is@^16.8.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
-  integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
+react-is@^17.0.1, react-is@^17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-lifecycles-compat@^3.0.4:
   version "3.0.4"

From 2e12e84a138c5d4bf2516ee5ece5788f4aed6a80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Mar 2021 06:07:30 +0000
Subject: [PATCH 054/288] build(deps-dev): bump @types/react-dom from 17.0.2 to
 17.0.3 (#3309)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 74bf9de44652..17d8ef320a40 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "@testing-library/react": "^11.2.5",
     "@types/jest": "^26.0.21",
     "@types/react": "^17.0.3",
-    "@types/react-dom": "^17.0.2",
+    "@types/react-dom": "^17.0.3",
     "braces": "^3.0.2",
     "cross-env": "^7.0.3",
     "diff": "^5.0.0",
diff --git a/yarn.lock b/yarn.lock
index bbb285648f73..a7ff0084d51c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3152,10 +3152,10 @@
     "@types/react" "*"
     "@types/reactcss" "*"
 
-"@types/react-dom@^17.0.2":
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.2.tgz#35654cf6c49ae162d5bc90843d5437dc38008d43"
-  integrity sha512-Icd9KEgdnFfJs39KyRyr0jQ7EKhq8U6CcHRMGAS45fp5qgUvxL3ujUCfWFttUK2UErqZNj97t9gsVPNAqcwoCg==
+"@types/react-dom@^17.0.3":
+  version "17.0.3"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.3.tgz#7fdf37b8af9d6d40127137865bb3fff8871d7ee1"
+  integrity sha512-4NnJbCeWE+8YBzupn/YrJxZ8VnjcJq5iR1laqQ1vkpQgBiA7bwk0Rp24fxsdNinzJY2U+HHS4dJJDPdoMjdJ7w==
   dependencies:
     "@types/react" "*"
 

From 50272952b67cfcb9e2caf3d2fcc58df53d94df2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Mar 2021 07:05:35 +0000
Subject: [PATCH 055/288] build(deps): bump boto3 from 1.17.33 to 1.17.34 in
 /deployer (#3310)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 4f01ef85dbef..27e42f4c85b3 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.33"
+version = "1.17.34"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.33,<1.21.0"
+botocore = ">=1.20.34,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.33"
+version = "1.20.34"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -533,7 +533,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "6ec3c53b11db10e780442e1608e422d4b7559576e9c469b75675dca567817257"
+content-hash = "cfd5df43411d7eb1b3f68bd6070e0b764a88692b014c95b83bc84db4b5f2ab0b"
 
 [metadata.files]
 appdirs = [
@@ -552,12 +552,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.33-py2.py3-none-any.whl", hash = "sha256:3306dad87f993703b102a0a70ca19c549b7f41e7f70fa7b4c579735c9f79351d"},
-    {file = "boto3-1.17.33.tar.gz", hash = "sha256:0cac2fffc1ba915f7bb5ecee539318532db51f218c928a228fafe3e501e9472e"},
+    {file = "boto3-1.17.34-py2.py3-none-any.whl", hash = "sha256:1ddd597e3d8b7553432f84b32b9519cc90aad91c4dc3873725375163c9f98353"},
+    {file = "boto3-1.17.34.tar.gz", hash = "sha256:8f33cb3d2fc42b0547a5560a6d7397aa93336f50899386762b2450682c0e992b"},
 ]
 botocore = [
-    {file = "botocore-1.20.33-py2.py3-none-any.whl", hash = "sha256:a33e862685259fe22d9790d9c9f3567feda8b824d44d3c62a3617af1133543a4"},
-    {file = "botocore-1.20.33.tar.gz", hash = "sha256:e355305309699d3aca1e0050fc21d48595b40db046cb0d2491cd57ff5b26920b"},
+    {file = "botocore-1.20.34-py2.py3-none-any.whl", hash = "sha256:c4fe4fea1d6a3934dd8c670ee83b128f935a64078786fe8afb8a662446304926"},
+    {file = "botocore-1.20.34.tar.gz", hash = "sha256:749bdb151e340329f1b25600bfe9d223e930f8ba26bd74b71478ca5781f2feaf"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index c5ebc653442e..76688a661a20 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.33"
+boto3 = "^1.17.34"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 101625610444b5eb117178925390cc4029509cc1 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 23 Mar 2021 06:51:42 -0400
Subject: [PATCH 056/288] Deal with "No BCD data" more gracefully? (#3248)

* Deal with "No BCD data" more gracefully?

Fixes #3168

* feedbacked
---
 build/bcd-urls.js                      | 11 ++++++++
 build/document-extractor.js            | 14 +++++++++-
 client/src/document/lazy-bcd-table.tsx | 38 ++++++++++++--------------
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/build/bcd-urls.js b/build/bcd-urls.js
index 4a688f95cfa2..f8180a5c2f9d 100644
--- a/build/bcd-urls.js
+++ b/build/bcd-urls.js
@@ -56,6 +56,11 @@ function normalizeBCDURLs(doc, options) {
 
   for (const section of doc.body) {
     if (section.type !== "browser_compatibility") continue;
+
+    // This happens if a query is "broken".
+    // E.g. <div class="bc-data" id="bcd:apii.TypoCatching">
+    if (!section.value.data) continue;
+
     for (const [key, data] of Object.entries(section.value.data)) {
       // First block from the BCD data does not have its name as the root key
       // so mdn_url is accessible at the root. If the block has a key for
@@ -119,6 +124,12 @@ function extractBCDData(doc) {
   for (const section of doc.body) {
     if (section.type === "browser_compatibility") {
       // Most pages only have exactly 1 so no need to put the prefix on them.
+
+      if (!section.value.data) {
+        // This happens if a query is "broken".
+        // E.g. <div class="bc-data" id="bcd:apii.TypoCatching">
+        continue;
+      }
       const fileName = ++nextId > 1 ? `bcd-${nextId}.json` : "bcd.json";
       const dataURL = `${doc.mdn_url}/${fileName}`;
       data.push({
diff --git a/build/document-extractor.js b/build/document-extractor.js
index 4a8df450f5b5..ec94e6b07bc6 100644
--- a/build/document-extractor.js
+++ b/build/document-extractor.js
@@ -264,7 +264,19 @@ function _addSingleSectionBCD($) {
   const query = dataQuery.replace(/^bcd:/, "");
   const { browsers, data } = packageBCD(query);
   if (data === undefined) {
-    return [];
+    return [
+      {
+        type: "browser_compatibility",
+        value: {
+          title,
+          id,
+          isH3,
+          data: null,
+          query,
+          browsers: null,
+        },
+      },
+    ];
   }
 
   // First extract a map of all release data, keyed by (normalized) browser
diff --git a/client/src/document/lazy-bcd-table.tsx b/client/src/document/lazy-bcd-table.tsx
index 43bbec8d726e..263a9fb1cc8f 100644
--- a/client/src/document/lazy-bcd-table.tsx
+++ b/client/src/document/lazy-bcd-table.tsx
@@ -30,24 +30,32 @@ export function LazyBrowserCompatibilityTable({
   title: string;
   isH3: boolean;
   query: string;
-  dataURL: string;
+  dataURL: string | null;
 }) {
   return (
     <>
       {title && !isH3 && <DisplayH2 id={id} title={title} />}
       {title && isH3 && <DisplayH3 id={id} title={title} />}
-      <LazyBrowserCompatibilityTableInner dataURL={dataURL} query={query} />
+      {dataURL ? (
+        <LazyBrowserCompatibilityTableInner dataURL={dataURL} />
+      ) : (
+        <div className="notecard warning">
+          <p>
+            No compatibility data found for <code>{query}</code>.<br />
+            <a href="#on-github">Check for problems with this page</a> or
+            contribute missing data to{" "}
+            <a href="https://github.com/mdn/browser-compat-data">
+              mdn/browser-compat-data
+            </a>
+            .
+          </p>
+        </div>
+      )}
     </>
   );
 }
 
-function LazyBrowserCompatibilityTableInner({
-  dataURL,
-  query,
-}: {
-  dataURL: string;
-  query: string;
-}) {
+function LazyBrowserCompatibilityTableInner({ dataURL }: { dataURL: string }) {
   const locale = useLocale();
   const [bcdDataURL, setBCDDataURL] = useState("");
 
@@ -76,18 +84,6 @@ function LazyBrowserCompatibilityTableInner({
   if (error) {
     return <p>Error loading BCD data</p>;
   }
-  if (!data.data) {
-    return (
-      <p>
-        No compatibility data found for <code>{query}</code>. Check the spelling
-        or contribute data to{" "}
-        <a href="https://github.com/mdn/browser-compat-data">
-          mdn/browser-compat-data
-        </a>
-        .
-      </p>
-    );
-  }
 
   return (
     <Suspense fallback={<Loading />}>

From 2e4323b6276452ea70c220911b0e7aecfd75c5e7 Mon Sep 17 00:00:00 2001
From: Schalk Neethling <sneethling@mozilla.com>
Date: Tue, 23 Mar 2021 14:57:45 +0200
Subject: [PATCH 057/288] fix: sign-in and sing-up page ui (#3264)

Co-authored-by: Peter Bengtsson <mail@peterbe.com>
---
 client/src/auth/index.scss                 |  30 +++
 client/src/auth/index.tsx                  |  21 +--
 client/src/auth/sign-in.scss               |  17 ++
 client/src/auth/sign-in.tsx                |  71 ++++---
 client/src/auth/sign-up.scss               |  55 +++++-
 client/src/auth/sign-up.tsx                | 207 ++++++++++-----------
 client/src/ui/atoms/avatar/avatar.scss     |  18 ++
 client/src/ui/atoms/page-content/index.tsx |   6 +-
 testing/tests/headless.test.js             |  30 ++-
 testing/tests/index.test.js                |   4 +-
 10 files changed, 292 insertions(+), 167 deletions(-)
 create mode 100644 client/src/auth/index.scss
 create mode 100644 client/src/auth/sign-in.scss
 create mode 100644 client/src/ui/atoms/avatar/avatar.scss

diff --git a/client/src/auth/index.scss b/client/src/auth/index.scss
new file mode 100644
index 000000000000..66f35dfc2d17
--- /dev/null
+++ b/client/src/auth/index.scss
@@ -0,0 +1,30 @@
+@import "~@mdn/minimalist/sass/vars/layout";
+
+.page-content-container.auth-page-container {
+  align-items: center;
+  display: flex;
+  flex-flow: column;
+  justify-content: center;
+
+  @media #{$mq-tablet-and-up} {
+    margin: ($base-spacing * 2);
+  }
+
+  @media #{$mq-large-desktop-and-up} {
+    margin: ($base-spacing * 3) auto;
+  }
+
+  h1 {
+    margin: $base-spacing 0;
+  }
+
+  .lead {
+    max-width: 35rem;
+    max-width: 60ch;
+    text-align: center;
+  }
+
+  .notecard {
+    width: 35%;
+  }
+}
diff --git a/client/src/auth/index.tsx b/client/src/auth/index.tsx
index 99e08f30bce7..9bd731b65f0e 100644
--- a/client/src/auth/index.tsx
+++ b/client/src/auth/index.tsx
@@ -6,37 +6,34 @@ const SignInApp = React.lazy(() => import("./sign-in"));
 const SignUpApp = React.lazy(() => import("./sign-up"));
 
 function Container({
-  pageTitle,
   children,
   className,
 }: {
-  pageTitle: string;
   children: React.ReactNode;
   className: string;
 }) {
   const isServer = typeof window === "undefined";
+  const pageTitle = "Sign in to MDN Web Docs";
   React.useEffect(() => {
     document.title = pageTitle;
-  }, [pageTitle]);
+  }, []);
   return (
-    <div className={className}>
-      <PageContentContainer>
-        {/* The reason for displaying this <h1> here (and for SignUp too)
+    <PageContentContainer extraClasses={`auth-page-container ${className}`}>
+      {/* The reason for displaying this <h1> here (and for SignUp too)
           is to avoid an unnecessary "flicker".
           component here is loaded SSR and is immediately present.
           Only the "guts" below is lazy loaded. By having the header already
           present the page feels less flickery at a very affordable cost of
           allowing this to be part of the main JS bundle.
        */}
-        <h1>{pageTitle}</h1>
-        {!isServer && children}
-      </PageContentContainer>
-    </div>
+      <h1 className="slab-highlight">{pageTitle}</h1>
+      {!isServer && children}
+    </PageContentContainer>
   );
 }
 export function SignIn() {
   return (
-    <Container className="sign-in" pageTitle="Sign in">
+    <Container className="sign-in">
       <React.Suspense fallback={<p>Loading...</p>}>
         <SignInApp />
       </React.Suspense>
@@ -45,7 +42,7 @@ export function SignIn() {
 }
 export function SignUp() {
   return (
-    <Container className="sign-up" pageTitle="Sign up">
+    <Container className="sign-up">
       <React.Suspense fallback={<p>Loading...</p>}>
         <SignUpApp />
       </React.Suspense>
diff --git a/client/src/auth/sign-in.scss b/client/src/auth/sign-in.scss
new file mode 100644
index 000000000000..5551f7706980
--- /dev/null
+++ b/client/src/auth/sign-in.scss
@@ -0,0 +1,17 @@
+@import "~@mdn/minimalist/sass/vars/layout";
+
+.sign-in {
+  .auth-buttons {
+    margin: 0 auto;
+    max-width: 250px;
+    width: 100%;
+
+    li {
+      margin-bottom: $base-spacing;
+    }
+  }
+
+  .sign-out-form {
+    text-align: center;
+  }
+}
diff --git a/client/src/auth/sign-in.tsx b/client/src/auth/sign-in.tsx
index 148789756472..803145c1c240 100644
--- a/client/src/auth/sign-in.tsx
+++ b/client/src/auth/sign-in.tsx
@@ -3,6 +3,12 @@ import { useSearchParams } from "react-router-dom";
 import { useUserData } from "../user-context";
 import { useLocale } from "../hooks";
 
+import { ReactComponent as GithubLogo } from "@mdn/dinocons/brands/github-mark-small.svg";
+import { ReactComponent as GoogleLogo } from "@mdn/dinocons/brands/google-mono.svg";
+
+import "./index.scss";
+import "./sign-in.scss";
+
 export default function SignInApp() {
   const [searchParams] = useSearchParams();
   const locale = useLocale();
@@ -41,7 +47,7 @@ export default function SignInApp() {
   sp.set("yarisignup", "1");
 
   return (
-    <div>
+    <>
       {/* We need to wait for the userData (/api/v1/whoami) because it will
           determine what we display.
           We *could* render on the optimism that people most likely will be
@@ -50,42 +56,53 @@ export default function SignInApp() {
           completely different without it being due to a user action.
       */}
       {userData ? (
-        <>
-          {userData.isAuthenticated ? (
-            <form method="post" action={`${prefix}/${locale}/users/signout`}>
-              <p>
-                You're <b>already signed in</b>.
-              </p>
-
-              {/* XXX Here it would be great to link to the account settings page */}
-
-              <input type="hidden" name="next" value={next} />
-              <button type="submit" className="button">
-                Sign out
-              </button>
-              <p>
-                Or, <a href="/">return to the home page</a>.
-              </p>
-            </form>
-          ) : (
-            <ul>
+        userData.isAuthenticated ? (
+          <form
+            className="sign-out-form"
+            method="post"
+            action={`${prefix}/${locale}/users/signout`}
+          >
+            <h2>You’re already signed in.</h2>
+            {/* XXX Here it would be great to link to the account settings page */}
+            <input type="hidden" name="next" value={next} />
+            <button type="submit" className="ghost">
+              Sign out
+            </button>
+            or, <a href="/">return to the home page</a>.
+          </form>
+        ) : (
+          <>
+            <p className="lead">
+              Sign in to your MDN Web Docs account. If you haven’t already
+              created an account, you will be prompted to do so after signing
+              in.
+            </p>
+            <ul className="auth-buttons">
               <li>
-                <a href={`${prefix}/users/github/login/?${sp.toString()}`}>
-                  GitHub&trade;
+                <a
+                  href={`${prefix}/users/github/login/?${sp.toString()}`}
+                  className="button icon-button outline"
+                >
+                  <GithubLogo />
+                  Sign in with GitHub&trade;
                 </a>
               </li>
               <li>
-                <a href={`${prefix}/users/google/login/?${sp.toString()}`}>
-                  Google&trade;
+                <a
+                  href={`${prefix}/users/google/login/?${sp.toString()}`}
+                  className="button icon-button outline"
+                >
+                  <GoogleLogo />
+                  Sign in with Google&trade;
                 </a>
               </li>
             </ul>
-          )}
-        </>
+          </>
+        )
       ) : (
         <Loading />
       )}
-    </div>
+    </>
   );
 }
 
diff --git a/client/src/auth/sign-up.scss b/client/src/auth/sign-up.scss
index 3c6a4daffa88..5d2dac3e60fb 100644
--- a/client/src/auth/sign-up.scss
+++ b/client/src/auth/sign-up.scss
@@ -1,11 +1,52 @@
+@import "../ui/atoms/avatar/avatar";
+
 .sign-up {
-  form {
-    button[disabled] {
-      opacity: 0.5;
+  text-align: center;
+
+  .provider-name {
+    font-weight: bold;
+  }
+
+  a:link,
+  a:visited {
+    text-decoration: underline;
+  }
+
+  a:hover,
+  a:focus {
+    text-decoration: none;
+  }
+
+  .complete-sign-in {
+    align-items: center;
+    display: flex;
+    flex-flow: column;
+    margin-bottom: $base-spacing;
+    max-width: 250px;
+
+    .button {
+      margin-top: $base-spacing / 2;
+    }
+  }
+
+  .back {
+    &::before {
+      background: transparent url("~@mdn/dinocons/arrows/arrow.svg") 0 0/14px
+        no-repeat;
+      content: "";
+      display: inline-block;
+      height: 14px;
+      margin-right: $base-spacing / 4;
+      transform: rotate(-90deg);
+      vertical-align: middle;
+      width: 14px;
+    }
+
+    &:hover,
+    &:focus {
+      &::before {
+        margin-right: $base-spacing / 3;
+      }
     }
   }
-  //   .user-details img.picture {
-  //     width: 100px;
-  //     border-radius: 50px;
-  //   }
 }
diff --git a/client/src/auth/sign-up.tsx b/client/src/auth/sign-up.tsx
index 043458eca1a5..6980add7181e 100644
--- a/client/src/auth/sign-up.tsx
+++ b/client/src/auth/sign-up.tsx
@@ -5,8 +5,14 @@ import { mutate } from "swr";
 import { useLocale } from "../hooks";
 import { useUserData } from "../user-context";
 
+import "./index.scss";
 import "./sign-up.scss";
 
+interface UserDetails {
+  name?: string;
+  avatar_url?: string;
+}
+
 export default function SignUpApp() {
   const userData = useUserData();
   const navigate = useNavigate();
@@ -25,25 +31,10 @@ export default function SignUpApp() {
       <div>
         <h2>You're already signed up</h2>
         {/* XXX Include a link to the settings page */}
-        <Link to={`/${locale}/`}>Return to the home page</Link>.
-      </div>
-    );
-  }
-
-  if (searchParams.get("errors")) {
-    console.warn("Errors", searchParams.get("errors"));
-    const errors = JSON.parse(searchParams.get("errors") || "{}");
-    return (
-      <div>
-        <h2>Sign-up errors</h2>
-        <p>An error occurred trying to sign you up.</p>
-        <pre>{JSON.stringify(errors, null, 2)}</pre>
-        <p>
-          <Link to={`/${locale}/signin`}>
-            Try starting over the sign-in process
-          </Link>
-          .
-        </p>
+        <Link to={`/${locale}/`} className="back">
+          Return to the home page
+        </Link>
+        .
       </div>
     );
   }
@@ -52,13 +43,11 @@ export default function SignUpApp() {
   const provider = searchParams.get("provider");
   if (!csrfMiddlewareToken || !provider) {
     return (
-      <div>
-        <h2>Invalid Sign up URL</h2>
-        <p>You arrived here on this page without the necessary details.</p>
+      <div className="notecard negative">
+        <h2>Invalid URL</h2>
+        <p>You arrived here without the necessary details.</p>
         <p>
-          <Link to={`/${locale}/signin`}>
-            Try starting over the sign-in process
-          </Link>
+          <Link to={`/${locale}/signin`}>Please retry the sign-in process</Link>
           .
         </p>
       </div>
@@ -117,106 +106,106 @@ export default function SignUpApp() {
     }
   }
 
+  let userDetails: UserDetails = {};
+  try {
+    userDetails = JSON.parse(searchParams.get("user_details") || "{}");
+  } catch (jsonParseError) {
+    console.warn("The 'user_details' was not valid JSON");
+  }
+
   return (
-    <form
-      method="post"
-      onSubmit={(event) => {
-        event.preventDefault();
-        if (checkedTerms) {
-          submitSignUp();
-        }
-      }}
-    >
+    <>
+      {userDetails.avatar_url && (
+        <img
+          src={userDetails.avatar_url}
+          className="avatar"
+          alt="User profile avatar_url"
+        />
+      )}
+
+      {provider && (
+        <DisplaySignupDetails
+          provider={provider}
+          username={userDetails.name || ""}
+        />
+      )}
+
       {signupError && (
-        <div className="notecard error">
-          <h4>Signup Error</h4>
+        <div className="notecard negative">
           <p>
-            <code>{signupError.toString()}</code>
+            <strong>Signup error</strong> <code>{signupError.toString()}</code>
           </p>
         </div>
       )}
 
-      <DisplaySignupProvider provider={provider || ""} />
-      <DisplayUserDetails details={searchParams.get("user_details") || ""} />
-
-      <label htmlFor="id_terms">
-        <input
-          id="id_terms"
-          type="checkbox"
-          name="terms"
-          checked={checkedTerms}
-          onChange={(event) => {
-            setCheckedTerms(event.target.checked);
-          }}
-        />{" "}
-        I agree to Mozilla's{" "}
-        <a
-          href="https://www.mozilla.org/about/legal/terms/mozilla"
-          target="_blank"
-          rel="noreferrer noopener"
-        >
-          Terms
-        </a>{" "}
-        and{" "}
-        <a
-          href="https://www.mozilla.org/privacy/websites/"
-          target="_blank"
-          rel="noreferrer noopener"
-        >
-          Privacy Notice
-        </a>
-        .
-      </label>
+      <form
+        className="complete-sign-in"
+        method="post"
+        onSubmit={(event) => {
+          event.preventDefault();
+          if (checkedTerms) {
+            submitSignUp();
+          }
+        }}
+      >
+        <label htmlFor="id_terms">
+          <input
+            id="id_terms"
+            type="checkbox"
+            name="terms"
+            required
+            checked={checkedTerms}
+            onChange={(event) => {
+              setCheckedTerms(event.target.checked);
+            }}
+          />{" "}
+          I agree to Mozilla's{" "}
+          <a
+            href="https://www.mozilla.org/about/legal/terms/mozilla"
+            target="_blank"
+            rel="noreferrer noopener"
+          >
+            Terms
+          </a>{" "}
+          and{" "}
+          <a
+            href="https://www.mozilla.org/privacy/websites/"
+            target="_blank"
+            rel="noreferrer noopener"
+          >
+            Privacy Notice
+          </a>
+          .
+        </label>
 
-      <button type="submit" className="button" disabled={!checkedTerms}>
-        Create account
-      </button>
-    </form>
+        <button
+          type="submit"
+          className={!checkedTerms ? "button inactive" : "button"}
+          disabled={!checkedTerms}
+        >
+          Complete sign-in
+        </button>
+      </form>
+    </>
   );
 }
 
-function DisplaySignupProvider({ provider }: { provider: string }) {
-  if (!provider) {
-    // Exit early because there's nothing useful we can say
-    return null;
-  }
+function DisplaySignupDetails({
+  provider,
+  username,
+}: {
+  provider: string;
+  username: string;
+}) {
   let providerVerbose = provider.charAt(0).toUpperCase() + provider.slice(1);
   if (provider === "github") {
     providerVerbose = "GitHub";
   }
   return (
-    <p>
-      You are signing in to MDN Web Docs with <b>{providerVerbose}</b>.
+    <p className="lead">
+      You are signing in to MDN Web Docs with{" "}
+      <span className="provider-name">{providerVerbose}</span>
+      {username && ` as ${username}`}.
     </p>
   );
 }
-
-interface UserDetails {
-  name?: string;
-  avatar_url?: string;
-}
-
-function DisplayUserDetails({ details }: { details: string }) {
-  if (!details) {
-    // Exit early because there's nothing useful we can say
-    return null;
-  }
-
-  const userDetails: UserDetails = JSON.parse(details);
-
-  return (
-    <div className="user-details">
-      <p>
-        {userDetails.avatar_url && (
-          <img
-            src={userDetails.avatar_url}
-            className="avatar"
-            alt="User profile avatar_url"
-          />
-        )}
-
-        {userDetails.name && ` as ${userDetails.name}`}
-      </p>
-    </div>
-  );
-}
diff --git a/client/src/ui/atoms/avatar/avatar.scss b/client/src/ui/atoms/avatar/avatar.scss
new file mode 100644
index 000000000000..ab9a1c1e2160
--- /dev/null
+++ b/client/src/ui/atoms/avatar/avatar.scss
@@ -0,0 +1,18 @@
+@import "~@mdn/minimalist/sass/vars/layout";
+
+.avatar {
+  margin: 0 auto;
+}
+
+.auth-page-container {
+  .avatar {
+    height: 60px;
+    margin-bottom: $base-spacing;
+    width: 60px;
+
+    @media #{$mq-tablet-and-up} {
+      height: 80px;
+      width: 80px;
+    }
+  }
+}
diff --git a/client/src/ui/atoms/page-content/index.tsx b/client/src/ui/atoms/page-content/index.tsx
index 2a2e9a88d09b..ec5e4b83c0ab 100644
--- a/client/src/ui/atoms/page-content/index.tsx
+++ b/client/src/ui/atoms/page-content/index.tsx
@@ -24,11 +24,15 @@ export function MainContentContainer({
 // What we use on almost all pages
 export function PageContentContainer({
   children,
+  extraClasses,
 }: {
   children: React.ReactNode;
+  extraClasses?: string;
 }) {
   return (
-    <MainContentContainer className="page-content-container">
+    <MainContentContainer
+      className={`page-content-container ${extraClasses ? extraClasses : ""}`}
+    >
       {children}
     </MainContentContainer>
   );
diff --git a/testing/tests/headless.test.js b/testing/tests/headless.test.js
index 85ff6886260e..cad7a472468c 100644
--- a/testing/tests/headless.test.js
+++ b/testing/tests/headless.test.js
@@ -268,26 +268,38 @@ describe("Basic viewing of functional pages", () => {
 
   it("going to 'Sign up' page without query string", async () => {
     await page.goto(testURL("/en-US/signup"));
-    await expect(page).toMatchElement("h1", { text: "Sign up" });
-    await expect(page).toMatch("Invalid Sign up URL");
+    await expect(page).toMatchElement("h1", {
+      text: "Sign in to MDN Web Docs",
+    });
+    await expect(page).toMatch("Invalid URL");
     await expect(page).toMatchElement("a", {
-      text: "Try starting over the sign-in process",
+      text: "Please retry the sign-in process",
     });
   });
 
   it("going to 'Sign up' page with realistic (fake) query string", async () => {
-    await page.goto(
-      testURL("/en-US/signup?csrfmiddlewaretoken=abc&provider=github")
+    const sp = new URLSearchParams();
+    sp.set("csrfmiddlewaretoken", "abc");
+    sp.set("provider", "github");
+    sp.set(
+      "user_details",
+      JSON.stringify({
+        name: "Peter B",
+      })
     );
-    await expect(page).toMatchElement("h1", { text: "Sign up" });
-    await expect(page).not.toMatch("Invalid Sign up URL");
+
+    await page.goto(testURL(`/en-US/signup?${sp.toString()}`));
+    await expect(page).toMatchElement("h1", {
+      text: "Sign in to MDN Web Docs",
+    });
+    await expect(page).not.toMatch("Invalid URL");
     await expect(page).toMatch(
-      "You are signing in to MDN Web Docs with GitHub."
+      "You are signing in to MDN Web Docs with GitHub as Peter B."
     );
     await expect(page).toMatch(
       "I agree to Mozilla's Terms and Privacy Notice."
     );
-    await expect(page).toMatchElement("button", { text: "Create account" });
+    await expect(page).toMatchElement("button", { text: "Complete sign-in" });
   });
 
   it("should say you're not signed in on the settings page", async () => {
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 877b75cc1a7c..03e41dffdb41 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -957,7 +957,7 @@ test("sign in page", () => {
   const htmlFile = path.join(builtFolder, "index.html");
   const html = fs.readFileSync(htmlFile, "utf-8");
   const $ = cheerio.load(html);
-  expect($("h1").text()).toContain("Sign in");
+  expect($("h1").text()).toContain("Sign in to MDN Web Docs");
   expect($("title").text()).toContain("Sign in");
 });
 
@@ -967,7 +967,7 @@ test("sign up page", () => {
   const htmlFile = path.join(builtFolder, "index.html");
   const html = fs.readFileSync(htmlFile, "utf-8");
   const $ = cheerio.load(html);
-  expect($("h1").text()).toContain("Sign up");
+  expect($("h1").text()).toContain("Sign in to MDN Web Docs");
   expect($("title").text()).toContain("Sign up");
 });
 

From 95bd5213b7a7eab4b0b8c78ba1631f5d0976ce0a Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 23 Mar 2021 09:50:17 -0400
Subject: [PATCH 058/288] .page-not-create can appear outside article and
 .main-content (#3273)

Fixes #3031
---
 client/src/document/index.scss | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/src/document/index.scss b/client/src/document/index.scss
index 8ebc651a793a..ef6188a51d42 100644
--- a/client/src/document/index.scss
+++ b/client/src/document/index.scss
@@ -36,6 +36,14 @@
   }
 }
 
+/* page-not-created is the preferred class name, `new` is
+   here for backwards compatibility */
+a.page-not-created,
+a.new {
+  color: $red-300;
+  cursor: not-allowed;
+}
+
 .main-page-content {
   padding: ($base-spacing / 2) $base-spacing $base-spacing;
 
@@ -136,14 +144,6 @@
     margin-bottom: $base-spacing * 2;
   }
 
-  /* page-not-created is the preferred class name, `new` is
-     here for backwards compatibility */
-  .page-not-created,
-  .new {
-    color: $red-300;
-    cursor: not-allowed;
-  }
-
   /* readonly inline badges needs a slightly darker background color in general article content  */
   .inline {
     &.optional,

From ff7dfb0772cf2af5d6a34d2fb3545f7a4c8ecd09 Mon Sep 17 00:00:00 2001
From: Schalk Neethling <sneethling@mozilla.com>
Date: Tue, 23 Mar 2021 16:33:26 +0200
Subject: [PATCH 059/288] Style account settings app (#3298)

* fix: sign-in and sing-up page ui

Add styling for the sign-in and sign-up pages

Fix #2449

* remove extra period

* fix failing tests

* remove populate-search-index-benchmark

* feedback on sign-up styling PR

* changes based on review feedback

* fix: account settings ui

Styling for the account settings page

Fix #2505

* small ui and test updates

* small text update

* update color for top border

* fix tests in pull/3298

Co-authored-by: Peter Bengtsson <mail@peterbe.com>
---
 client/src/settings/app.tsx    | 120 ++++++++++++++++-----------------
 client/src/settings/index.scss |  91 +++++++++++++++++++++++++
 client/src/settings/index.tsx  |   4 +-
 testing/tests/headless.test.js |  12 ++--
 4 files changed, 160 insertions(+), 67 deletions(-)
 create mode 100644 client/src/settings/index.scss

diff --git a/client/src/settings/app.tsx b/client/src/settings/app.tsx
index ed7039daf831..6ed10898f517 100644
--- a/client/src/settings/app.tsx
+++ b/client/src/settings/app.tsx
@@ -6,6 +6,8 @@ import { DISABLE_AUTH } from "../constants";
 import { useUserData } from "../user-context";
 import { useLocale } from "../hooks";
 
+import "./index.scss";
+
 interface UserSettings {
   csrfmiddlewaretoken: string;
   locale: string;
@@ -75,7 +77,7 @@ export default function SettingsApp({ ...appProps }) {
 
   if (error) {
     return (
-      <div className="notecard error">
+      <div className="notecard negative">
         <h3>Server error</h3>
         <p>A server error occurred trying to get your user settings.</p>
         <p>
@@ -92,7 +94,7 @@ export default function SettingsApp({ ...appProps }) {
 
   if (settingsError) {
     return (
-      <div className="notecard error">
+      <div className="notecard negative">
         <h3>Server error</h3>
         <p>Unable to get the current user settings from the server.</p>
         <p>
@@ -104,7 +106,7 @@ export default function SettingsApp({ ...appProps }) {
   }
 
   return (
-    <div>
+    <div className="account-settings-panels-container">
       {settingsData &&
         settingsData.possibleLocales &&
         settingsData.possibleLocales.length && (
@@ -143,10 +145,12 @@ function NotSignedIn() {
   sp.set("next", window.location.pathname);
 
   return (
-    <div>
-      <h2>You are not signed in</h2>
-      <Link to={`/${locale}/signin?${sp.toString()}`}>Sign in first</Link>
-    </div>
+    <>
+      <h2>You have not signed in</h2>
+      <Link to={`/${locale}/signin?${sp.toString()}`}>
+        Please sign in to continue
+      </Link>
+    </>
   );
 }
 
@@ -215,6 +219,7 @@ function Settings({
 
   return (
     <form
+      className="settings-form"
       onSubmit={async (event) => {
         event.preventDefault();
         await sendSettings();
@@ -224,34 +229,27 @@ function Settings({
         <ShowValidationErrors errors={validationErrors.errors} />
       )}
 
-      {sent && !sendError && (
-        <div className="notecard success">
-          <h4>Settings update sent</h4>
-          <p>Yay! Settings saved.</p>
-          <button
-            type="button"
-            className="button"
-            onClick={() => {
-              setSent(false);
-            }}
-          >
-            Close
-          </button>
-        </div>
-      )}
-      {sendError && (
-        <div className="notecard error">
-          <h4>Server submission error</h4>
-          <p>Something unexpected happened on the server submission.</p>
-          <p>
-            <code>{sendError.toString()}</code>
-          </p>
-          <a href={window.location.pathname}>Reload this page and try again.</a>
-        </div>
-      )}
+      <div className="field-group">
+        <label htmlFor="id_locale" className="slab-highlight">
+          Change language
+        </label>
+
+        {sent && !sendError && (
+          <div className="notecard success">
+            <p>Yay! Updated settings successfully saved.</p>
+          </div>
+        )}
+        {sendError && (
+          <div className="notecard negative">
+            <h4>Server submission error</h4>
+            <p>Something unexpected happened during server submission.</p>
+            <p>
+              <code>{sendError.toString()}</code>
+            </p>
+            <a href={window.location.pathname}>Reload page to try again.</a>
+          </div>
+        )}
 
-      <div>
-        <label htmlFor="id_locale">Language</label>
         <select
           id="id_locale"
           name="locale"
@@ -270,7 +268,7 @@ function Settings({
         </select>
       </div>
       <button type="submit" className="button">
-        Save changes
+        Update language
       </button>
     </form>
   );
@@ -308,47 +306,49 @@ function CloseAccount({ userSettings }: { userSettings: UserSettings }) {
   );
 
   return (
-    <div>
+    <div className="close-account">
       <h3>Close account</h3>
       <p>Delete your account and all account data.</p>
 
       {deleteError && (
-        <div className="notecard error">
+        <div className="notecard negative">
           <h3>Server error</h3>
           <p>A server error occurred trying to close your account.</p>
           <p>
             <code>{deleteError.toString()}</code>
           </p>
-          <a href={window.location.pathname}>Reload this page and try again.</a>
+          <a href={window.location.pathname}>Reload page to try again.</a>
         </div>
       )}
 
       {confirm ? (
-        <p>
-          Are you certain you want to do this?
-          <button
-            type="button"
-            className="button close-account cancel"
-            onClick={() => {
-              setConfirm(false);
-            }}
-          >
-            Cancel
-          </button>{" "}
-          <button
-            type="button"
-            className="button close-account certain"
-            onClick={() => {
-              setCertain(true);
-            }}
-          >
-            Yes
-          </button>
-        </p>
+        <div className="confirm-account-closure">
+          <h4>Please confirm account deletion.</h4>
+          <div className="button-container">
+            <button
+              type="button"
+              className="button outline"
+              onClick={() => {
+                setConfirm(false);
+              }}
+            >
+              Cancel
+            </button>{" "}
+            <button
+              type="button"
+              className="button danger"
+              onClick={() => {
+                setCertain(true);
+              }}
+            >
+              Confirm
+            </button>
+          </div>
+        </div>
       ) : (
         <button
           type="button"
-          className="button close-account"
+          className="button"
           onClick={() => {
             setConfirm(true);
           }}
diff --git a/client/src/settings/index.scss b/client/src/settings/index.scss
new file mode 100644
index 000000000000..af2439d44a13
--- /dev/null
+++ b/client/src/settings/index.scss
@@ -0,0 +1,91 @@
+@import "~@mdn/minimalist/sass/vars/color-palette";
+@import "~@mdn/minimalist/sass/vars/layout";
+@import "~@mdn/minimalist/sass/vars/typography";
+
+.page-content-container.account-settings {
+  display: flex;
+  flex-flow: column;
+  justify-content: center;
+
+  @media #{$mq-large-desktop-and-up} {
+    margin: ($base-spacing) auto;
+  }
+
+  h1 {
+    margin: $base-spacing 0;
+  }
+
+  .field-group {
+    margin: ($base-spacing / 2) 0;
+
+    label {
+      font-size: $large-font-size-mobile;
+      line-height: $heading-line-height;
+      margin-bottom: $base-spacing;
+
+      @media #{$mq-tablet-and-up} {
+        font-size: $large-font-size;
+      }
+    }
+  }
+
+  .notecard {
+    @media #{$mq-small-desktop-and-up} {
+      max-width: 80%;
+    }
+  }
+
+  .confirm-account-closure {
+    .button-container {
+      display: flex;
+      gap: $base-spacing;
+    }
+  }
+}
+
+.account-settings-panels-container {
+  @media #{$mq-tablet-and-up} {
+    display: flex;
+    gap: $base-spacing;
+    justify-content: space-between;
+    margin: $base-spacing 0;
+    max-width: $max-width-small-desktop;
+    width: 100%;
+  }
+}
+
+.settings-form {
+  margin: ($base-spacing / 2) 0 ($base-spacing * 2);
+
+  @media #{$mq-tablet-and-up} {
+    margin: 0;
+  }
+}
+
+.close-account {
+  h3 {
+    margin-top: $base-spacing / 2;
+  }
+
+  h4,
+  p {
+    margin-bottom: $base-spacing / 2;
+  }
+
+  h4 {
+    font-family: $heading-font-family;
+    font-size: $small-medium-font-size-mobile;
+
+    @media #{$mq-tablet-and-up} {
+      font-size: $small-medium-font-size;
+    }
+  }
+}
+
+.settings-form,
+.close-account {
+  border: 1px solid $neutral-500;
+  border-top: 5px solid $primary-100;
+  flex-basis: 45%;
+  padding: $base-spacing;
+}
diff --git a/client/src/settings/index.tsx b/client/src/settings/index.tsx
index 449151d15474..055c9cd1458a 100644
--- a/client/src/settings/index.tsx
+++ b/client/src/settings/index.tsx
@@ -11,7 +11,7 @@ export function Settings() {
   const isServer = typeof window === "undefined";
   return (
     <div className="settings">
-      <PageContentContainer>
+      <PageContentContainer extraClasses="account-settings">
         {/* The reason for displaying this <h1> here
           is to avoid an unnecessary "flicker".
           component here is loaded SSR and is immediately present.
@@ -19,7 +19,7 @@ export function Settings() {
           present the page feels less flickery at a very affordable cost of
           allowing this to be part of the main JS bundle.
        */}
-        <h1>Settings</h1>
+        <h1 className="slab-highlight">Account Settings</h1>
         {!isServer && (
           <React.Suspense fallback={<p>Loading...</p>}>
             <SettingsApp />
diff --git a/testing/tests/headless.test.js b/testing/tests/headless.test.js
index cad7a472468c..f659b8a145c8 100644
--- a/testing/tests/headless.test.js
+++ b/testing/tests/headless.test.js
@@ -304,8 +304,10 @@ describe("Basic viewing of functional pages", () => {
 
   it("should say you're not signed in on the settings page", async () => {
     await page.goto(testURL("/en-US/settings"));
-    await expect(page).toMatchElement("h1", { text: "Settings" });
-    await expect(page).toMatchElement("a", { text: "Sign in first" });
+    await expect(page).toMatchElement("h1", { text: "Account Settings" });
+    await expect(page).toMatchElement("a", {
+      text: "Please sign in to continue",
+    });
   });
 
   it("should show your settings page", async () => {
@@ -319,12 +321,12 @@ describe("Basic viewing of functional pages", () => {
     });
 
     await page.goto(url);
-    await expect(page).toMatchElement("h1", { text: "Settings" });
+    await expect(page).toMatchElement("h1", { text: "Account Settings" });
     await expect(page).toMatchElement("button", { text: "Close account" });
 
     // Change locale to French
     await expect(page).toSelect('select[name="locale"]', "French");
-    await expect(page).toClick("button", { text: "Save changes" });
-    await expect(page).toMatch("Settings update sent");
+    await expect(page).toClick("button", { text: "Update language" });
+    await expect(page).toMatch("Yay! Updated settings successfully saved.");
   });
 });

From 0fcf5178e39791c36cd13087b6ab280feb96c540 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 23 Mar 2021 11:22:29 -0400
Subject: [PATCH 060/288] last modified is when it was merged (#3257)

* last modified is when it was merged

Fixes #3189

* feedbacked

* feedbacked
---
 build/git-history.js | 22 ++++++++++++++--------
 content/document.js  | 17 +++++++++++++++--
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/build/git-history.js b/build/git-history.js
index a21724c53966..3cbd512e0095 100644
--- a/build/git-history.js
+++ b/build/git-history.js
@@ -21,7 +21,7 @@ function getFromGit(contentRoot = CONTENT_ROOT) {
       "log",
       "--name-only",
       "--no-decorate",
-      `--format=${MARKER}%H${DELIMITER}%cI`,
+      `--format=${MARKER}%H${DELIMITER}%cI${DELIMITER}%P`,
       "--date-order",
       "--reverse",
       // "Separate the commits with NULs instead of with new newlines."
@@ -42,17 +42,25 @@ function getFromGit(contentRoot = CONTENT_ROOT) {
   // it seems `git log` prefers to use a newline character.
   // At least as of git version 2.28.0 (Dec 2020). So let's split on both
   // characters to be safe.
+  const parents = new Map();
   for (const line of output.split(/\0|\n/)) {
     if (line.startsWith(MARKER)) {
       const data = line.replace(MARKER, "").split(DELIMITER);
       hash = data[0];
       date = new Date(data[1]);
+      if (data[2]) {
+        const split = data[2].split(" ");
+        if (split.length === 2) {
+          const [, parentHash] = split;
+          parents.set(parentHash, { modified: date, hash });
+        }
+      }
     } else if (line) {
       const relPath = path.relative(realContentRoot, path.join(repoRoot, line));
-      map.set(relPath, { date, hash });
+      map.set(relPath, { modified: date, hash });
     }
   }
-  return map;
+  return [map, parents];
 }
 
 function gather(contentRoots, previousFile = null) {
@@ -65,7 +73,8 @@ function gather(contentRoots, previousFile = null) {
   }
   // Every key in this map is a path, relative to root.
   for (const contentRoot of contentRoots) {
-    for (const [key, value] of getFromGit(contentRoot)) {
+    const [commits, parents] = getFromGit(contentRoot);
+    for (const [key, value] of commits) {
       // Because CONTENT_*_ROOT isn't necessarily the same as the path relative to
       // the git root. For example "../README.md" and since those aren't documents
       // exclude them.
@@ -74,10 +83,7 @@ function gather(contentRoots, previousFile = null) {
         !key.startsWith(".") &&
         (key.endsWith("index.html") || key.endsWith("index.md"))
       ) {
-        map.set(key, {
-          modified: value.date,
-          hash: value.hash,
-        });
+        map.set(key, Object.assign(value, { merged: parents.get(value.hash) }));
       }
     }
   }
diff --git a/content/document.js b/content/document.js
index 6b2c63b74a04..8887b88c1e78 100644
--- a/content/document.js
+++ b/content/document.js
@@ -250,8 +250,21 @@ const read = memoize((folder) => {
   const gitHistory = getGitHistories(root, locale).get(
     path.relative(root, filePath)
   );
-  let modified = (gitHistory && gitHistory.modified) || null;
-  const hash = (gitHistory && gitHistory.hash) || null;
+  let modified = null;
+  let hash = null;
+  if (gitHistory) {
+    if (
+      gitHistory.merged &&
+      gitHistory.merged.modified &&
+      gitHistory.merged.hash
+    ) {
+      modified = gitHistory.merged.modified;
+      hash = gitHistory.merged.hash;
+    } else {
+      modified = gitHistory.modified;
+      hash = gitHistory.hash;
+    }
+  }
   // Use the wiki histories for a list of legacy contributors.
   const wikiHistory = getWikiHistories(root, locale).get(url);
   if (!modified && wikiHistory && wikiHistory.modified) {

From 4a76e31f738915525fe5e40cf1c55f59c597c9ab Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 23 Mar 2021 19:30:29 -0400
Subject: [PATCH 061/288] EmbedTest262ReportResultsTable is deprecated (#3314)

* EmbedTest262ReportResultsTable is deprecated

Part of #3313

* make tests work by no doing the tests

* delete the macro
---
 .../macros/EmbedTest262ReportResultsTable.ejs | 12 -------
 .../EmbedTest262ReportResultsTable.test.js    | 35 -------------------
 2 files changed, 47 deletions(-)
 delete mode 100644 kumascript/macros/EmbedTest262ReportResultsTable.ejs
 delete mode 100644 kumascript/tests/macros/EmbedTest262ReportResultsTable.test.js

diff --git a/kumascript/macros/EmbedTest262ReportResultsTable.ejs b/kumascript/macros/EmbedTest262ReportResultsTable.ejs
deleted file mode 100644
index 32299425445f..000000000000
--- a/kumascript/macros/EmbedTest262ReportResultsTable.ejs
+++ /dev/null
@@ -1,12 +0,0 @@
-<%
-// Embeds a Test262.report results table
-//
-// Parameters:
-//  $0 - A "feature" name from test262.report
-//
-//  Example calls:
-// {{EmbedTest262ReportResultsTable("globalThis")}}
-// {{EmbedTest262ReportResultsTable("BigInt")}}
-//
-%>
-<iframe width="100%" height="300" src="https://test262.report/embed/features/<%-encodeURIComponent($0)%>?engines=chakra%2Cjavascriptcore%2Cspidermonkey%2Cv8&summary=true&include-browsers=true"></iframe>
diff --git a/kumascript/tests/macros/EmbedTest262ReportResultsTable.test.js b/kumascript/tests/macros/EmbedTest262ReportResultsTable.test.js
deleted file mode 100644
index 95a5cdbc0006..000000000000
--- a/kumascript/tests/macros/EmbedTest262ReportResultsTable.test.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @prettier
- */
-const { assert, itMacro, describeMacro } = require("./utils");
-
-describeMacro("EmbedTest262ReportResultsTable", function () {
-  itMacro("Feature Tag: No non-alphabet characters", function (macro) {
-    return assert.eventually.equal(
-      macro.call("BigInt"),
-      '<iframe width="100%" height="300"' +
-        ' src="https://test262.report/embed/features/BigInt?engines=chakra%2Cjavascriptcore%2Cspidermonkey%2Cv8&summary=true&include-browsers=true"></iframe>'
-    );
-  });
-  itMacro('Feature Tag: Has a "."', function (macro) {
-    return assert.eventually.equal(
-      macro.call("Object.fromEntries"),
-      '<iframe width="100%" height="300"' +
-        ' src="https://test262.report/embed/features/Object.fromEntries?engines=chakra%2Cjavascriptcore%2Cspidermonkey%2Cv8&summary=true&include-browsers=true"></iframe>'
-    );
-  });
-  itMacro('Feature Tag: Has a "-"', function (macro) {
-    return assert.eventually.equal(
-      macro.call("dynamic-import"),
-      '<iframe width="100%" height="300"' +
-        ' src="https://test262.report/embed/features/dynamic-import?engines=chakra%2Cjavascriptcore%2Cspidermonkey%2Cv8&summary=true&include-browsers=true"></iframe>'
-    );
-  });
-  itMacro("Feature Tag: Encoded with encodeURIComponent()", function (macro) {
-    return assert.eventually.equal(
-      macro.call("?dynamic=import/foo&bar"),
-      '<iframe width="100%" height="300"' +
-        ' src="https://test262.report/embed/features/%3Fdynamic%3Dimport%2Ffoo%26bar?engines=chakra%2Cjavascriptcore%2Cspidermonkey%2Cv8&summary=true&include-browsers=true"></iframe>'
-    );
-  });
-});

From b17f7a9e9c80ed96fccc54d9121aff297570f8d9 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 23 Mar 2021 19:37:03 -0400
Subject: [PATCH 062/288] Deployer needs to upload static assets first (#3316)

Fixes #3315
---
 deployer/src/deployer/upload.py | 41 +++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/deployer/src/deployer/upload.py b/deployer/src/deployer/upload.py
index 59db69ca6657..abfb90b87b15 100644
--- a/deployer/src/deployer/upload.py
+++ b/deployer/src/deployer/upload.py
@@ -345,6 +345,42 @@ def get_bucket_objects(self):
         return result
 
     def iter_file_tasks(self, build_directory, for_counting_only=False, dry_run=False):
+        # The order matters! In particular the order of static assets compared to
+        # the HTML files that reference said static assets.
+        # If you upload the HTML files before we upload the static assets, what
+        # might happen is this:
+        #
+        #  ...
+        #  <link rel=stylesheet href=/static/css/main.350fa0c1.css">
+        #  <title>JavaScript MDN Web Docs</title>
+        #  ...
+        #
+        # Now if the CDN serves this new HTML file *before*
+        # the /static/css/main.350fa0c1.css file has been uploaded, you get a busted
+        # page.
+        # So explicitly upload all the static assets first.
+        # I.e. `<build_directory>/static/`
+        # And since we later processed the whole of `<build_directory>` we'll
+        # come across these static files again. So that's why we populate a
+        # `set` so that when we do the second pass, we'll know what we've already
+        # yielded.
+        # Origin for this is: https://github.com/mdn/yari/issues/3315
+        done = set()
+
+        # Walk the build_directory/static and yield file upload tasks.
+        for fp in iterdir(build_directory / "static"):
+            # Exclude any files that aren't artifacts of the build.
+            if fp.name.startswith(".") or fp.name.endswith("~"):
+                continue
+
+            key = self.get_key(build_directory, fp)
+
+            if for_counting_only:
+                yield 1
+            else:
+                yield UploadFileTask(fp, key, dry_run=dry_run)
+            done.add(key)
+
         # Prepare a computation of what the root /index.html file would be
         # called as a S3 key. Do this once so it becomes a quicker operation
         # later when we compare *each* generated key to see if it matches this.
@@ -360,6 +396,11 @@ def iter_file_tasks(self, build_directory, for_counting_only=False, dry_run=Fals
 
             key = self.get_key(build_directory, fp)
 
+            if key in done:
+                # This can happen since we might have explicitly processed this
+                # in the for-loop above. See comment at the beginning of this method.
+                continue
+
             # The root index.html file is never useful. It's not the "home page"
             # because the home page is actually `/$locale/` since `/` is handled
             # specifically by the CDN.

From 9887ce5aac6ff9af278d82204b74021e51c1a087 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Mar 2021 07:00:37 +0000
Subject: [PATCH 063/288] build(deps): bump boto3 from 1.17.34 to 1.17.35 in
 /deployer (#3317)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 27e42f4c85b3..e2dfce50fc2c 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.34"
+version = "1.17.35"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.34,<1.21.0"
+botocore = ">=1.20.35,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.34"
+version = "1.20.35"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -533,7 +533,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "cfd5df43411d7eb1b3f68bd6070e0b764a88692b014c95b83bc84db4b5f2ab0b"
+content-hash = "b6d5cd2cd06cfb44fea389eda6ce1f4225c4c70bc793d30bbb0649919745a256"
 
 [metadata.files]
 appdirs = [
@@ -552,12 +552,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.34-py2.py3-none-any.whl", hash = "sha256:1ddd597e3d8b7553432f84b32b9519cc90aad91c4dc3873725375163c9f98353"},
-    {file = "boto3-1.17.34.tar.gz", hash = "sha256:8f33cb3d2fc42b0547a5560a6d7397aa93336f50899386762b2450682c0e992b"},
+    {file = "boto3-1.17.35-py2.py3-none-any.whl", hash = "sha256:1e6e06b2f1eee5a76acdde1e7b4f57c93c1bf2905341207d74f2a140ce060cd8"},
+    {file = "boto3-1.17.35.tar.gz", hash = "sha256:40e84a5f7888924db74a2710dbe48d066b51fe1f5549efaffe90e6efe813f37b"},
 ]
 botocore = [
-    {file = "botocore-1.20.34-py2.py3-none-any.whl", hash = "sha256:c4fe4fea1d6a3934dd8c670ee83b128f935a64078786fe8afb8a662446304926"},
-    {file = "botocore-1.20.34.tar.gz", hash = "sha256:749bdb151e340329f1b25600bfe9d223e930f8ba26bd74b71478ca5781f2feaf"},
+    {file = "botocore-1.20.35-py2.py3-none-any.whl", hash = "sha256:e34bbb7d7de154c2ff2a73ae0691c601a69c5bda887374c8a6a23072380b07a4"},
+    {file = "botocore-1.20.35.tar.gz", hash = "sha256:9119ffb231145ffadd55391c9356dcdb18e3de65c3a7c82844634e949f0ca5a0"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 76688a661a20..08b0fa86ec7c 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.34"
+boto3 = "^1.17.35"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 399b07acb24fca242f64ccee20bfa873bcdd5d38 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Wed, 24 Mar 2021 12:51:10 -0400
Subject: [PATCH 064/288] render markdown (#3138)

* render Markdown

Part of #3137

* document watch

* fix eslint

* super basic test

* markdown with GFM

* fenched code blocks

* fix eslint

* remove dbugging

* add plugin

* fix eslint

* tests

* fix tests

* feedbacked
---
 build/flaws.js                                |  30 ++-
 build/index.js                                |  19 +-
 build/sync-translated-content.js              |  21 +-
 client/src/document/forms/form.tsx            |  16 +-
 client/src/document/toolbar/edit-actions.tsx  |  10 +-
 client/src/document/toolbar/index.tsx         |   5 +-
 client/src/document/types.tsx                 |   1 +
 content/document.js                           |  92 ++++---
 content/markdown-converter.js                 |  28 ++
 content/rehype-codeblocks.js                  |  40 +++
 kumascript/index.js                           |   4 +-
 kumascript/src/info.js                        |  10 +-
 kumascript/tests/index.test.js                |  12 +-
 package.json                                  |   9 +-
 server/document.js                            |  26 +-
 testing/content/files/en-us/markdown/index.md |  65 +++++
 testing/tests/index.test.js                   |  25 ++
 yarn.lock                                     | 253 +++++++++++++++++-
 18 files changed, 569 insertions(+), 97 deletions(-)
 create mode 100644 content/markdown-converter.js
 create mode 100644 content/rehype-codeblocks.js
 create mode 100644 testing/content/files/en-us/markdown/index.md

diff --git a/build/flaws.js b/build/flaws.js
index b64d624d1589..4b0eae5ade18 100644
--- a/build/flaws.js
+++ b/build/flaws.js
@@ -620,7 +620,12 @@ function injectHeadingLinksFlaws(doc, $, { rawContent }) {
 async function fixFixableFlaws(doc, options, document) {
   if (!options.fixFlaws || document.isArchive) return;
 
-  let newRawHTML = document.rawHTML;
+  const { rawBody, isMarkdown } = document;
+  if (isMarkdown) {
+    throw new Error("Fixing flaws in Markdown is not implemented yet");
+  }
+  // String copy so we can mutate it
+  let newRawBody = rawBody;
 
   const phrasing = options.fixFlawsDryRun ? "Would fix" : "Fixed";
 
@@ -631,14 +636,14 @@ async function fixFixableFlaws(doc, options, document) {
     if (flaw.fixable) {
       // Sanity check that our understanding of flaws, filepaths, and sources
       // work as expected.
-      if (!newRawHTML.includes(flaw.macroSource)) {
+      if (!newRawBody.includes(flaw.macroSource)) {
         throw new Error(
-          `rawHTML doesn't contain macroSource (${flaw.macroSource})`
+          `rawBody doesn't contain macroSource (${flaw.macroSource})`
         );
       }
       const newMacroSource = flaw.suggestion;
       // Remember, in JavaScript only the first occurrence will be replaced.
-      newRawHTML = newRawHTML.replace(flaw.macroSource, newMacroSource);
+      newRawBody = newRawBody.replace(flaw.macroSource, newMacroSource);
       if (loud) {
         console.log(
           chalk.grey(
@@ -656,11 +661,12 @@ async function fixFixableFlaws(doc, options, document) {
     if (!flaw.suggestion) {
       continue;
     }
+    // XXX MARKDOWN
     // The reason we're not using the parse HTML, as a cheerio object `$`
     // is because the raw HTML we're dealing with isn't actually proper
     // HTML. It's only proper HTML when the kumascript macros have been
     // expanded.
-    newRawHTML = replaceMatchesInText(flaw.href, newRawHTML, flaw.suggestion, {
+    newRawBody = replaceMatchesInText(flaw.href, newRawBody, flaw.suggestion, {
       inAttribute: "href",
     });
     if (loud) {
@@ -680,13 +686,13 @@ async function fixFixableFlaws(doc, options, document) {
       continue;
     }
 
-    if (!newRawHTML.includes(flaw.html)) {
-      throw new Error(`rawHTML doesn't contain flaw HTML (${flaw.html})`);
+    if (!newRawBody.includes(flaw.html)) {
+      throw new Error(`rawBody doesn't contain flaw HTML (${flaw.html})`);
     }
     // It's not feasible to pin point exactly which `<pre>` tag this
     // refers to, so do the same query we use when we find the
     // flaw, but this time actually make the mutation.
-    newRawHTML = newRawHTML.replace(flaw.html, flaw.suggestion);
+    newRawBody = newRawBody.replace(flaw.html, flaw.suggestion);
     if (loud) {
       console.log(chalk.grey(`${phrasing} (${flaw.id}) bad_pre_tags`));
     }
@@ -817,7 +823,7 @@ async function fixFixableFlaws(doc, options, document) {
         }
       }
     }
-    newRawHTML = replaceMatchesInText(flaw.src, newRawHTML, newSrc, {
+    newRawBody = replaceMatchesInText(flaw.src, newRawBody, newSrc, {
       inAttribute: "src",
     });
     if (loud) {
@@ -836,7 +842,7 @@ async function fixFixableFlaws(doc, options, document) {
     if (!flaw.fixable) {
       continue;
     }
-    newRawHTML = replaceMatchesInText(flaw.style, newRawHTML, flaw.suggestion, {
+    newRawBody = replaceMatchesInText(flaw.style, newRawBody, flaw.suggestion, {
       inAttribute: "style",
       removeEntireAttribute: flaw.suggestion === "",
     });
@@ -858,7 +864,7 @@ async function fixFixableFlaws(doc, options, document) {
   }
 
   // Finally, summarized what happened...
-  if (newRawHTML !== document.rawHTML) {
+  if (newRawBody !== rawBody) {
     // It changed the raw HTML of the source. So deal with this.
     if (options.fixFlawsDryRun && options.fixFlawsVerbose) {
       console.log(
@@ -867,7 +873,7 @@ async function fixFixableFlaws(doc, options, document) {
         )
       );
     } else {
-      Document.update(document.url, newRawHTML, document.metadata);
+      Document.update(document.url, newRawBody, document.metadata, isMarkdown);
       if (options.fixFlawsVerbose) {
         console.log(
           chalk.green(
diff --git a/build/index.js b/build/index.js
index d8766d5afc44..3039590ef1fc 100644
--- a/build/index.js
+++ b/build/index.js
@@ -1,3 +1,5 @@
+const path = require("path");
+
 const chalk = require("chalk");
 const cheerio = require("cheerio");
 
@@ -165,11 +167,11 @@ function injectNotecardOnWarnings($) {
  * Return the full URL directly to the file in GitHub based on this folder.
  * @param {String} folder - the current folder we're processing.
  */
-function getGitHubURL(root, folder) {
+function getGitHubURL(root, folder, filename) {
   const baseURL = `https://github.com/${REPOSITORY_URLS[root]}`;
   return `${baseURL}/blob/${getCurrentGitBranch(
     root
-  )}/files/${folder}/index.html`;
+  )}/files/${folder}/${filename}`;
 }
 
 /**
@@ -184,10 +186,12 @@ function getLastCommitURL(root, hash) {
 function injectSource(doc, document, metadata) {
   const folder = document.fileInfo.folder;
   const root = document.fileInfo.root;
+  const filename = path.basename(document.fileInfo.path);
   doc.source = {
     folder,
-    github_url: getGitHubURL(root, folder),
+    github_url: getGitHubURL(root, folder, filename),
     last_commit_url: getLastCommitURL(root, metadata.hash),
+    filename,
   };
 }
 
@@ -242,7 +246,10 @@ async function buildDocument(document, documentOptions = {}) {
   const liveSamples = [];
 
   if (doc.isArchive) {
-    renderedHtml = document.rawHTML;
+    if (document.isMarkdown) {
+      throw new Error("Markdown not supported for archived content");
+    }
+    renderedHtml = document.rawBody;
   } else {
     if (options.clearKumascriptRenderCache) {
       renderKumascriptCache.reset();
@@ -268,7 +275,7 @@ async function buildDocument(document, documentOptions = {}) {
 
     const sampleIds = kumascript.getLiveSampleIDs(
       document.metadata.slug,
-      document.rawHTML
+      document.rawBody
     );
     for (const sampleIdObject of sampleIds) {
       const liveSamplePage = kumascript.buildLiveSamplePage(
@@ -520,7 +527,7 @@ async function buildLiveSamplePageFromURL(url) {
   // the actual sampleID object with the properly-cased live-sample ID.
   for (const sampleIDObject of kumascript.getLiveSampleIDs(
     document.metadata.slug,
-    document.rawHTML
+    document.rawBody
   )) {
     if (sampleIDObject.id.toLowerCase() === sampleID) {
       const liveSamplePage = kumascript.buildLiveSamplePage(
diff --git a/build/sync-translated-content.js b/build/sync-translated-content.js
index c6afef6fd676..fe3437790d54 100644
--- a/build/sync-translated-content.js
+++ b/build/sync-translated-content.js
@@ -78,17 +78,11 @@ function resolve(slug) {
   const url = buildURL("en-us", slug);
   const resolved = Redirect.resolve(url);
   if (url !== resolved) {
-    const filePath = path.join(
-      CONTENT_ROOT,
-      Document.urlToFolderPath(resolved),
-      "index.html"
-    );
-    if (!fs.existsSync(filePath)) {
+    const doc = Document.read(resolved);
+    if (!doc) {
       return slug;
     }
-    const {
-      attributes: { slug: resolvedSlug },
-    } = fm(fs.readFileSync(filePath, "utf8"));
+    const resolvedSlug = doc.url;
     if (slug !== resolvedSlug) {
       return resolvedSlug;
     }
@@ -111,7 +105,8 @@ function syncTranslatedContent(inFilePath, locale) {
   };
 
   const rawDoc = fs.readFileSync(inFilePath, "utf8");
-  const { attributes: oldMetadata, body: rawHTML } = fm(rawDoc);
+  const fileName = path.basename(inFilePath);
+  const { attributes: oldMetadata, body: rawBody } = fm(rawDoc);
   const resolvedSlug = resolve(oldMetadata.slug);
   const metadata = {
     ...oldMetadata,
@@ -150,7 +145,7 @@ function syncTranslatedContent(inFilePath, locale) {
       slugToFolder(metadata.slug)
     );
 
-    const filePath = path.join(folderPath, "index.html");
+    const filePath = path.join(folderPath, fileName);
     return filePath;
   };
 
@@ -158,7 +153,7 @@ function syncTranslatedContent(inFilePath, locale) {
   let filePath = getFilePath();
 
   status.orphaned = !fs.existsSync(
-    path.join(CONTENT_ROOT, "en-us", slugToFolder(metadata.slug), "index.html")
+    path.join(CONTENT_ROOT, "en-us", slugToFolder(metadata.slug), fileName)
   );
 
   if (!status.moved && !status.orphaned) {
@@ -204,7 +199,7 @@ function syncTranslatedContent(inFilePath, locale) {
   fs.mkdirSync(path.dirname(filePath), { recursive: true });
   execGit(["mv", inFilePath, filePath], { cwd: CONTENT_TRANSLATED_ROOT });
   metadata.original_slug = oldMetadata.slug;
-  Document.saveHTMLFile(filePath, Document.trimLineEndings(rawHTML), metadata);
+  Document.saveFile(filePath, Document.trimLineEndings(rawBody), metadata);
   try {
     fs.rmdirSync(path.dirname(inFilePath));
   } catch (e) {
diff --git a/client/src/document/forms/form.tsx b/client/src/document/forms/form.tsx
index 48ce7cbcf33d..84c1c3ec2d78 100644
--- a/client/src/document/forms/form.tsx
+++ b/client/src/document/forms/form.tsx
@@ -6,7 +6,7 @@ import "./form.scss";
 import useSWR from "swr";
 
 type DocumentFormData = {
-  rawHTML: string;
+  rawBody: string;
   metadata: { slug: string; title: string };
 };
 
@@ -34,7 +34,7 @@ export function DocumentForm({
     initialSlug ? initialSlug + "/" : doc ? doc.metadata.slug : ""
   );
   const [title, setTitle] = useState(doc ? doc.metadata.title : "");
-  const [rawHTML, setRawHtml] = useState(doc ? doc.rawHTML : "");
+  const [rawBody, setRawBody] = useState(doc ? doc.rawBody : "");
 
   const [autosaveEnabled, setAutoSaveEnabled] = useLocalStorage(
     "autosaveEdit",
@@ -77,7 +77,7 @@ export function DocumentForm({
     if (willAutosave) {
       debounceCallback(
         {
-          rawHTML,
+          rawBody,
           metadata: { slug, title, locale },
         },
         didSlugChange
@@ -88,7 +88,7 @@ export function DocumentForm({
     debounceCallback,
     slug,
     title,
-    rawHTML,
+    rawBody,
     didSlugChange,
     locale,
   ]);
@@ -100,7 +100,7 @@ export function DocumentForm({
         event.preventDefault();
         onSave(
           {
-            rawHTML,
+            rawBody,
             metadata: { slug, title, locale },
           },
           didSlugChange
@@ -152,15 +152,15 @@ export function DocumentForm({
 
       <textarea
         disabled={disableInputs}
-        value={rawHTML}
-        onChange={(event) => setRawHtml(event.target.value)}
+        value={rawBody}
+        onChange={(event) => setRawBody(event.target.value)}
         rows={20}
         style={{ width: "100%" }}
       />
       <p>
         <button
           type="submit"
-          disabled={disableInputs || !title || !slug || invalidSlug || !rawHTML}
+          disabled={disableInputs || !title || !slug || invalidSlug || !rawBody}
         >
           {isNew ? "Create" : "Save"}
         </button>
diff --git a/client/src/document/toolbar/edit-actions.tsx b/client/src/document/toolbar/edit-actions.tsx
index 6c9f78b57d6b..2799f6c51efd 100644
--- a/client/src/document/toolbar/edit-actions.tsx
+++ b/client/src/document/toolbar/edit-actions.tsx
@@ -3,7 +3,13 @@ import { Link, useLocation, useParams } from "react-router-dom";
 
 import "./edit-actions.scss";
 
-export function EditActions({ folder }: { folder: string }) {
+export function EditActions({
+  folder,
+  filename,
+}: {
+  folder: string;
+  filename: string;
+}) {
   const location = useLocation();
 
   const [opening, setOpening] = useState(false);
@@ -28,7 +34,7 @@ export function EditActions({ folder }: { folder: string }) {
   async function openInEditorHandler(event: React.MouseEvent) {
     event.preventDefault();
 
-    const filepath = folder + "/index.html";
+    const filepath = `${folder}/${filename}`;
     console.log(`Going to try to open ${filepath} in your editor`);
     setOpening(true);
     try {
diff --git a/client/src/document/toolbar/index.tsx b/client/src/document/toolbar/index.tsx
index 3df4ce0c5595..2c4ea9fe02d5 100644
--- a/client/src/document/toolbar/index.tsx
+++ b/client/src/document/toolbar/index.tsx
@@ -35,7 +35,10 @@ export default function Toolbar({
   return (
     <div className="toolbar">
       <div className="toolbar-first-row">
-        <EditActions folder={doc.source.folder} />
+        <EditActions
+          folder={doc.source.folder}
+          filename={doc.source.filename}
+        />
       </div>
       <ToggleDocumentFlaws doc={doc} reloadPage={reloadPage} />
     </div>
diff --git a/client/src/document/types.tsx b/client/src/document/types.tsx
index aa97a824a106..571e49a78662 100644
--- a/client/src/document/types.tsx
+++ b/client/src/document/types.tsx
@@ -2,6 +2,7 @@ export interface Source {
   folder: string;
   github_url: string;
   last_commit_url: string;
+  filename: string;
 }
 
 export interface GenericFlaw {
diff --git a/content/document.js b/content/document.js
index 8887b88c1e78..d4fc1f99b300 100644
--- a/content/document.js
+++ b/content/document.js
@@ -34,6 +34,8 @@ function buildPath(localeFolder, slug) {
 
 const HTML_FILENAME = "index.html";
 const getHTMLPath = (folder) => path.join(folder, HTML_FILENAME);
+const MARKDOWN_FILENAME = "index.md";
+const getMarkdownPath = (folder) => path.join(folder, MARKDOWN_FILENAME);
 
 function updateWikiHistory(localeContentRoot, oldSlug, newSlug = null) {
   const all = JSON.parse(
@@ -67,9 +69,9 @@ function extractLocale(folder) {
   return locale;
 }
 
-function saveHTMLFile(
+function saveFile(
   filePath,
-  rawHTML,
+  rawBody,
   { slug, title, translation_of, tags, translation_of_original, original_slug }
 ) {
   if (slug.includes("#")) {
@@ -93,7 +95,7 @@ function saveHTMLFile(
   if (original_slug) {
     metadata.original_slug = original_slug;
   }
-  const combined = `---\n${yaml.dump(metadata)}---\n${rawHTML.trim()}\n`;
+  const combined = `---\n${yaml.dump(metadata)}---\n${rawBody.trim()}\n`;
   fs.writeFileSync(filePath, combined);
 }
 
@@ -104,12 +106,21 @@ function trimLineEndings(string) {
     .join("\n");
 }
 
-function create(html, metadata, root = null) {
+function createHTML(html, metadata, root = null) {
   const folderPath = getFolderPath(metadata, root);
 
   fs.mkdirSync(folderPath, { recursive: true });
 
-  saveHTMLFile(getHTMLPath(folderPath), trimLineEndings(html), metadata);
+  saveFile(getHTMLPath(folderPath), trimLineEndings(html), metadata);
+  return folderPath;
+}
+
+function createMarkdown(md, metadata, root = null) {
+  const folderPath = getFolderPath(metadata, root);
+
+  fs.mkdirSync(folderPath, { recursive: true });
+
+  saveFile(getMarkdownPath(folderPath), trimLineEndings(md), metadata);
   return folderPath;
 }
 
@@ -125,8 +136,9 @@ function getFolderPath(metadata, root = null) {
 
 function archive(
   renderedHTML,
-  rawHTML,
+  rawBody,
   metadata,
+  isMarkdown = false,
   isTranslatedContent = false,
   root = null
 ) {
@@ -150,27 +162,23 @@ function archive(
 
   fs.mkdirSync(folderPath, { recursive: true });
 
-  // The `rawHTML` is only applicable in the importer when it saves
+  // The `rawBody` is only applicable in the importer when it saves
   // archived content. The archived content gets the *rendered* html
-  // saved but by storing the raw html too we can potentially resurrect
+  // saved but by storing the raw HTML/Markdown too we can potentially resurrect
   // the document if we decide to NOT archive it in the future.
-  if (rawHTML) {
+  if (rawBody) {
     fs.writeFileSync(
-      path.join(folderPath, "raw.html"),
-      trimLineEndings(rawHTML)
+      path.join(folderPath, isMarkdown ? "raw.md" : "raw.html"),
+      trimLineEndings(rawBody)
     );
   }
 
-  saveHTMLFile(
-    getHTMLPath(folderPath),
-    trimLineEndings(renderedHTML),
-    metadata
-  );
+  saveFile(getHTMLPath(folderPath), trimLineEndings(renderedHTML), metadata);
   return folderPath;
 }
 
 function unarchive(document, move) {
-  // You can't use `document.rawHTML` because, rather confusingly,
+  // You can't use `document.rawBody` because, rather confusingly,
   // it's actually the rendered (from the migration) HTML. Instead,
   // you need seek out the `raw.html` equivalent and use that.
   // This is because when we ran the migration, for every document we
@@ -181,7 +189,7 @@ function unarchive(document, move) {
     "raw.html"
   );
   const rawHTML = fs.readFileSync(rawFilePath, "utf-8");
-  const created = create(rawHTML, document.metadata);
+  const created = createHTML(rawHTML, document.metadata);
   if (move) {
     execGit(["rm", document.fileInfo.path], {}, CONTENT_ARCHIVED_ROOT);
     execGit(["rm", rawFilePath], {}, CONTENT_ARCHIVED_ROOT);
@@ -192,11 +200,23 @@ function unarchive(document, move) {
 const read = memoize((folder) => {
   let filePath = null;
   let root = null;
+  let isMarkdown = false;
+
   for (const possibleRoot of ROOTS) {
-    const possibleFilePath = path.join(possibleRoot, getHTMLPath(folder));
-    if (fs.existsSync(possibleFilePath)) {
+    const possibleHTMLFilePath = path.join(possibleRoot, getHTMLPath(folder));
+    if (fs.existsSync(possibleHTMLFilePath)) {
       root = possibleRoot;
-      filePath = possibleFilePath;
+      filePath = possibleHTMLFilePath;
+      break;
+    }
+    const possibleMarkdownFilePath = path.join(
+      possibleRoot,
+      getMarkdownPath(folder)
+    );
+    if (fs.existsSync(possibleMarkdownFilePath)) {
+      root = possibleRoot;
+      filePath = possibleMarkdownFilePath;
+      isMarkdown = true;
       break;
     }
   }
@@ -236,7 +256,7 @@ const read = memoize((folder) => {
 
   const {
     attributes: metadata,
-    body: rawHTML,
+    body: rawBody,
     bodyBegin: frontMatterOffset,
   } = fm(rawContent);
 
@@ -284,7 +304,10 @@ const read = memoize((folder) => {
 
   return {
     ...fullMetadata,
-    ...{ rawHTML, rawContent },
+    // ...{ rawContent },
+    rawContent, // HTML or Markdown whole string with all the front-matter
+    rawBody, // HTML or Markdown string without the front-matter
+    isMarkdown,
     isArchive,
     isTranslated,
     isActive,
@@ -297,7 +320,7 @@ const read = memoize((folder) => {
   };
 });
 
-function update(url, rawHTML, metadata) {
+function update(url, rawBody, metadata) {
   const folder = urlToFolderPath(url);
   const document = read(folder);
   const locale = document.metadata.locale;
@@ -305,14 +328,17 @@ function update(url, rawHTML, metadata) {
   const oldSlug = document.metadata.slug;
   const newSlug = metadata.slug;
   const isNewSlug = oldSlug !== newSlug;
-  const indexPath = path.join(root, getHTMLPath(folder));
+  const indexPath = path.join(
+    root,
+    document.isMarkdown ? getMarkdownPath(folder) : getHTMLPath(folder)
+  );
 
   if (
     isNewSlug ||
-    document.rawHTML !== rawHTML ||
+    document.rawBody !== rawBody ||
     document.metadata.title !== metadata.title
   ) {
-    saveHTMLFile(indexPath, rawHTML, {
+    saveFile(indexPath, rawBody, {
       ...document.metadata,
       ...metadata,
     });
@@ -329,7 +355,7 @@ function update(url, rawHTML, metadata) {
     const locale = metadata.locale;
     const redirects = new Map();
     const url = buildURL(locale, oldSlug);
-    for (const { metadata, rawHTML, fileInfo } of findChildren(url, true)) {
+    for (const { metadata, rawBody, fileInfo } of findChildren(url, true)) {
       const childLocale = metadata.locale;
       const oldChildSlug = metadata.slug;
       const newChildSlug = oldChildSlug.replace(oldSlug, newSlug);
@@ -339,7 +365,7 @@ function update(url, rawHTML, metadata) {
         oldChildSlug,
         newChildSlug
       );
-      saveHTMLFile(fileInfo.path, rawHTML, metadata);
+      saveFile(fileInfo.path, rawBody, metadata);
       redirects.set(
         buildURL(childLocale, oldChildSlug),
         buildURL(childLocale, newChildSlug)
@@ -402,7 +428,7 @@ function findAll({
       searchPattern.push(`+(${localePrefixes.join("|")})`);
     }
     searchPattern.push("**");
-    searchPattern.push(HTML_FILENAME);
+    searchPattern.push("index.{html,md}");
     filePaths.push(
       ...glob
         .sync(searchPattern.join(path.sep), { root })
@@ -428,6 +454,7 @@ function findAll({
                 .replace(CONTENT_ROOT, "")
                 .replace(CONTENT_TRANSLATED_ROOT, "")
                 .replace(HTML_FILENAME, "")
+                .replace(MARKDOWN_FILENAME, "")
                 .search(new RegExp(folderSearch)) !== -1
             );
           }
@@ -565,7 +592,8 @@ function remove(
 }
 
 module.exports = {
-  create,
+  createHTML,
+  createMarkdown,
   archive,
   unarchive,
   read,
@@ -582,7 +610,7 @@ module.exports = {
 
   updateWikiHistory,
   trimLineEndings,
-  saveHTMLFile,
+  saveFile,
 
   findByURL,
   findAll,
diff --git a/content/markdown-converter.js b/content/markdown-converter.js
new file mode 100644
index 000000000000..4cef1b43870b
--- /dev/null
+++ b/content/markdown-converter.js
@@ -0,0 +1,28 @@
+const unified = require("unified");
+const parse = require("remark-parse");
+const gfm = require("remark-gfm");
+const stringify = require("rehype-stringify");
+const remark2rehype = require("remark-rehype");
+const raw = require("rehype-raw");
+
+const rehypeCodeBlocks = require("./rehype-codeblocks");
+
+/**
+ * Converts Markdown -> HTML using unified.
+ * Using `raw` enables us to process HTML embedded in the Markdown.
+ */
+function markdownToHTML(md) {
+  return unified()
+    .use(parse)
+    .use(remark2rehype, { allowDangerousHtml: true })
+    .use(rehypeCodeBlocks)
+    .use(raw)
+    .use(gfm)
+    .use(stringify)
+    .processSync(md)
+    .toString();
+}
+
+module.exports = {
+  markdownToHTML,
+};
diff --git a/content/rehype-codeblocks.js b/content/rehype-codeblocks.js
new file mode 100644
index 000000000000..d446222800c4
--- /dev/null
+++ b/content/rehype-codeblocks.js
@@ -0,0 +1,40 @@
+const visit = require("unist-util-visit");
+
+module.exports = () => {
+  function visitor(node, index, parent) {
+    if (!parent || parent.tagName !== "pre" || node.tagName !== "code") {
+      return;
+    }
+    // When you use the triple-backtick and a language, like...
+    //
+    //    ```css
+    //    ...
+    //
+    // What you get is:
+    //
+    //    <pre><code class="language-css">...
+    //
+    // Let's now convert that to:
+    //
+    //    <pre class="brush: css">
+    //
+    // The reason for doing this is entirely to pretend that nothing has changed.
+    // This way, the Markdown gets converted to HTML in the way Yari can process
+    // all other existing HTML.
+
+    const classNames = node.properties.className || [];
+    for (const className of classNames) {
+      if (className.startsWith("language-")) {
+        const classNamesBefore = parent.properties.className || [];
+        parent.properties.className = [
+          `brush: ${className.replace("language-", "").toLowerCase()}`,
+          ...classNamesBefore,
+        ];
+      }
+    }
+  }
+
+  return (tree) => {
+    visit(tree, "element", visitor);
+  };
+};
diff --git a/kumascript/index.js b/kumascript/index.js
index a36e06d9977d..32b6201681f9 100644
--- a/kumascript/index.js
+++ b/kumascript/index.js
@@ -1,6 +1,7 @@
 const LRU = require("lru-cache");
 
 const { Document } = require("../content");
+const { markdownToHTML } = require("../content/markdown-converter");
 
 const {
   INTERACTIVE_EXAMPLES_BASE_URL,
@@ -50,7 +51,8 @@ const renderFromURL = async (
         `Tried to find a folder called ${Document.urlToFolderPath(url)}`
     );
   }
-  const { rawHTML, metadata, fileInfo } = document;
+  const { rawBody, metadata, fileInfo, isMarkdown } = document;
+  const rawHTML = isMarkdown ? markdownToHTML(rawBody) : rawBody;
   const [renderedHtml, errors] = await renderMacros(
     rawHTML,
     {
diff --git a/kumascript/src/info.js b/kumascript/src/info.js
index dd9fad504e39..dd406cd7185a 100644
--- a/kumascript/src/info.js
+++ b/kumascript/src/info.js
@@ -2,6 +2,7 @@ const cheerio = require("cheerio");
 
 const Parser = require("./parser.js");
 const { VALID_LOCALES, Document, Redirect } = require("../../content");
+const { markdownToHTML } = require("../../content/markdown-converter");
 
 const DUMMY_BASE_URL = "https://example.com";
 
@@ -190,6 +191,7 @@ const info = {
     }
 
     const { locale, slug, title, tags } = document.metadata;
+    const { rawBody, isMarkdown } = document;
     return {
       url: document.url,
       locale,
@@ -204,8 +206,8 @@ const info = {
         // In Yari, this is not possible. We don't duplicate the summary in every
         // document. Instead, we extract it from the document when we build it.
         // So, to avoid the whole chicken-and-egg problem, instead, we're going to
-        //  try to extract it on-the-fly, from raw HTML.
-        // Note, we can't always use Cheerio here because the `document.rawHTML` is
+        // try to extract it on-the-fly, from raw HTML or Markdown.
+        // Note, we can't always use Cheerio here because the `document.rawBody` is
         // actually not valid HTML, hence the desperate fall back on regex.
         // A lot of times, you'll actually find that the first paragraph isn't
         // a <p> tag. But often, in those cases it'll have that `seoSummary`
@@ -217,7 +219,7 @@ const info = {
         let $ = null;
         let summary = "";
         try {
-          $ = cheerio.load(document.rawHTML);
+          $ = cheerio.load(isMarkdown ? markdownToHTML(rawBody) : rawBody);
           $("span.seoSummary, .summary").each((i, element) => {
             if (!summary) {
               const html = $(element)
@@ -243,7 +245,7 @@ const info = {
           }
         } catch (er) {
           console.warn(
-            `Cheerio on document.rawHTML (${document.url}) failed to parse`,
+            `Cheerio on document.rawBody (${document.url}) failed to parse`,
             er
           );
         }
diff --git a/kumascript/tests/index.test.js b/kumascript/tests/index.test.js
index 11361d89e7eb..e5357a61697c 100644
--- a/kumascript/tests/index.test.js
+++ b/kumascript/tests/index.test.js
@@ -46,7 +46,8 @@ describe("testing the main render() function", () => {
             slug: "Web/A",
             tags: ["Web"],
           },
-          rawHTML: source,
+          rawBody: source,
+          isMarkdown: false,
           fileInfo: {
             path: "testing/content/files/en-us/web/a",
             frontMatterOffset: 8,
@@ -60,7 +61,8 @@ describe("testing the main render() function", () => {
             slug: "Web/B",
             tags: ["Web"],
           },
-          rawHTML: '<p>{{cssxref("bigfoot")}}</p>',
+          rawBody: '<p>{{cssxref("bigfoot")}}</p>',
+          isMarkdown: false,
           fileInfo: {
             path: "testing/content/files/en-us/web/b",
             frontMatterOffset: 4,
@@ -74,7 +76,8 @@ describe("testing the main render() function", () => {
             slug: "Web/C",
             tags: ["Web"],
           },
-          rawHTML: '{{page("/en-US/docs/Web/B")}}',
+          rawBody: '{{page("/en-US/docs/Web/B")}}',
+          isMarkdown: false,
           fileInfo: {
             path: "testing/content/files/en-us/web/c",
             frontMatterOffset: 5,
@@ -88,7 +91,8 @@ describe("testing the main render() function", () => {
             slug: "Web/Number",
             tags: ["Web", "CSS", "CSS Data Type", "Layout", "Reference"],
           },
-          rawHTML: "<p>This is the number test page.</p>",
+          rawBody: "<p>This is the number test page.</p>",
+          isMarkdown: false,
           fileInfo: {
             path: "testing/content/files/en-us/web/css/number",
             frontMatterOffset: 12,
diff --git a/package.json b/package.json
index 17d8ef320a40..147525b11b44 100644
--- a/package.json
+++ b/package.json
@@ -79,10 +79,17 @@
     "open-editor": "3.0.0",
     "prismjs": "1.23.0",
     "read-chunk": "3.2.0",
+    "rehype-raw": "5.0.0",
+    "rehype-stringify": "8.0.0",
+    "remark-gfm": "1.0.0",
+    "remark-parse": "9.0.0",
+    "remark-rehype": "8.0.0",
     "sanitize-filename": "^1.6.3",
     "send": "0.17.1",
     "source-map-support": "0.5.19",
-    "tempy": "1.0.1"
+    "tempy": "1.0.1",
+    "unified": "9.2.1",
+    "unist-util-visit": "2.0.3"
   },
   "devDependencies": {
     "@babel/core": "^7.13.10",
diff --git a/server/document.js b/server/document.js
index ec6f23c15b69..9b9f4386da6f 100644
--- a/server/document.js
+++ b/server/document.js
@@ -9,11 +9,12 @@ const { BUILD_OUT_ROOT } = require("../build/constants");
 
 const router = express();
 
-router.post("/", (req, res) => {
-  const { rawHTML, metadata } = req.body;
-  Document.create(rawHTML, metadata);
-  res.sendStatus(201);
-});
+// XXX deprecated anyway and doesn't work with Markdown
+// router.post("/", (req, res) => {
+//   const { rawHTML, metadata } = req.body;
+//   Document.create(rawHTML, metadata);
+//   res.sendStatus(201);
+// });
 
 function withDocument(req, res, next) {
   if (!req.query.url) {
@@ -64,17 +65,18 @@ router.get("/", withDocument, (req, res) => {
 });
 
 router.put("/", withDocument, async (req, res) => {
-  const { rawHTML, metadata } = req.body;
-  if (metadata.title && rawHTML) {
-    Document.update(req.document.url, `${rawHTML.trim()}\n`, metadata);
+  const { rawBody, metadata } = req.body;
+  if (metadata.title && rawBody) {
+    Document.update(req.document.url, `${rawBody.trim()}\n`, metadata);
   }
   res.sendStatus(200);
 });
 
-router.put("/move", async (req, res) => {
-  Document.move(req.query.slug, req.query.newSlug, req.query.locale);
-  res.sendStatus(200);
-});
+// XXX deprecated anyway and doesn't work with Markdown
+// router.put("/move", async (req, res) => {
+//   Document.move(req.query.slug, req.query.newSlug, req.query.locale);
+//   res.sendStatus(200);
+// });
 
 router.delete("/", (req, res) => {
   Document.remove(req.query.slug, req.query.locale, {
diff --git a/testing/content/files/en-us/markdown/index.md b/testing/content/files/en-us/markdown/index.md
new file mode 100644
index 000000000000..8c5a3faac17e
--- /dev/null
+++ b/testing/content/files/en-us/markdown/index.md
@@ -0,0 +1,65 @@
+---
+title: Markdown files
+slug: Markdown
+tags:
+  - Landing
+  - Markdown
+---
+
+`Markdown` is a nicer format than `HTML`.
+
+## Heading 2
+
+Basic formatting such as **bold** and _emphasis_ and ~strikethrough~.
+
+Here's a section that simply mentions links like https://www.peterbe.com for example.
+
+### Heading 3
+
+A bullet point list:
+
+- One
+- Two
+- Three
+
+This paragraph as a [link](/en-US/docs/Web).
+
+### To-do
+
+- [ ] One
+- [x] Two
+- [ ] Three
+
+### Tables
+
+| a | b  |  c |  d  |
+| - | :- | -: | :-: |
+
+## Still HTML
+
+<p>This is a paragraph with a link to <a href="/en-US/docs/Web">another page</a>.</p>
+
+<dl>
+  <dt>Key</dt>
+  <dd>Value</dd>
+</dl>
+
+```Javascript
+function foo() {
+  return undefined + 1;
+}
+```
+
+This next code block is generic
+
+```
+(+ (1 2))
+```
+
+And the last one is CSS:
+
+```css other stuff
+div#foo {
+  color: pink;
+}
+```
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 03e41dffdb41..11a83fadbf16 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -1299,6 +1299,31 @@ test("'lang' attribute should match the article", () => {
   expect($("article").attr("lang")).toBe("en-US");
 });
 
+test("basic markdown rendering", () => {
+  const builtFolder = path.join(buildRoot, "en-us", "docs", "markdown");
+  const htmlFile = path.join(builtFolder, "index.html");
+  const html = fs.readFileSync(htmlFile, "utf-8");
+  const $ = cheerio.load(html);
+  expect($("article h2[id]").length).toBe(2);
+  expect($("article h3[id]").length).toBe(3);
+  expect($("article p code").length).toBe(2);
+  expect($("article strong").length).toBe(1);
+  expect($("article em").length).toBe(1);
+  expect($("article ul li").length).toBe(6);
+  expect($('article a[href^="/"]').length).toBe(2);
+  expect($('article a[href^="#"]').length).toBe(5);
+  expect($("article pre").length).toBe(3);
+  expect($("article pre.notranslate").length).toBe(3);
+  expect($("article pre.css").hasClass("brush:")).toBe(true);
+  expect($("article pre.javascript").hasClass("brush:")).toBe(true);
+
+  // XXX This is currently broken! We need to figure out a better way to
+  // transform those ```css into `<pre class="brush: css">...`
+  // const jsonFile = path.join(builtFolder, "index.json");
+  // const { doc } = JSON.parse(fs.readFileSync(jsonFile));
+  // expect(Object.keys(doc.flaws).length).toBe(0);
+});
+
 test("unsafe HTML gets flagged as flaws and replace with its raw HTML", () => {
   const builtFolder = path.join(
     buildRoot,
diff --git a/yarn.lock b/yarn.lock
index a7ff0084d51c..2fff24a47415 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5253,6 +5253,11 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
+character-entities-html4@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125"
+  integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==
+
 character-entities-legacy@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
@@ -7327,6 +7332,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escodegen@^1.12.0:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
@@ -9153,6 +9163,11 @@ hast-util-from-parse5@^6.0.0:
     vfile "^4.0.0"
     web-namespaces "^1.0.0"
 
+hast-util-is-element@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz#3b3ed5159a2707c6137b48637fbfe068e175a425"
+  integrity sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ==
+
 hast-util-parse-selector@^2.0.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz#60c99d0b519e12ab4ed32e58f150ec3f61ed1974"
@@ -9174,6 +9189,38 @@ hast-util-raw@6.0.1:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
+hast-util-raw@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-6.0.2.tgz#0954c44e2e1c03dc5bb44c40ef5eee3185ebeabe"
+  integrity sha512-m7IlmqO8cytmG3EIMDMXUG8LjO2uyApWcxwL6apsGvikIClgykFg3UYps4rnt4kUpY3j8Mc7ANJ8zW6KPPLb+w==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    hast-util-from-parse5 "^6.0.0"
+    hast-util-to-parse5 "^6.0.0"
+    html-void-elements "^1.0.0"
+    parse5 "^6.0.0"
+    unist-util-position "^3.0.0"
+    vfile "^4.0.0"
+    web-namespaces "^1.0.0"
+    xtend "^4.0.0"
+    zwitch "^1.0.0"
+
+hast-util-to-html@^7.1.1:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-7.1.2.tgz#db677f0ee483658cea0eecc9dec30aba42b67111"
+  integrity sha512-pu73bvORzdF6XZgwl9eID/0RjBb/jtRfoGRRSykpR1+o9rCdiAHpgkSukZsQBRlIqMg6ylAcd7F0F7myJUb09Q==
+  dependencies:
+    ccount "^1.0.0"
+    comma-separated-tokens "^1.0.0"
+    hast-util-is-element "^1.0.0"
+    hast-util-whitespace "^1.0.0"
+    html-void-elements "^1.0.0"
+    property-information "^5.0.0"
+    space-separated-tokens "^1.0.0"
+    stringify-entities "^3.0.1"
+    unist-util-is "^4.0.0"
+    xtend "^4.0.0"
+
 hast-util-to-parse5@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz#1ec44650b631d72952066cea9b1445df699f8479"
@@ -9185,6 +9232,11 @@ hast-util-to-parse5@^6.0.0:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
+hast-util-whitespace@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz#e4fe77c4a9ae1cb2e6c25e02df0043d0164f6e41"
+  integrity sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==
+
 hastscript@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a"
@@ -11859,6 +11911,13 @@ markdown-escapes@^1.0.0:
   resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
   integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
 
+markdown-table@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b"
+  integrity sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==
+  dependencies:
+    repeat-string "^1.0.0"
+
 markdown-to-jsx@^6.11.4:
   version "6.11.4"
   resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.11.4.tgz#b4528b1ab668aef7fe61c1535c27e837819392c5"
@@ -11907,6 +11966,22 @@ mdast-util-definitions@^3.0.0:
   dependencies:
     unist-util-visit "^2.0.0"
 
+mdast-util-definitions@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2"
+  integrity sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==
+  dependencies:
+    unist-util-visit "^2.0.0"
+
+mdast-util-find-and-replace@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz#b7db1e873f96f66588c321f1363069abf607d1b5"
+  integrity sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==
+  dependencies:
+    escape-string-regexp "^4.0.0"
+    unist-util-is "^4.0.0"
+    unist-util-visit-parents "^3.0.0"
+
 mdast-util-from-markdown@^0.8.0:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.1.tgz#781371d493cac11212947226190270c15dc97116"
@@ -11917,6 +11992,48 @@ mdast-util-from-markdown@^0.8.0:
     micromark "~2.10.0"
     parse-entities "^2.0.0"
 
+mdast-util-gfm-autolink-literal@^0.1.0:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz#9c4ff399c5ddd2ece40bd3b13e5447d84e385fb7"
+  integrity sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==
+  dependencies:
+    ccount "^1.0.0"
+    mdast-util-find-and-replace "^1.1.0"
+    micromark "^2.11.3"
+
+mdast-util-gfm-strikethrough@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz#45eea337b7fff0755a291844fbea79996c322890"
+  integrity sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==
+  dependencies:
+    mdast-util-to-markdown "^0.6.0"
+
+mdast-util-gfm-table@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz#af05aeadc8e5ee004eeddfb324b2ad8c029b6ecf"
+  integrity sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==
+  dependencies:
+    markdown-table "^2.0.0"
+    mdast-util-to-markdown "~0.6.0"
+
+mdast-util-gfm-task-list-item@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz#70c885e6b9f543ddd7e6b41f9703ee55b084af10"
+  integrity sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==
+  dependencies:
+    mdast-util-to-markdown "~0.6.0"
+
+mdast-util-gfm@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz#8ecddafe57d266540f6881f5c57ff19725bd351c"
+  integrity sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==
+  dependencies:
+    mdast-util-gfm-autolink-literal "^0.1.0"
+    mdast-util-gfm-strikethrough "^0.2.0"
+    mdast-util-gfm-table "^0.1.0"
+    mdast-util-gfm-task-list-item "^0.1.0"
+    mdast-util-to-markdown "^0.6.1"
+
 mdast-util-to-hast@9.1.2:
   version "9.1.2"
   resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-9.1.2.tgz#10fa5ed9d45bf3755891e5801d0f32e2584a9423"
@@ -11931,6 +12048,20 @@ mdast-util-to-hast@9.1.2:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
+mdast-util-to-hast@^10.0.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz#61875526a017d8857b71abc9333942700b2d3604"
+  integrity sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    mdast-util-definitions "^4.0.0"
+    mdurl "^1.0.0"
+    unist-builder "^2.0.0"
+    unist-util-generated "^1.0.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+
 mdast-util-to-markdown@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.5.3.tgz#e05c54a3ccd239bab63c48a1e5b5747f0dcd5aca"
@@ -11943,11 +12074,28 @@ mdast-util-to-markdown@^0.5.0:
     repeat-string "^1.0.0"
     zwitch "^1.0.0"
 
+mdast-util-to-markdown@^0.6.0, mdast-util-to-markdown@^0.6.1, mdast-util-to-markdown@~0.6.0:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz#b33f67ca820d69e6cc527a93d4039249b504bebe"
+  integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    longest-streak "^2.0.0"
+    mdast-util-to-string "^2.0.0"
+    parse-entities "^2.0.0"
+    repeat-string "^1.0.0"
+    zwitch "^1.0.0"
+
 mdast-util-to-string@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527"
   integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==
 
+mdast-util-to-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
+  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
+
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
@@ -12069,6 +12217,59 @@ microevent.ts@~0.1.1:
   resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
   integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==
 
+micromark-extension-gfm-autolink-literal@~0.5.0:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.6.tgz#406a58914d7a9cc6fb4cfafccc61a8ca36d7a12a"
+  integrity sha512-nHbR1NUOVhmlZNsnhE5B7WJzL7Xd8lc888z4AF27IpHMtO3NstclZmbrMI+AcdTPpO1wuGVwlK1Cnq+n8Sxlrw==
+  dependencies:
+    micromark "~2.11.3"
+
+micromark-extension-gfm-strikethrough@~0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz#96cb83356ff87bf31670eefb7ad7bba73e6514d1"
+  integrity sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm-table@~0.4.0:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz#4d49f1ce0ca84996c853880b9446698947f1802b"
+  integrity sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm-tagfilter@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz#d9f26a65adee984c9ccdd7e182220493562841ad"
+  integrity sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==
+
+micromark-extension-gfm-task-list-item@~0.3.0:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz#d90c755f2533ed55a718129cee11257f136283b8"
+  integrity sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==
+  dependencies:
+    micromark "~2.11.0"
+
+micromark-extension-gfm@^0.3.0:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz#36d1a4c089ca8bdfd978c9bd2bf1a0cb24e2acfe"
+  integrity sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==
+  dependencies:
+    micromark "~2.11.0"
+    micromark-extension-gfm-autolink-literal "~0.5.0"
+    micromark-extension-gfm-strikethrough "~0.6.5"
+    micromark-extension-gfm-table "~0.4.0"
+    micromark-extension-gfm-tagfilter "~0.3.0"
+    micromark-extension-gfm-task-list-item "~0.3.0"
+
+micromark@^2.11.3, micromark@~2.11.0, micromark@~2.11.3:
+  version "2.11.4"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
+  integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
+  dependencies:
+    debug "^4.0.0"
+    parse-entities "^2.0.0"
+
 micromark@~2.10.0:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.10.1.tgz#cd73f54e0656f10e633073db26b663a221a442a7"
@@ -15238,6 +15439,20 @@ regjsparser@^0.6.4:
   dependencies:
     jsesc "~0.5.0"
 
+rehype-raw@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/rehype-raw/-/rehype-raw-5.0.0.tgz#3688e3e1132e958761e677a1b9b2ba358a465af8"
+  integrity sha512-q/MOBj4fs1WF/LSCh5uOtNhnm5OESuDcSvq1mDQP4/2t6Q52E9MHeVoLeMy9vOn93BEcgVBm4FCokcK2iXRDvA==
+  dependencies:
+    hast-util-raw "^6.0.0"
+
+rehype-stringify@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/rehype-stringify/-/rehype-stringify-8.0.0.tgz#9b6afb599bcf3165f10f93fc8548f9a03d2ec2ba"
+  integrity sha512-VkIs18G0pj2xklyllrPSvdShAV36Ff3yE5PUO9u36f6+2qJFnn22Z5gKwBOwgXviux4UC7K+/j13AnZfPICi/g==
+  dependencies:
+    hast-util-to-html "^7.1.1"
+
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -15259,6 +15474,14 @@ remark-footnotes@2.0.0:
   resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f"
   integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==
 
+remark-gfm@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-1.0.0.tgz#9213643001be3f277da6256464d56fd28c3b3c0d"
+  integrity sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==
+  dependencies:
+    mdast-util-gfm "^0.1.0"
+    micromark-extension-gfm "^0.3.0"
+
 remark-mdx@1.6.21:
   version "1.6.21"
   resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.21.tgz#0c1a7e042e50938ff89ad8dd7e8e219d4b0404ce"
@@ -15295,13 +15518,20 @@ remark-parse@8.0.3:
     vfile-location "^3.0.0"
     xtend "^4.0.1"
 
-remark-parse@^9.0.0:
+remark-parse@9.0.0, remark-parse@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
   integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
   dependencies:
     mdast-util-from-markdown "^0.8.0"
 
+remark-rehype@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-8.0.0.tgz#5a8afc8262a59d205fba21dafb27a673fb3b92fa"
+  integrity sha512-gVvOH02TMFqXOWoL6iXU7NXMsDJguNkNuMrzfkQeA4V6WCyHQnOKptn+IQBVVPuIH2sMJBwo8hlrmtn1MLTh9w==
+  dependencies:
+    mdast-util-to-hast "^10.0.0"
+
 remark-slug@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-6.0.0.tgz#2b54a14a7b50407a5e462ac2f376022cce263e2c"
@@ -16580,6 +16810,15 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-entities@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.1.0.tgz#b8d3feac256d9ffcc9fa1fefdcf3ca70576ee903"
+  integrity sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==
+  dependencies:
+    character-entities-html4 "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    xtend "^4.0.0"
+
 stringify-object@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
@@ -17592,6 +17831,18 @@ unified@9.2.0, unified@^9.1.0:
     trough "^1.0.0"
     vfile "^4.0.0"
 
+unified@9.2.1:
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz#ae18d5674c114021bfdbdf73865ca60f410215a3"
+  integrity sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==
+  dependencies:
+    bail "^1.0.0"
+    extend "^3.0.0"
+    is-buffer "^2.0.0"
+    is-plain-obj "^2.0.0"
+    trough "^1.0.0"
+    vfile "^4.0.0"
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"

From 9fcdad97e7503309f031e52f5a9d4235ef31d0ca Mon Sep 17 00:00:00 2001
From: Ryan Johnson <rjohnson@mozilla.com>
Date: Wed, 24 Mar 2021 16:08:20 -0700
Subject: [PATCH 065/288] temporarily disable pruning (#3324)

---
 .github/workflows/dev-build.yml   | 4 +++-
 .github/workflows/prod-build.yml  | 4 +++-
 .github/workflows/stage-build.yml | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index 647da09e1673..6e826fec02d2 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -204,7 +204,9 @@ jobs:
           # XXX would be nice to validate here that $DEPLOYER_BUCKET_PREFIX is truthy
           echo "DEPLOYER_BUCKET_PREFIX=$DEPLOYER_BUCKET_PREFIX"
 
-          poetry run deployer upload --prune --archived-files ../content/archived.txt ../client/build
+          # Prune again once https://github.com/mdn/yari/issues/3323 is resolved.
+          # poetry run deployer upload --prune --archived-files ../content/archived.txt ../client/build
+          poetry run deployer upload ../client/build
           poetry run deployer update-lambda-functions ./aws-lambda
           # TODO
           # Execute command to tell the Dev CloudFront distribution to use the
diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
index 54ea3f46eef3..a4d21ac71729 100644
--- a/.github/workflows/prod-build.yml
+++ b/.github/workflows/prod-build.yml
@@ -227,7 +227,9 @@ jobs:
           # XXX would be nice to validate here that $DEPLOYER_BUCKET_PREFIX is truthy
           echo "DEPLOYER_BUCKET_PREFIX=$DEPLOYER_BUCKET_PREFIX"
 
-          poetry run deployer upload --prune --archived-files ../content/archived.txt ../client/build
+          # Prune again once https://github.com/mdn/yari/issues/3323 is resolved.
+          # poetry run deployer upload --prune --archived-files ../content/archived.txt ../client/build
+          poetry run deployer upload ../client/build
           poetry run deployer update-lambda-functions ./aws-lambda
 
           # TODO: Depending on how long the upload takes, consider switching to
diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
index 7c3e89fc70b2..824fce3eda64 100644
--- a/.github/workflows/stage-build.yml
+++ b/.github/workflows/stage-build.yml
@@ -240,7 +240,9 @@ jobs:
           # XXX would be nice to validate here that $DEPLOYER_BUCKET_PREFIX is truthy
           echo "DEPLOYER_BUCKET_PREFIX=$DEPLOYER_BUCKET_PREFIX"
 
-          poetry run deployer upload --prune --archived-files ../content/archived.txt ../client/build
+          # Prune again once https://github.com/mdn/yari/issues/3323 is resolved.
+          # poetry run deployer upload --prune --archived-files ../content/archived.txt ../client/build
+          poetry run deployer upload ../client/build
           poetry run deployer update-lambda-functions ./aws-lambda
 
           # TODO: Depending on how long the upload takes, consider switching to

From d9556b4c16bfc701f7e4af14b960e67a7519b232 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Mar 2021 05:54:27 +0000
Subject: [PATCH 066/288] build(deps): bump rehype-raw from 5.0.0 to 5.1.0
 (#3328)

---
 package.json |  2 +-
 yarn.lock    | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 147525b11b44..61128f0db0af 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "open-editor": "3.0.0",
     "prismjs": "1.23.0",
     "read-chunk": "3.2.0",
-    "rehype-raw": "5.0.0",
+    "rehype-raw": "5.1.0",
     "rehype-stringify": "8.0.0",
     "remark-gfm": "1.0.0",
     "remark-parse": "9.0.0",
diff --git a/yarn.lock b/yarn.lock
index 2fff24a47415..b341e488a181 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9189,10 +9189,10 @@ hast-util-raw@6.0.1:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
-hast-util-raw@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-6.0.2.tgz#0954c44e2e1c03dc5bb44c40ef5eee3185ebeabe"
-  integrity sha512-m7IlmqO8cytmG3EIMDMXUG8LjO2uyApWcxwL6apsGvikIClgykFg3UYps4rnt4kUpY3j8Mc7ANJ8zW6KPPLb+w==
+hast-util-raw@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-6.1.0.tgz#e16a3c2642f65cc7c480c165400a40d604ab75d0"
+  integrity sha512-5FoZLDHBpka20OlZZ4I/+RBw5piVQ8iI1doEvffQhx5CbCyTtP8UCq8Tw6NmTAMtXgsQxmhW7Ly8OdFre5/YMQ==
   dependencies:
     "@types/hast" "^2.0.0"
     hast-util-from-parse5 "^6.0.0"
@@ -9200,6 +9200,7 @@ hast-util-raw@^6.0.0:
     html-void-elements "^1.0.0"
     parse5 "^6.0.0"
     unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
     vfile "^4.0.0"
     web-namespaces "^1.0.0"
     xtend "^4.0.0"
@@ -15439,12 +15440,12 @@ regjsparser@^0.6.4:
   dependencies:
     jsesc "~0.5.0"
 
-rehype-raw@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/rehype-raw/-/rehype-raw-5.0.0.tgz#3688e3e1132e958761e677a1b9b2ba358a465af8"
-  integrity sha512-q/MOBj4fs1WF/LSCh5uOtNhnm5OESuDcSvq1mDQP4/2t6Q52E9MHeVoLeMy9vOn93BEcgVBm4FCokcK2iXRDvA==
+rehype-raw@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/rehype-raw/-/rehype-raw-5.1.0.tgz#66d5e8d7188ada2d31bc137bc19a1000cf2c6b7e"
+  integrity sha512-MDvHAb/5mUnif2R+0IPCYJU8WjHa9UzGtM/F4AVy5GixPlDZ1z3HacYy4xojDU+uBa+0X/3PIfyQI26/2ljJNA==
   dependencies:
-    hast-util-raw "^6.0.0"
+    hast-util-raw "^6.1.0"
 
 rehype-stringify@8.0.0:
   version "8.0.0"

From a126464f045b73f976d5c8fb161b767ba414bc6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Mar 2021 06:22:35 +0000
Subject: [PATCH 067/288] build(deps): bump boto3 from 1.17.35 to 1.17.36 in
 /deployer (#3329)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index e2dfce50fc2c..9ec261a6acc0 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.35"
+version = "1.17.36"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.35,<1.21.0"
+botocore = ">=1.20.36,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.35"
+version = "1.20.36"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -533,7 +533,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "b6d5cd2cd06cfb44fea389eda6ce1f4225c4c70bc793d30bbb0649919745a256"
+content-hash = "e2fa9c909418cba92769c70cfef2d8ee95dca4319a64574a2d9be6c7b5674bd6"
 
 [metadata.files]
 appdirs = [
@@ -552,12 +552,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.35-py2.py3-none-any.whl", hash = "sha256:1e6e06b2f1eee5a76acdde1e7b4f57c93c1bf2905341207d74f2a140ce060cd8"},
-    {file = "boto3-1.17.35.tar.gz", hash = "sha256:40e84a5f7888924db74a2710dbe48d066b51fe1f5549efaffe90e6efe813f37b"},
+    {file = "boto3-1.17.36-py2.py3-none-any.whl", hash = "sha256:16ca7a34eb88138e0d1ae2532e17975eef578aa1754e2d209ad41a8dfce059ce"},
+    {file = "boto3-1.17.36.tar.gz", hash = "sha256:75f59fb3d764a381bb0108cb5036b398d0c8a1cf719e6b5aadbc5a53a1fd735e"},
 ]
 botocore = [
-    {file = "botocore-1.20.35-py2.py3-none-any.whl", hash = "sha256:e34bbb7d7de154c2ff2a73ae0691c601a69c5bda887374c8a6a23072380b07a4"},
-    {file = "botocore-1.20.35.tar.gz", hash = "sha256:9119ffb231145ffadd55391c9356dcdb18e3de65c3a7c82844634e949f0ca5a0"},
+    {file = "botocore-1.20.36-py2.py3-none-any.whl", hash = "sha256:9ce33bd4175d58c5fdeb8e35052aa370aff74b347227e65ddc3f4fa01ef0686f"},
+    {file = "botocore-1.20.36.tar.gz", hash = "sha256:148f5d7d48c54ed450831e5dd4d13284b2418955b6d99db23a3d9c4c6cb515c8"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 08b0fa86ec7c..591d90166f45 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.35"
+boto3 = "^1.17.36"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 19986f7fbba1b181b0005aa51008d70c60725d9e Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 25 Mar 2021 08:31:17 -0400
Subject: [PATCH 068/288] Settings page, briefly, says you're not signed in
 (#3325)

Fixes #3319
---
 client/src/user-context.tsx | 19 +------------------
 server/index.js             |  4 ++--
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/client/src/user-context.tsx b/client/src/user-context.tsx
index 36d472ff4afa..ce4dd6b97b08 100644
--- a/client/src/user-context.tsx
+++ b/client/src/user-context.tsx
@@ -27,23 +27,6 @@ export type UserData = {
   };
 };
 
-const defaultUserData: UserData = {
-  username: null,
-  isAuthenticated: false,
-  isBetaTester: false,
-  isStaff: false,
-  isSuperuser: false,
-  avatarUrl: null,
-  isSubscriber: false,
-  subscriberNumber: null,
-  email: null,
-  waffle: {
-    flags: {},
-    switches: {},
-    samples: {},
-  },
-};
-
 const UserDataContext = React.createContext<UserData | null>(null);
 
 export function UserDataProvider(props: { children: React.ReactNode }) {
@@ -74,7 +57,7 @@ export function UserDataProvider(props: { children: React.ReactNode }) {
   );
 
   return (
-    <UserDataContext.Provider value={data ? data : defaultUserData}>
+    <UserDataContext.Provider value={data || null}>
       {props.children}
     </UserDataContext.Provider>
   );
diff --git a/server/index.js b/server/index.js
index f6f0aeafc90a..928fc826e5fb 100644
--- a/server/index.js
+++ b/server/index.js
@@ -77,8 +77,8 @@ const proxy = FAKE_V1_API
           : "http://"
       }${PROXY_HOSTNAME}`,
       changeOrigin: true,
-      proxyTimeout: 3000,
-      timeout: 3000,
+      proxyTimeout: 10000,
+      timeout: 10000,
     });
 
 app.use("/api/v1", proxy);

From 48f4bbd695c8ef4ba7ee40a5c5c172371a15a18a Mon Sep 17 00:00:00 2001
From: wbamberg <will@bootbonnet.ca>
Date: Thu, 25 Mar 2021 08:11:08 -0700
Subject: [PATCH 069/288] New css sidebar (#3228)

* Change CSP2 (1.1) spec URL to W3C Rec URL (#3040)

* New CSS sidebar

* Choose option 2 (show guides for all modules that have any)

* Remove cta and unused vars; use locale-sensitive URLs

* Indentation changes

* Use smartlink

* Don't need to localize URLs

* Separate pseudo-classes and pseudo-elements

Co-authored-by: Michael[tm] Smith <mike@w3.org>
Co-authored-by: Will <>
---
 kumascript/macros/CSSRef.ejs    | 947 +++++++++++++++++++++++---------
 kumascript/macros/SpecData.json |   2 +-
 2 files changed, 688 insertions(+), 261 deletions(-)

diff --git a/kumascript/macros/CSSRef.ejs b/kumascript/macros/CSSRef.ejs
index e1f1a9d09739..010c002b1d3b 100644
--- a/kumascript/macros/CSSRef.ejs
+++ b/kumascript/macros/CSSRef.ejs
@@ -1,283 +1,710 @@
 <%
-// CSS Sidebar
 
-var slug = env.slug;
-var locale = env.locale;
-var pageTags = env.tags;
-var title = env.title;
-var CSSHref = '/' + locale + '/docs/Web/CSS';
-var CSSRefHref = '/' + locale + '/docs/Web/CSS/Reference';
-var output = "";
-
-// slug is not available in preview mode.
-if (slug) {
-    var name = slug.replace('Web/CSS/','').split('/')[0];
-    var hasTag = page.hasTag;
-    var htmlEscape = kuma.htmlEscape;
-    var rtlLocales = ['ar', 'he', 'fa'];
-
-    var data = require('mdn-data/css');
-    var commonl10n = JSON.parse(await template('L10n:Common'));
-    var cssl10n = JSON.parse(await template('L10n:CSS'));
-
-    var text = {
-        'Properties': mdn.getLocalString(commonl10n, 'Properties'),
-        'translate': mdn.getLocalString(commonl10n, '[Translate]'),
-        'title': mdn.getLocalString(commonl10n, 'TranslationCTA'),
-        'css_ref_title': mdn.getLocalString(cssl10n, 'css_ref_title'),
-        'at_rules': mdn.getLocalString(cssl10n, 'at_rules'),
-        'types': mdn.getLocalString(cssl10n, 'types'),
-        'Guides': mdn.getLocalString(commonl10n, 'Guides'),
-        'tag_selectors':  mdn.getLocalString(cssl10n, 'tag_selectors'),
-        'Basic Selectors': mdn.getLocalString(cssl10n, 'Basic Selectors'),
-        'Pseudo-classes': mdn.getLocalString(cssl10n, 'Pseudo-classes'),
-        'Pseudo-elements': mdn.getLocalString(cssl10n, 'Pseudo-elements'),
-        'Combinators': mdn.getLocalString(cssl10n, 'Combinators')
-    }
-
-    function isAtRule(foo) {
-      return foo.indexOf('@') !== -1;
-    }
-
-    function isType(foo) {
-      return foo.indexOf('<') !== -1 && foo.indexOf('>') !== -1;
-    }
-
-    function containsTag(tagList, tag) {
-        if (!tagList || typeof tagList == 'undefined') return 0;
-        tag = tag.toLowerCase();
-        for (var i = 0, len = tagList.length; i < len; i++) {
-            if (tagList[i].toLowerCase() == tag) return 1;
-        }
-        return 0;
-    }
-
-    var group = [];
-    var isSelector = containsTag(pageTags, text['tag_selectors']) || slug.indexOf(':') !== -1;
-    var isOverviewPage = slug.indexOf("_") !== -1 && !isType(title);
-
-    if (isOverviewPage && !isSelector) {
-      group.push(name.replace(/_/g, ' '));
-    } else if (isSelector) {
-      group.push('CSS Selectors');
-    } else {
-        name = name.toLowerCase();
-        // Find group of this page in CSSData
-        if (isAtRule(slug) && data.atRules[name] && data.atRules[name].groups) {
-            group = group.concat(data.atRules[name].groups);
-        } else if (data.properties[name] && data.properties[name].groups) {
-            group = group.concat(data.properties[name].groups);
-        } else if (isType(title)) {
-            var cleanType = title;
-            if (!(cleanType in data.types)) {
-                // https://github.com/mdn/data/pull/81 was merged
-                cleanType = title.replace('<', '').replace('>', '');
-            }
-            if (data.types[cleanType] && data.types[cleanType].groups) {
-                group = group.concat(data.types[cleanType].groups);
-            }
-        }
-    }
+const text = mdn.localStringMap({
+  'en-US': {
+    'Learn_CSS': 'Learn CSS',
+    'CSS_first_steps': 'CSS first steps',
+       'CSS_first_steps_overview': 'CSS first steps overview',
+       'What_is_CSS':  'What is CSS?',
+       'Getting_started_with_CSS': 'Getting started with CSS',
+       'How_CSS_is_structured': 'How CSS is structured',
+       'How_CSS_works': 'How CSS works',
+       'Using_your_new_knowledge': 'Using your new knowledge',
+     'CSS_building_blocks': 'CSS building blocks',
+       'CSS_building_blocks_overview': 'CSS building blocks overview',
+       'Cascade_and_inheritance': 'Cascade and inheritance',
+       'CSS_selectors': 'CSS selectors',
+       'The_box_model': 'The box model',
+       'Backgrounds_and_borders': 'Backgrounds and borders',
+       'Handling_different_text_directions': 'Handling different text directions',
+       'Overflowing_content': 'Overflowing content',
+       'Values_and_units': 'Values and units',
+       'Sizing_items_in_CSS': 'Sizing items in CSS',
+       'Images_media_and_form_elements': 'Images, media, and form elements',
+       'Styling_tables': 'Styling tables',
+       'Debugging_CSS': 'Debugging CSS',
+       'Organizing_your_CSS': 'Organizing your CSS',
+     'Styling_text': 'Styling text',
+       'Styling_text_overview': 'Styling text overview',
+       'Fundamental_text_and_font_styling': 'Fundamental text and font styling',
+       'Styling_lists': 'Styling lists',
+       'Styling_links': 'Styling links',
+       'Web_fonts': 'Web fonts',
+       'Assessment_typesetting_a_community_school_homepage': 'Assessment: Typesetting a community school homepage',
+     'CSS_layout': 'CSS layout',
+       'CSS_layout_overview': 'CSS layout overview',
+       'Layout_introduction' : 'Introduction to CSS layout',
+       'Normal_Flow' : 'Normal Flow',
+       'Flexbox': 'Flexbox',
+       'Grids' : 'Grids',
+       'Floats': 'Floats',
+       'Positioning': 'Positioning',
+       'Multiple-column_Layout': 'Multiple-column Layout',
+       'Responsive_design': 'Responsive design',
+       'Media_queries': 'Beginner\'s guide to media queries',
+       'Legacy_Layout_Methods': 'Legacy Layout Methods',
+       'Supporting_Older_Browsers': 'Supporting Older Browsers',
+       'Fundamental_Layout_Comprehension' : 'Fundamental Layout Comprehension',
+    'Color_picker_tool': 'Color picker',
+    'Box-shadow_generator': 'Box shadow generator',
+    'Border-image_generator' : 'Border image generator',
+  },
+  'de': {
+    'Learn_CSS': 'Learn CSS',
+      'CSS_first_steps': 'CSS first steps',
+        'CSS_first_steps_overview': 'CSS first steps overview',
+        'What_is_CSS':  'What is CSS?',
+        'Getting_started_with_CSS': 'Getting started with CSS',
+        'How_CSS_is_structured': 'How CSS is structured',
+        'How_CSS_works': 'How CSS works',
+        'Using_your_new_knowledge': 'Using your new knowledge',
+      'CSS_building_blocks': 'CSS building blocks',
+        'CSS_building_blocks_overview': 'CSS building blocks overview',
+        'Cascade_and_inheritance': 'Cascade and inheritance',
+        'CSS_selectors': 'CSS selectors',
+        'The_box_model': 'The box model',
+        'Backgrounds_and_borders': 'Backgrounds and borders',
+        'Handling_different_text_directions': 'Handling different text directions',
+        'Overflowing_content': 'Overflowing content',
+        'Values_and_units': 'Values and units',
+        'Sizing_items_in_CSS': 'Sizing items in CSS',
+        'Images_media_and_form_elements': 'Images, media, and form elements',
+        'Styling_tables': 'Styling tables',
+        'Debugging_CSS': 'Debugging CSS',
+        'Organizing_your_CSS': 'Organizing your CSS',
+      'Styling_text': 'Gestaltung von Text',
+        'Styling_text_overview': 'Gestaltung von Text — Übersicht',
+        'Fundamental_text_and_font_styling': 'Texte gestalten',
+        'Styling_lists': 'Listen gestalten',
+        'Styling_links': 'Links gestalten',
+        'Web_fonts': 'Web-Schriftarten',
+        'Assessment_typesetting_a_community_school_homepage': 'Aufgabe: Webseite für eine Schule',
+      'CSS_layout': 'Layout mit CSS',
+        'CSS_layout_overview': 'Layout mit CSS — Überblick',
+        'Normal_Flow' : 'Normal Flow',
+        'Flexbox': 'Flexboxen',
+        'Grids' : 'Grid',
+        'Floats': 'Float',
+        'Positioning': 'Positionierung',
+        'Multiple-column_Layout': 'Multiple-column Layout',
+        'Responsive_design': 'Responsive design',
+        'Media_queries': 'Beginner\'s guide to media queries',
+        'Legacy_Layout_Methods': 'Legacy Layout Methods',
+        'Supporting_Older_Browsers': 'Supporting Older Browsers',
+        'Fundamental_Layout_Comprehension': 'Fundamental Layout Comprehension',
+  },
+  'pt-BR': {
+    'Learn_CSS': 'Learn CSS',
+      'CSS_first_steps': 'CSS - primeiros passos',
+        'CSS_first_steps_overview': 'Visão geral das primeiras etapas com CSS',
+        'What_is_CSS':  'O que é CSS?',
+        'Getting_started_with_CSS': 'Iniciando com CSS',
+        'How_CSS_is_structured': 'como CSS é estruturado',
+        'How_CSS_works': 'Como CSS funciona',
+        'Using_your_new_knowledge': 'Usando seu novo Conhecimento',
+      'CSS_building_blocks': 'CSS building blocks',
+        'CSS_building_blocks_overview': 'CSS building blocks overview',
+        'Cascade_and_inheritance': 'Cascade and inheritance',
+        'CSS_selectors': 'seletores CSS',
+        'The_box_model': 'The box model',
+        'Backgrounds_and_borders': 'Backgrounds and borders',
+        'Handling_different_text_directions': 'Tratamento de diferentes direções de texto',
+        'Overflowing_content': 'Overflowing content',
+        'Values_and_units': 'Valores e unidades',
+        'Sizing_items_in_CSS': 'Dimensionando itens em CSS',
+        'Images_media_and_form_elements': 'Images, media, and form elements',
+        'Styling_tables': 'Estilização de tabelas',
+        'Debugging_CSS': 'Debugging CSS',
+        'Organizing_your_CSS': 'Organize seu CSS',
+      'Styling_text': 'Estilização de textos',
+        'Styling_text_overview': 'Visão geral da Estilização de textos',
+        'Fundamental_text_and_font_styling': 'Fundamentos da estilização de textos e fontes',
+        'Styling_lists': 'Estilização de listas',
+        'Styling_links': 'Estilização de links',
+        'Web_fonts': 'Fontes Web',
+        'Assessment_typesetting_a_community_school_homepage': 'Avaliação: Tipografia para a página inicial da escola pública local',
+      'CSS_layout': 'Esquemas CSS',
+        'CSS_layout_overview': 'Visão geral de esquemas CSS',
+        'Layout_introduction' : 'Introdução a esquemas CSS',
+        'Normal_Flow': 'Normal Flow',
+        'Flexbox': 'Flexbox',
+        'Grids' : 'Grids',
+        'Floats': '"Floats" - Flutuando elementos',
+        'Positioning': 'Posicionamento',
+        'Multiple-column_Layout': 'Multiple-column Layout',
+        'Responsive_design': 'Responsive design',
+        'Media_queries': 'Beginner\'s guide to media queries',
+        'Legacy_Layout_Methods': 'Legacy Layout Methods',
+        'Supporting_Older_Browsers': 'Supporting Older Browsers',
+        'Fundamental_Layout_Comprehension': 'Fundamental Layout Comprehension',
+  },
+  'ru': {
+    'Learn_CSS': 'Learn CSS',
+      'CSS_first_steps': 'CSS first steps',
+        'CSS_first_steps_overview': 'CSS first steps overview',
+        'What_is_CSS':  'What is CSS?',
+        'Getting_started_with_CSS': 'Getting started with CSS',
+        'How_CSS_is_structured': 'How CSS is structured',
+        'How_CSS_works': 'How CSS works',
+        'Using_your_new_knowledge': 'Using your new knowledge',
+      'CSS_building_blocks': 'CSS building blocks',
+        'CSS_building_blocks_overview': 'CSS building blocks overview',
+        'Cascade_and_inheritance': 'Cascade and inheritance',
+        'CSS_selectors': 'CSS selectors',
+        'The_box_model': 'The box model',
+        'Backgrounds_and_borders': 'Backgrounds and borders',
+        'Handling_different_text_directions': 'Handling different text directions',
+        'Overflowing_content': 'Overflowing content',
+        'Values_and_units': 'Values and units',
+        'Sizing_items_in_CSS': 'Sizing items in CSS',
+        'Images_media_and_form_elements': 'Images, media, and form elements',
+        'Styling_tables': 'Styling tables',
+        'Debugging_CSS': 'Debugging CSS',
+        'Organizing_your_CSS': 'Organizing your CSS',
+      'Styling_text': 'Стилизирование текста',
+        'Styling_text_overview': 'Стилизирование текста',
+        'Fundamental_text_and_font_styling': 'Основы стилизирования текста и шрифта',
+        'Styling_lists': 'Стилизирование списков',
+        'Styling_links': 'Стилизирование ссылок',
+        'Web_fonts': 'Веб-шрифты',
+        'Assessment_typesetting_a_community_school_homepage': 'Задание: Стилизирование школьного сайта',
+      'CSS_layout': 'CSS макет',
+        'CSS_layout_overview': 'CSS макет',
+        'Normal_Flow': 'Normal Flow',
+        'Flexbox': 'Flexbox',
+        'Grids' : 'Сетки',
+        'Floats': 'Float',
+        'Positioning': 'Позиционирование',
+        'Multiple-column_Layout': 'Multiple-column Layout',
+        'Responsive_design': 'Responsive design',
+        'Media_queries': 'Beginner\'s guide to media queries',
+        'Legacy_Layout_Methods': 'Legacy Layout Methods',
+        'Supporting_Older_Browsers': 'Supporting Older Browsers',
+        'Fundamental_Layout_Comprehension': 'Fundamental Layout Comprehension',
+  },
+  'zh-CN': {
+    'Learn_CSS': 'Learn CSS',
+      'CSS_first_steps': 'CSS first steps',
+        'CSS_first_steps_overview': 'CSS first steps overview',
+        'What_is_CSS':  'What is CSS?',
+        'Getting_started_with_CSS': 'Getting started with CSS',
+        'How_CSS_is_structured': 'How CSS is structured',
+        'How_CSS_works': 'How CSS works',
+        'Using_your_new_knowledge': 'Using your new knowledge',
+      'CSS_building_blocks': 'CSS building blocks',
+        'CSS_building_blocks_overview': 'CSS building blocks overview',
+        'Cascade_and_inheritance': 'Cascade and inheritance',
+        'CSS_selectors': 'CSS selectors',
+        'The_box_model': 'The box model',
+        'Backgrounds_and_borders': 'Backgrounds and borders',
+        'Handling_different_text_directions': 'Handling different text directions',
+        'Overflowing_content': 'Overflowing content',
+        'Values_and_units': 'Values and units',
+        'Sizing_items_in_CSS': 'Sizing items in CSS',
+        'Images_media_and_form_elements': 'Images, media, and form elements',
+        'Styling_tables': 'Styling tables',
+        'Debugging_CSS': 'Debugging CSS',
+        'Organizing_your_CSS': 'Organizing your CSS',
+      'Styling_text': '样式化文字',
+        'Styling_text_overview': '样式化文字概述',
+        'Fundamental_text_and_font_styling': '基础文字与字体样式化',
+        'Styling_lists': '样式化列表',
+        'Styling_links': '样式化链接',
+        'Web_fonts': 'Web 字体',
+        'Assessment_typesetting_a_community_school_homepage': '作业：排版社区大学首页',
+      'CSS_layout': 'CSS 排版概述',
+        'CSS_layout_overview': 'CSS 版面配置概述',
+        'Normal_Flow': 'Normal Flow',
+        'Flexbox': '弹性区块',
+        'Grids' : '网格',
+        'Floats': '浮动',
+        'Positioning': '定位',
+        'Multiple-column_Layout': 'Multiple-column Layout',
+        'Responsive_design': 'Responsive design',
+        'Media_queries': 'Beginner\'s guide to media queries',
+        'Legacy_Layout_Methods': 'Legacy Layout Methods',
+        'Supporting_Older_Browsers': 'Supporting Older Browsers',
+        'Fundamental_Layout_Comprehension': 'Fundamental Layout Comprehension',
+  },
+  'zh-TW': {
+    'Learn_CSS': 'Learn CSS',
+      'CSS_first_steps': 'CSS first steps',
+        'CSS_first_steps_overview': 'CSS first steps overview',
+        'What_is_CSS':  'What is CSS?',
+        'Getting_started_with_CSS': 'Getting started with CSS',
+        'How_CSS_is_structured': 'How CSS is structured',
+        'How_CSS_works': 'How CSS works',
+        'Using_your_new_knowledge': 'Using your new knowledge',
+      'CSS_building_blocks': 'CSS building blocks',
+        'CSS_building_blocks_overview': 'CSS building blocks overview',
+        'Cascade_and_inheritance': 'Cascade and inheritance',
+        'CSS_selectors': 'CSS selectors',
+        'The_box_model': 'The box model',
+        'Backgrounds_and_borders': 'Backgrounds and borders',
+        'Handling_different_text_directions': 'Handling different text directions',
+        'Overflowing_content': 'Overflowing content',
+        'Values_and_units': 'Values and units',
+        'Sizing_items_in_CSS': 'Sizing items in CSS',
+        'Images_media_and_form_elements': 'Images, media, and form elements',
+        'Styling_tables': 'Styling tables',
+        'Debugging_CSS': 'Debugging CSS',
+        'Organizing_your_CSS': 'Organizing your CSS',
+      'Styling_text': '樣式化文字',
+        'Styling_text_overview': '樣式化文字概述',
+        'Fundamental_text_and_font_styling': '基礎的文字與字型樣式化',
+        'Styling_lists': '樣式化列表',
+        'Styling_links': '樣式化連結',
+        'Web_fonts': 'Web 字型',
+        'Assessment_typesetting_a_community_school_homepage': '親合度：設定社區大學首頁的版面',
+      'CSS_layout': 'CSS 版面配置',
+        'CSS_layout_overview': 'CSS 版面配置概述',
+        'Normal_Flow': 'Normal Flow',
+        'Flexbox': '彈性區塊',
+        'Grids' : '格線',
+        'Floats': '浮動',
+        'Positioning': '定位',
+        'Multiple-column_Layout': 'Multiple-column Layout',
+        'Responsive_design': 'Responsive design',
+        'Media_queries': 'Beginner\'s guide to media queries',
+        'Legacy_Layout_Methods': 'Legacy Layout Methods',
+        'Supporting_Older_Browsers': 'Supporting Older Browsers',
+        'Fundamental_Layout_Comprehension': 'Fundamental Layout Comprehension',
+  },
+  'ja': {
+    'Learn_CSS': 'Learn CSS',
+      'CSS_first_steps': 'CSS first steps',
+        'CSS_first_steps_overview': 'CSS first steps overview',
+        'What_is_CSS':  'What is CSS?',
+        'Getting_started_with_CSS': 'Getting started with CSS',
+        'How_CSS_is_structured': 'How CSS is structured',
+        'How_CSS_works': 'How CSS works',
+        'Using_your_new_knowledge': 'Using your new knowledge',
+      'CSS_building_blocks': 'CSS building blocks',
+        'CSS_building_blocks_overview': 'CSS building blocks overview',
+        'Cascade_and_inheritance': 'Cascade and inheritance',
+        'CSS_selectors': 'CSS selectors',
+        'The_box_model': 'The box model',
+        'Backgrounds_and_borders': 'Backgrounds and borders',
+        'Handling_different_text_directions': 'Handling different text directions',
+        'Overflowing_content': 'Overflowing content',
+        'Values_and_units': 'Values and units',
+        'Sizing_items_in_CSS': 'Sizing items in CSS',
+        'Images_media_and_form_elements': 'Images, media, and form elements',
+        'Styling_tables': 'Styling tables',
+        'Debugging_CSS': 'Debugging CSS',
+        'Organizing_your_CSS': 'Organizing your CSS',
+      'Styling_text': 'Styling text',
+        'Styling_text_overview': 'Styling text overview',
+        'Fundamental_text_and_font_styling': 'Fundamental text and font styling',
+        'Styling_lists': 'Styling lists',
+        'Styling_links': 'Styling links',
+        'Web_fonts': 'Web fonts',
+        'Assessment_typesetting_a_community_school_homepage': 'Assessment: Typesetting a community school homepage',
+      'CSS_layout': 'CSS layout',
+        'CSS_layout_overview': 'CSS layout overview',
+        'Layout_introduction' : 'Introduction to CSS layout',
+        'Normal_Flow' : 'Normal Flow',
+        'Flexbox': 'Flexbox',
+        'Grids' : 'Grids',
+        'Floats': 'Floats',
+        'Positioning': 'Positioning',
+        'Multiple-column_Layout': 'Multiple-column Layout',
+        'Responsive_design': 'Responsive design',
+        'Media_queries': 'Beginner\'s guide to media queries',
+        'Legacy_Layout_Methods': 'Legacy Layout Methods',
+        'Supporting_Older_Browsers': 'Supporting Older Browsers',
+        'Fundamental_Layout_Comprehension': 'Fundamental Layout Comprehension',
+  }
+});
+
+
+const locale = env.locale;
+const learnURL = `/${locale}/docs/Learn/`;
+const cssURL = `/${locale}/docs/Web/CSS/`;
+
+const htmlEscape = kuma.htmlEscape;
+const hasTag = page.hasTag;
+const rtlLocales = ['ar', 'he', 'fa'];
+
+const pageList = await page.subpagesExpand('/en-US/docs/Web/CSS');
+const standardPages = pageList.filter(page => !hasTag(page, "Non-standard"));
+
+const groups = standardPages.filter(page => hasTag(page, "Overview"));
+const properties = standardPages.filter(page => hasTag(page, "CSS Property"));
+const selectors = standardPages.filter(page => (hasTag(page, "Selector") && !hasTag(page, "Pseudo-element") && !hasTag(page, "Pseudo-class")));
+const pseudoClasses = standardPages.filter(page => hasTag(page, "Pseudo-class"));
+const pseudoElements = standardPages.filter(page => hasTag(page, "Pseudo-element"));
+const atRules = standardPages.filter(page => hasTag(page, "At-rule"));
+const types = standardPages.filter(page => hasTag(page, "CSS Data Type"));
+
+const badges = {
+  ExperimentalBadge : await template("ExperimentalBadge"),
+  NonStandardBadge : await template("NonStandardBadge"),
+  DeprecatedBadge : await template("DeprecatedBadge"),
+}
 
-    var groupData = [];
-    var properties = [];
-    var atRules = [];
-    var selectors = [];
-    var types = [];
+function buildSublist(pages, title) {
+  let result = `<li class="toggle"><details><summary>${title}</summary><ol>`;
 
-    // I am a selector or a type, we want to list all of them.
-    if (isSelector) {
-      for (var selector in data.selectors) {
-        groupData.push(selector);
-      }
-    } else {
-        // I am a property or an at-rule
-        // Find other properties, at-rules or types with these groups
-        for (var property in data.properties) {
-            var propertyGroup = data.properties[property].groups;
-            for (var g in propertyGroup) {
-                if (group.indexOf(propertyGroup[g]) !== -1 &&
-                        groupData.indexOf(property) === -1) {
-                    groupData.push(property);
-                }
-            }
-        }
-        for (var atRule in data.atRules) {
-            var atRuleGroup = data.atRules[atRule].groups;
-            for (var g in atRuleGroup) {
-                if (group.indexOf(atRuleGroup[g]) !== -1 &&
-                        groupData.indexOf(atRule) === -1) {
-                    groupData.push(atRule);
-                }
-            }
-        }
-        for (var type in data.types) {
-            var typeGroup = data.types[type].groups;
-            for (var g in typeGroup) {
-                if (group.indexOf(typeGroup[g]) !== -1 &&
-                        groupData.indexOf(type) === -1) {
-                    groupData.push(type);
-                }
-            }
-        }
-    }
+  for (const page of pages) {
+    const url = page.url.replace('en-US', locale);
+    const title = htmlEscape(page.title);
 
-    // Load the CSS pages data, gather info for the found properties and atRules
-    var pageList = await page.subpagesExpand('/en-US/docs/Web/CSS');
-    for (var i in pageList) {
-      var aPage = pageList[i];
-      for (var x in groupData) {
-        if (aPage.slug.split("/").pop() === groupData[x].replace(/ /g, '_')) {
-          if (isAtRule(groupData[x])) {
-            atRules.push(aPage);
-          } else if (aPage.slug.indexOf('selectors') !== -1 ||
-                aPage.slug.indexOf('combinator') !== -1 ||
-                aPage.slug.indexOf(':') !== -1 ) {
-            selectors.push(aPage);
-          } else {
-            properties.push(aPage);
-          }
-        } else if (aPage.title === groupData[x] && isType(groupData[x])) {
-            types.push(aPage);
+    if (locale != 'en-US') {
+      page.translations.forEach(function(translation){
+        if (translation.locale === locale) {
+          title = htmlEscape(translation.title);
         }
-      }
+      });
     }
 
-    if (isSelector) {
-      var selectorData = data.selectors;
-      var selectorCollection = {};
-      for (var selector in selectorData) {
-          var g = selectorData[selector].groups[0];
-          for (s in selectors) {
-            var aPage = selectors[s];
-            if(aPage.slug.split("/").pop().replace(/_/g, ' ') === selector) {
-                if (g in selectorCollection) {
-                    selectorCollection[g].push(aPage);
-                } else {
-                    selectorCollection[g] = [];
-                    selectorCollection[g].push(aPage);
-                }
-            }
-          }
-      }
-    }
-
-    // Load sub pages of the group
-    var groupPages = [];
-    for (var i = 0; i < group.length; i++) {
-        groupPages = groupPages.concat(await page.subpagesExpand('/en-US/docs/Web/CSS/' + group[i].replace(/ /g, '_')));
-    }
-
-    // output helpers
-    var badges = {
-      ExperimentalBadge : await template("ExperimentalBadge"),
-      NonStandardBadge : await template("NonStandardBadge"),
-      DeprecatedBadge : await template("DeprecatedBadge"),
-      ObsoleteBadge : await template("ObsoleteBadge"),
-    }
-
-    function buildSublist(pages, title, noCodeTags) {
-      var result = '<li class="toggle"><details open><summary>' + title + '</summary><ol>';
-      var code    = !noCodeTags ? '<code>'  : '';
-      var endcode = !noCodeTags ? '</code>' : '';
-
-      for (var i in pages) {
-        var aPage = pages[i];
-        var url = aPage.url.replace('en-US', locale);
-        var title = htmlEscape(aPage.title);
+    result += '<li>';
 
-        var translated = false;
-        if (locale != 'en-US') {
-            aPage.translations.forEach(function(translation){
-                if(translation.locale === locale) {
-                    url = translation.url;
-                    title = htmlEscape(translation.title);
-                    translated = true;
-                }
-            });
-        }
-
-        result += '<li>';
-
-        if (hasTag(aPage, 'Experimental')) {
-            result += badges.ExperimentalBadge;
-        }
-
-        if (hasTag(aPage, 'Non-standard') || hasTag(aPage, 'Non Standard')) {
-            result += badges.NonStandardBadge;
-        }
-
-        if (hasTag(aPage, 'Deprecated')) {
-            result += badges.DeprecatedBadge;
-        }
-
-        if (hasTag(aPage, 'Obsolete')) {
-            result += badges.ObsoleteBadge;
-            result += '<s class="obsoleteElement">';
-        }
-
-        if (rtlLocales.indexOf(locale) != -1) {
-            result += '<bdi>';
-        }
-
-        if (slug == aPage.slug) {
-            result += '<em>' + code + title + endcode + '</em>'
-        } else {
-            result += '<a href="' + url + '">' + code + title + endcode + '</a>';
-        }
-
-        if (rtlLocales.indexOf(locale) != -1) {
-            result += '</bdi>';
-        }
-
-        if (hasTag(aPage, 'Obsolete')) {
-            result += '</s>';
-        }
-
-        result += '</li>';
-      }
-
-      result += '</ol></details></li>';
-
-      return result;
+    if (hasTag(page, 'Experimental')) {
+      result += badges.ExperimentalBadge;
     }
 
-    // output
-    output = '<section class="Quick_links" id="Quick_Links"><ol>';
-    output += '<li><strong><a href="' +  CSSHref + '">CSS</a></strong></li>';
-    output += '<li><strong><a href="' +  CSSRefHref + '">' + text['css_ref_title'] + '</a></strong></li>';
-
-    for (var i = 0; i < group.length; i++) {
-      output += '<li><strong><a href="' +  CSSHref + '/' + group[i].replace(/ /g, '_') + '">' + group[i] + '</a></strong></li>';
+    if (hasTag(page, 'Deprecated')) {
+      result += badges.DeprecatedBadge;
     }
 
-    if (groupPages.length > 0) {
-      output += buildSublist(groupPages, text['Guides'], true);
+    if (rtlLocales.indexOf(locale) != -1) {
+      result += '<bdi>';
     }
 
-    if (atRules.length > 0) {
-      output += buildSublist(atRules, text['at_rules']);
-    }
+    result += web.smartLink(url, null, title, cssURL);
 
-    if (properties.length > 0) {
-      output += buildSublist(properties, text['Properties']);
+    if (rtlLocales.indexOf(locale) != -1) {
+      result += '</bdi>';
     }
 
-    if (types.length > 0) {
-      output += buildSublist(types, text['types']);
-    }
+    result += '</li>';
+  }
 
-    if (isSelector) {
-      for (sg in selectorCollection) {
-        var selectorGroup = selectorCollection[sg];
-        if (selectorGroup.length > 0) {
-          output += buildSublist(selectorGroup, text[sg]);
-        }
-      }
-    }
+  result += '</ol></details></li>';
 
-    output += '</ol></section>';
+  return result;
 }
+
 %>
 
-<%-output%>
+<section class="Quick_links" id="Quick_Links">
+
+<ol>
+  <li><strong><%=text['Learn_CSS']%></strong></li>
+  <li class="toggle">
+      <details>
+          <summary><%=text['CSS_first_steps']%></summary>
+          <ol>
+            <li><%-web.smartLink(`${learnURL}CSS/First_steps`, null, text['CSS_first_steps_overview'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/First_steps/What_is_CSS`, null, text['What_is_CSS'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/First_steps/Getting_started`, null, text['Getting_started_with_CSS'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/First_steps/How_CSS_is_structured`, null, text['How_CSS_is_structured'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/First_steps/How_CSS_works`, null, text['How_CSS_works'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/First_steps/Using_your_new_knowledge`, null, text['Using_your_new_knowledge'], learnURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary><%=text['CSS_building_blocks']%></summary>
+          <ol>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks`, null, text['CSS_building_blocks_overview'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/Cascade_and_inheritance`, null, text['Cascade_and_inheritance'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/Selectors`, null, text['CSS_selectors'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/The_box_model`, null, text['The_box_model'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/Backgrounds_and_borders`, null, text['Backgrounds_and_borders'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/Handling_different_text_directions`, null, text['Handling_different_text_directions'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/Overflowing_content`, null, text['Overflowing_content'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/Values_and_units`, null, text['Values_and_units'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/Sizing_items_in_CSS`, null, text['Sizing_items_in_CSS'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/Images_media_form_elements`, null, text['Images_media_and_form_elements'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/Styling_tables`, null, text['Styling_tables'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/Debugging_CSS`, null, text['Debugging_CSS'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Building_blocks/Organizing`, null, text['Organizing_your_CSS'], learnURL)%></li>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary><%=text['Styling_text']%></summary>
+          <ol>
+            <li><%-web.smartLink(`${learnURL}CSS/Styling_text`, null, text['Styling_text_overview'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Styling_text/Fundamentals`, null, text['Fundamental_text_and_font_styling'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Styling_text/Styling_lists`, null, text['Styling_lists'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Styling_text/Styling_links`, null, text['Styling_links'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Styling_text/Web_fonts`, null, text['Web_fonts'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/Styling_text/Typesetting_a_homepage`, null, text['Assessment_typesetting_a_community_school_homepage'], learnURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary><%=text['CSS_layout']%></summary>
+          <ol>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout`, null, text['CSS_layout_overview'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Introduction`, null, text['Layout_introduction'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Normal_Flow`, null, text['Normal_Flow'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Flexbox`, null, text['Flexbox'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Grids`, null, text['Grids'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Floats`, null, text['Floats'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Positioning`, null, text['Positioning'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Multiple-column_Layout`, null, text['Multiple-column_Layout'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Responsive_Design`, null, text['Responsive_design'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Media_queries`, null, text['Media_queries'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Legacy_Layout_Methods`, null, text['Legacy_Layout_Methods'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Supporting_Older_Browsers`, null, text['Supporting_Older_Browsers'], learnURL)%></li>
+            <li><%-web.smartLink(`${learnURL}CSS/CSS_layout/Fundamental_Layout_Comprehension`, null, text['Fundamental_Layout_Comprehension'], learnURL)%></li>
+          </ol>
+      </details>
+  </li>
+
+  <li><strong>Reference</strong></li>
+  <%-buildSublist(groups, 'Modules');%>
+  <%-buildSublist(properties, 'Properties');%>
+  <%-buildSublist(selectors, 'Selectors');%>
+  <%-buildSublist(pseudoClasses, 'Pseudo-classes');%>
+  <%-buildSublist(pseudoElements, 'Pseudo-elements');%>
+  <%-buildSublist(atRules, 'At-rules');%>
+  <%-buildSublist(types, 'Types');%>
+
+  <li><strong>Guides</strong></li>
+  <li class="toggle">
+      <details>
+          <summary>Animations</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Animations/Using_CSS_animations`, null, "Using CSS animations", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Backgrounds and Borders</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Backgrounds_and_Borders/Using_multiple_backgrounds`, null, "Using multiple backgrounds", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Backgrounds_and_Borders/Resizing_background_images`, null, "Resizing background images", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Box alignment</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Box_Alignment/Box_Alignment_In_Block_Abspos_Tables`, null, "Box alignment in block layout", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Box_Alignment/Box_Alignment_in_Flexbox`, null, "Box alignment in flexbox", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Box_Alignment/Box_Alignment_In_Grid_Layout`, null, "Box alignment in grid layout", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Box_Alignment/Box_Alignment_in_Multi-column_Layout`, null, "Box alignment in multi-column layout", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Box model</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Box_Model/Introduction_to_the_CSS_box_model`, null, "Introduction to the CSS basic box model", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Box_Model/Mastering_margin_collapsing`, null, "Mastering margin collapsing", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Columns</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Columns/Basic_Concepts_of_Multicol`, null, "Basic concepts of Multicol", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Columns/Styling_Columns`, null, "Styling columns", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Columns/Spanning_Columns`, null, "Spanning and balancing", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Columns/Handling_Overflow_in_Multicol`, null, "Handling overflow in Multicol", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Columns/Handling_content_breaks_in_multicol`, null, "Content breaks in Multicol", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Conditional rules</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Conditional_Rules/Using_Feature_Queries`, null, "Using feature queries", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>CSSOM view</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSSOM_View/Coordinate_systems`, null, "Coordinate systems", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Flexbox</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Flexible_Box_Layout/Basic_Concepts_of_Flexbox`, null, "Basic concepts of Flexbox", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Flexible_Box_Layout/Relationship_of_Flexbox_to_Other_Layout_Methods`, null, "Comparison with other layout methods", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Flexible_Box_Layout/Aligning_Items_in_a_Flex_Container`, null, "Aligning items in a flex container", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Flexible_Box_Layout/Ordering_Flex_Items`, null, "Ordering flex items", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Flexible_Box_Layout/Controlling_Ratios_of_Flex_Items_Along_the_Main_Ax`, null, "Controlling flex item ratios", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Flexible_Box_Layout/Mastering_Wrapping_of_Flex_Items`, null, "Mastering wrapping of flex items", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Flexible_Box_Layout/Typical_Use_Cases_of_Flexbox`, null, "Typical use cases of Flexbox", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Flexible_Box_Layout/Backwards_Compatibility_of_Flexbox`, null, "Backwards compatibility of Flexbox", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Flow layout</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Flow_Layout/Block_and_Inline_Layout_in_Normal_Flow`, null, "Block and Inline layout in normal flow", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Flow_Layout/In_Flow_and_Out_of_Flow`, null, "In flow and Out of flow", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Flow_Layout/Intro_to_formatting_contexts`, null, "Formatting contexts explained", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Flow_Layout/Flow_Layout_and_Writing_Modes`, null, "Flow layout and writing modes", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Flow_Layout/Flow_Layout_and_Overflow`, null, "Flow layout and overflow", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Fonts</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Fonts/OpenType_fonts_guide`, null, "OpenType font features guide", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Fonts/Variable_Fonts_Guide`, null, "Variable fonts guide", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Grid</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/Basic_Concepts_of_Grid_Layout`, null, "Basics concepts of grid layout", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/Relationship_of_Grid_Layout`, null, "Relationship to other layout methods", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/Line-based_Placement_with_CSS_Grid`, null, "Line-based placement", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/Grid_Template_Areas`, null, "Grid template areas", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/Layout_using_Named_Grid_Lines`, null, "Layout using named grid lines", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/Auto-placement_in_CSS_Grid_Layout`, null, "Auto-placement in grid layout", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/Box_Alignment_in_CSS_Grid_Layout`, null, "Box alignment in grid layout", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/CSS_Grid_Logical_Values_and_Writing_Modes`, null, "Grids, logical values and writing modes", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/CSS_Grid_Layout_and_Accessibility`, null, "Grid layout and accessibility", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/CSS_Grid_and_Progressive_Enhancement`, null, "Grid Layout and progressive enhancement", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/Realizing_common_layouts_using_CSS_Grid_Layout`, null, "Realizing common layouts using grids", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/Subgrid`, null, "Subgrid", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Grid_Layout/Masonry_Layout`, null, "Masonry layout", cssURL)%></li>
+         </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Images</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Images/Using_CSS_gradients`, null, "Using CSS gradients", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Lists and counters</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Lists_and_Counters/Using_CSS_counters`, null, "Using CSS counters", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Lists_and_Counters/Consistent_list_indentation`, null, "Consistent list indentation", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Logical properties</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Logical_Properties/Basic_concepts`, null, "Basic concepts", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Logical_Properties/Floating_and_positioning`, null, "Floating and positioning", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Logical_Properties/Margins_borders_padding`, null, "Margins, borders and padding", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Logical_Properties/Sizing`, null, "Sizing", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Media queries</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}Media_Queries/Using_media_queries`, null, "Using media queries", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}Media_Queries/Using_Media_Queries_for_Accessibility`, null, "Using media queries for accessibility", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}Media_Queries/Testing_media_queries`, null, "Testing media queries programmatically", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Positioning</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Positioning/Understanding_z_index`, null, "Understanding CSS z-index", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Scroll snap</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Scroll_Snap/Basic_concepts`, null, "Basic concepts of scroll snap", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Scroll_Snap/Browser_compat`, null, "Browser compatibility and scroll snap", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Shapes</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Shapes/Overview_of_CSS_Shapes`, null, "Overview of shapes", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Shapes/From_box_values`, null, "Shapes from box values", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Shapes/Basic_Shapes`, null, "Basic shapes", cssURL)%></li>
+            <li><%-web.smartLink(`${cssURL}CSS_Shapes/Shapes_From_Images`, null, "Shapes from images", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Text</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Text/Wrapping_Text`, null, "Wrapping and breaking text", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Transforms</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Transforms/Using_CSS_transforms`, null, "Using transforms", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+  <li class="toggle">
+      <details>
+          <summary>Transitions</summary>
+          <ol>
+            <li><%-web.smartLink(`${cssURL}CSS_Transitions/Using_CSS_transitions`, null, "Using transitions", cssURL)%></li>
+          </ol>
+      </details>
+  </li>
+
+  <li><strong>Layout cookbook</strong></li>
+  <li class="toggle">
+    <ol>
+      <li><%-web.smartLink(`${cssURL}Layout_cookbook/Media_objects`, null, "Media objects", cssURL)%></li>
+      <li><%-web.smartLink(`${cssURL}Layout_cookbook/Column_layouts`, null, "Columns", cssURL)%></li>
+      <li><%-web.smartLink(`${cssURL}Layout_cookbook/Center_an_element`, null, "Center an element", cssURL)%></li>
+      <li><%-web.smartLink(`${cssURL}Layout_cookbook/Sticky_footers`, null, "Sticky footers", cssURL)%></li>
+      <li><%-web.smartLink(`${cssURL}Layout_cookbook/Split_Navigation`, null, "Split navigation", cssURL)%></li>
+      <li><%-web.smartLink(`${cssURL}Layout_cookbook/Breadcrumb_Navigation`, null, "Breadcrumb navigation", cssURL)%></li>
+      <li><%-web.smartLink(`${cssURL}Layout_cookbook/List_group_with_badges`, null, "List group with badges", cssURL)%></li>
+      <li><%-web.smartLink(`${cssURL}Layout_cookbook/Pagination`, null, "Pagination", cssURL)%></li>
+      <li><%-web.smartLink(`${cssURL}Layout_cookbook/Card`, null, "Card", cssURL)%></li>
+      <li><%-web.smartLink(`${cssURL}Layout_cookbook/Grid_wrapper`, null, "Grid wrapper", cssURL)%></li>
+    </ol>
+  </li>
+
+  <li><strong>Tools</strong></li>
+  <li class="toggle">
+    <ol>
+      <li><%-web.smartLink(`${cssURL}CSS_Colors/Color_picker_tool`, null, text['Color_picker_tool'], cssURL)%></li>
+      <li><%-web.smartLink(`${cssURL}CSS_Background_and_Borders/Box-shadow_generator`, null, text['Box-shadow_generator'], cssURL)%></li>
+      <li><%-web.smartLink(`${cssURL}CSS_Background_and_Borders/Border-image_generator`, null, text['Border-image_generator'], cssURL)%></li>
+    </ol>
+  </li>
+
+</ol>
+
+</section>
diff --git a/kumascript/macros/SpecData.json b/kumascript/macros/SpecData.json
index f85523f3afb2..9250cfa07e48 100644
--- a/kumascript/macros/SpecData.json
+++ b/kumascript/macros/SpecData.json
@@ -146,7 +146,7 @@
   },
   "CSP 1.1": {
     "name": "Content Security Policy Level 2",
-    "url": "https://w3c.github.io/webappsec-csp/2/",
+    "url": "https://www.w3.org/TR/CSP2/",
     "status": "REC"
   },
   "CSP 3.0": {

From 025acbb998d197d44013884f46f8db85033e5464 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 25 Mar 2021 17:35:46 -0400
Subject: [PATCH 070/288] improvements to analyze-pr-build Markdown comment
 (#3333)

* improvements to analyze-pr-build Markdown comment

* fix tests

* correct formatting for URL link

* Apply suggestions from code review

Co-authored-by: Ryan Johnson <escattone@gmail.com>

Co-authored-by: Ryan Johnson <escattone@gmail.com>
---
 deployer/README.md                       | 31 ++++++++-
 deployer/src/deployer/analyze_pr.py      | 83 ++++++++++++++++++------
 deployer/src/deployer/main.py            | 19 +++++-
 deployer/src/deployer/test_analyze_pr.py |  2 +-
 4 files changed, 109 insertions(+), 26 deletions(-)

diff --git a/deployer/README.md b/deployer/README.md
index efe4bf1804eb..49869a3e1b3f 100644
--- a/deployer/README.md
+++ b/deployer/README.md
@@ -223,16 +223,45 @@ option you can override it.
 This is needed to be able to find the PR (on <https://github.com/mdn/content/pulls>)
 to post the comment to.
 
+### `--verbose`
+
+This is mostly useful for local development or when debugging. It determines whether
+to print to `stdout` what it would post as a PR issue comment.
+
+This option, just like the `--dry-run` is technically part of the `deployer` command
+and not the `analyze-pr-build` sub-command. So put it before the `analyze-pr-build`.
+
 ### A complete example
 
 This example demonstrates all options.
 
 ```sh
-poetry run deployer --dry-run analyze-pr-build ../client/build \
+poetry run deployer --verbose --dry-run analyze-pr-build ../client/build \
   --analyze-flaws --analyze-dangerous-content --github-token="xxx" \
   --repo=peterbe/content --pr-number=3
 ```
 
+## Debugging Analyze PR builds
+
+An important part of the `analyze-pr-builds` command is that it must be easy to
+debug and develop further without having to rely on landing code in `main`
+and seeing how it worked.
+
+The first thing you need to do is to download a `build` artifact or to simply
+run `yarn build` and use the `../client/build` directory. To download the artifact
+go to a finished "PR Test" workflow,
+like <https://github.com/mdn/content/pull/3381/checks?check_run_id=2169672013> for
+example. Near the upper right-hand corner of the content (near the "Re-run jobs"
+button) it says "Artifacts (1)". Download that `build.zip` file somewhere and unpack
+it. Now you can run:
+
+```sh
+poetry run deployer --verbose analyze-pr-build ~/Downloads/build ...
+```
+
+You can even go and get a personal access token and set `$GITHUB_TOKEN`
+(assuming it has the right scopes) and have it actually post the comment.
+
 ## Environment variables
 
 The following environment variables are supported.
diff --git a/deployer/src/deployer/analyze_pr.py b/deployer/src/deployer/analyze_pr.py
index 07929a9d9b62..7eee351fea27 100644
--- a/deployer/src/deployer/analyze_pr.py
+++ b/deployer/src/deployer/analyze_pr.py
@@ -1,3 +1,5 @@
+import datetime
+import hashlib
 import json
 from collections import defaultdict
 from pathlib import Path
@@ -31,6 +33,15 @@ def analyze_pr(build_directory: Path, config):
         print("Warning! Nothing to comment at all!")
         return
 
+    build_hash = get_build_hash(build_directory)
+
+    # The build_hash can potentially be used if we want to find an existing comment
+    # that's already been made about this exact set of build files.
+    combined_comment = (
+        f"<!-- build_hash: {build_hash} date: {datetime.datetime.utcnow()} -->\n\n"
+        f"{combined_comment}"
+    )
+
     if not config["repo"]:
         print("Warning! No 'repo' config")
     elif not config["pr_number"]:
@@ -53,11 +64,9 @@ def analyze_pr(build_directory: Path, config):
 
 
 def post_about_deployment(build_directory: Path, **config):
-    template = "https://{prefix}.content.dev.mdn.mozit.cloud{mdn_url}"
-
     links = []
     for doc in get_built_docs(build_directory):
-        url = template.format(prefix=config["prefix"], mdn_url=doc["mdn_url"])
+        url = mdn_url_to_dev_url(config["prefix"], doc["mdn_url"])
         links.append(f"- <{url}>")
 
     heading = "## Preview deployment URLs\n\n"
@@ -67,6 +76,11 @@ def post_about_deployment(build_directory: Path, **config):
     return heading + "*seems not a single file was built!* 🙀"
 
 
+def mdn_url_to_dev_url(prefix, mdn_url):
+    template = "https://{prefix}.content.dev.mdn.mozit.cloud{mdn_url}"
+    return template.format(prefix=prefix, mdn_url=mdn_url)
+
+
 def post_about_dangerous_content(build_directory: Path, **config):
 
     OK_URL_PREFIXES = [
@@ -109,13 +123,18 @@ def post_about_dangerous_content(build_directory: Path, **config):
     if comments:
         per_doc_comments = []
         for doc, comment in comments:
-            per_doc_comments.append(
-                f"URL: `{doc['mdn_url']}`\n"
-                f"Title: `{doc['title']}`\n"
-                f"[on GitHub]({doc['source']['github_url']})\n"
-                "\n"
-                f"{comment}"
-            )
+            lines = []
+            if config["prefix"]:
+                url = mdn_url_to_dev_url(config["prefix"], doc["mdn_url"])
+                lines.append(f"URL: [`{doc['mdn_url']}`]({url})")
+            else:
+                lines.append(f"URL: `{doc['mdn_url']}`")
+            lines.append(f"Title: `{doc['title']}`")
+            lines.append(f"[on GitHub]({doc['source']['github_url']})")
+            lines.append("")
+            lines.append(comment)
+
+            per_doc_comments.append("\n".join(lines))
         return heading + "\n---\n".join(per_doc_comments)
     else:
         return heading + "*no external links in the built pages* 👱🏽"
@@ -125,15 +144,23 @@ def post_about_flaws(build_directory: Path, **config):
 
     comments = []
 
+    MAX_FLAW_EXPLANATION = 5
+
     for doc in get_built_docs(build_directory):
         if not doc.get("flaws"):
-            comments.append((doc, "No flaws!"))
+            comments.append((doc, "No flaws! 🎉"))
             continue
         else:
             flaws_list = []
             for flaw_name, flaw_values in doc["flaws"].items():
                 flaws_list.append(f"- **{flaw_name}**:")
-                for flaw_value in flaw_values:
+                for i, flaw_value in enumerate(flaw_values):
+                    if i + 1 > MAX_FLAW_EXPLANATION:
+                        flaws_list.append(
+                            f"  - *and {len(flaw_values) - MAX_FLAW_EXPLANATION}"
+                            " more flaws omitted*"
+                        )
+                        break
                     if isinstance(flaw_value, dict):
                         explanation = flaw_value.get("explanation")
                     else:
@@ -157,15 +184,21 @@ def count_flaws(flaws):
         # Now turn all of these individual comments into one big one
         per_doc_comments = []
         for doc, comment in comments:
-            per_doc_comments.append(
-                f"URL: `{doc['mdn_url']}`\n"
-                f"Title: `{doc['title']}`\n"
-                f"[on GitHub]({doc['source']['github_url']})\n"
-                f"Flaw count: {count_flaws(doc['flaws'])}\n"
-                "\n"
-                f"{comment}"
-            )
-        return heading + "\n---\n".join(per_doc_comments)
+            lines = []
+            if config["prefix"]:
+                url = mdn_url_to_dev_url(config["prefix"], doc["mdn_url"])
+                lines.append(f"URL: [`{doc['mdn_url']}`]({url})")
+            else:
+                lines.append(f"URL: `{doc['mdn_url']}`")
+            lines.append(f"Title: `{doc['title']}`")
+            lines.append(f"[on GitHub]({doc['source']['github_url']})")
+            if count_flaws(doc["flaws"]):
+                lines.append(f"Flaw count: {count_flaws(doc['flaws'])}")
+            lines.append("")
+            lines.append(comment)
+
+            per_doc_comments.append("\n".join(lines))
+        return heading + "\n\n---\n\n".join(per_doc_comments)
     else:
         return heading + "*none!* 🎉"
 
@@ -182,3 +215,11 @@ def get_built_docs(build_directory: Path):
             doc = data["doc"]
             docs.append(doc)
     return docs
+
+
+def get_build_hash(build_directory: Path):
+    hash_ = hashlib.md5()
+    for path in build_directory.rglob("index.json"):
+        with open(path, "rb") as f:
+            hash_.update(f.read())
+    return hash_.hexdigest()
diff --git a/deployer/src/deployer/main.py b/deployer/src/deployer/main.py
index 0fec041f18f1..04f3052c4913 100644
--- a/deployer/src/deployer/main.py
+++ b/deployer/src/deployer/main.py
@@ -66,6 +66,13 @@ def validate_optional_file(ctx, param, value):
     show_default=True,
     is_flag=True,
 )
+@click.option(
+    "--verbose",
+    default=False,
+    help="Be louder with stdout logging",
+    show_default=True,
+    is_flag=True,
+)
 @click.version_option(version=__version__)
 @click.pass_context
 def cli(ctx, **kwargs):
@@ -247,10 +254,16 @@ def upload(ctx, directory: Path, **kwargs):
 def analyze_pr_build(ctx, directory: Path, **kwargs):
     log.info(f"Deployer ({__version__})", bold=True)
     ctx.obj.update(kwargs)
+
+    actionable_options = ("prefix", "analyze_flaws", "analyze_dangerous_content")
+    if not any(ctx.obj[x] for x in actionable_options):
+        raise Exception("No actionable option used. ")
+
     combined_comment = analyze_pr(directory, ctx.obj)
-    log.info("POST".center(80, "_"), "\n")
-    log.info(combined_comment)
-    log.info("\n", "END POST".center(80, "_"))
+    if ctx.obj["verbose"]:
+        log.info("POST".center(80, "_"), "\n")
+        log.info(combined_comment)
+        log.info("\n", "END POST".center(80, "_"))
 
 
 @cli.command()
diff --git a/deployer/src/deployer/test_analyze_pr.py b/deployer/src/deployer/test_analyze_pr.py
index 9c6734d399fe..660a1f74719b 100644
--- a/deployer/src/deployer/test_analyze_pr.py
+++ b/deployer/src/deployer/test_analyze_pr.py
@@ -62,7 +62,7 @@ def test_analyze_pr_flaws():
     with mock_build_directory(no_flaws_doc, doc) as build_directory:
         comment = analyze_pr(build_directory, dict(DEFAULT_CONFIG, analyze_flaws=True))
         assert "## Flaws" in comment
-        assert "Flaw count: 0" in comment
+        assert "No flaws!" in comment
         assert "Flaw count: 2" in comment
         assert len(comment.split("\n---\n")) == 2
         assert "- **faux_pas**:" in comment

From 41a635b90712a2df4754cfcdf0c3563b3eb53c4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 05:55:41 +0000
Subject: [PATCH 071/288] build(deps-dev): bump @types/jest from 26.0.21 to
 26.0.22 (#3338)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 61128f0db0af..9cdce392749e 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
     "@testing-library/react": "^11.2.5",
-    "@types/jest": "^26.0.21",
+    "@types/jest": "^26.0.22",
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.3",
     "braces": "^3.0.2",
diff --git a/yarn.lock b/yarn.lock
index b341e488a181..297cccf527ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2998,10 +2998,10 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@^26.0.21":
-  version "26.0.21"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.21.tgz#3a73c2731e7e4f0fbaea56ce7ff8c79cf812bd24"
-  integrity sha512-ab9TyM/69yg7eew9eOwKMUmvIZAKEGZYlq/dhe5/0IMUd/QLJv5ldRMdddSn+u22N13FP3s5jYyktxuBwY0kDA==
+"@types/jest@^26.0.22":
+  version "26.0.22"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.22.tgz#8308a1debdf1b807aa47be2838acdcd91e88fbe6"
+  integrity sha512-eeWwWjlqxvBxc4oQdkueW5OF/gtfSceKk4OnOAGlUSwS/liBRtZppbJuz1YkgbrbfGOoeBHun9fOvXnjNwrSOw==
   dependencies:
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"

From 1046726d3b268308c71f827820f6b93cb32798d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 05:58:55 +0000
Subject: [PATCH 072/288] build(deps): bump @mdn/browser-compat-data from 3.2.1
 to 3.2.2 (#3339)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9cdce392749e..67183cfe2c69 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
   "dependencies": {
     "@caporal/core": "2.0.2",
     "@fast-csv/parse": "4.3.6",
-    "@mdn/browser-compat-data": "3.2.1",
+    "@mdn/browser-compat-data": "3.2.2",
     "accept-language-parser": "1.5.0",
     "chalk": "4.1.0",
     "cheerio": "1.0.0-rc.5",
diff --git a/yarn.lock b/yarn.lock
index 297cccf527ec..1210a94f5381 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1882,10 +1882,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@mdn/browser-compat-data@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.2.1.tgz#18707a79db035b430d6bab370d00cd14c39e0553"
-  integrity sha512-rIfqD67k64yP6RfFyZOVSLykDoNfAkeqRrTZnKs13rfa+EAFF/FOYAKTOpKMwMUfTM2/+FGYRGaiFmETnGRjsQ==
+"@mdn/browser-compat-data@3.2.2":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.2.2.tgz#0d4ca55e796d96a4d15935b8e51535ced5380573"
+  integrity sha512-W+f7ZugkxsB2xvRLb283m/weDx58yatbJTDRS8FAO9kR7igrQsZeTFaUoYogw36ywzwuOSnY6vKPFHbF6Xhd5A==
   dependencies:
     extend "3.0.2"
 

From 25b23ec439245249a723cf58b898342a1115435b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 06:53:19 +0000
Subject: [PATCH 073/288] build(deps): bump boto3 from 1.17.36 to 1.17.38 in
 /deployer (#3340)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 9ec261a6acc0..e93812a6d55f 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.36"
+version = "1.17.38"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.36,<1.21.0"
+botocore = ">=1.20.38,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.36"
+version = "1.20.38"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -533,7 +533,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "e2fa9c909418cba92769c70cfef2d8ee95dca4319a64574a2d9be6c7b5674bd6"
+content-hash = "e064c869b5f8268810f4754029925ec8995b144e427c1e57a6341b2a4c3fecb2"
 
 [metadata.files]
 appdirs = [
@@ -552,12 +552,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.36-py2.py3-none-any.whl", hash = "sha256:16ca7a34eb88138e0d1ae2532e17975eef578aa1754e2d209ad41a8dfce059ce"},
-    {file = "boto3-1.17.36.tar.gz", hash = "sha256:75f59fb3d764a381bb0108cb5036b398d0c8a1cf719e6b5aadbc5a53a1fd735e"},
+    {file = "boto3-1.17.38-py2.py3-none-any.whl", hash = "sha256:f427d7f001f457bd2693411396897624a081d0d6a9f6c1fabf6ef565238f5282"},
+    {file = "boto3-1.17.38.tar.gz", hash = "sha256:d891964c43de16f0b43a8fa87ae786abfd4166222b5e53c1e1164514cde12073"},
 ]
 botocore = [
-    {file = "botocore-1.20.36-py2.py3-none-any.whl", hash = "sha256:9ce33bd4175d58c5fdeb8e35052aa370aff74b347227e65ddc3f4fa01ef0686f"},
-    {file = "botocore-1.20.36.tar.gz", hash = "sha256:148f5d7d48c54ed450831e5dd4d13284b2418955b6d99db23a3d9c4c6cb515c8"},
+    {file = "botocore-1.20.38-py2.py3-none-any.whl", hash = "sha256:6e6107109abad89d95c829b2c3c281d353113d4b54fcfeb65d71e58e8ebd77ed"},
+    {file = "botocore-1.20.38.tar.gz", hash = "sha256:da447f46d412749720ca08e19bf14487d35e23f2378f7245975e4f55af7570dd"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 591d90166f45..661aea354d52 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.36"
+boto3 = "^1.17.38"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From cd571508cc9608632ae5ba5c62661f1f858fb88f Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 26 Mar 2021 08:32:54 -0400
Subject: [PATCH 074/288] Get rid of 'pre.language-*` (#3327)

Fixes #3279
---
 client/src/app.scss           |   6 +-
 client/src/minimal-prism.scss | 125 ++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+), 3 deletions(-)
 create mode 100644 client/src/minimal-prism.scss

diff --git a/client/src/app.scss b/client/src/app.scss
index 3f67f1803436..c7d77d1591ed 100644
--- a/client/src/app.scss
+++ b/client/src/app.scss
@@ -1,6 +1,6 @@
-// (At least without a theme) regular prism.css is really small so we can
-// afford to load it on all pages globally.
-@import "prismjs/themes/prism";
+// We're assuming that code snippets are so common that it's OK to always
+// include them in every page.
+@import "./minimal-prism.scss";
 
 @import "~@mdn/minimalist/sass/mdn-minimalist";
 @import "./ui/molecules/grids/grids";
diff --git a/client/src/minimal-prism.scss b/client/src/minimal-prism.scss
new file mode 100644
index 000000000000..a8e0582e2f00
--- /dev/null
+++ b/client/src/minimal-prism.scss
@@ -0,0 +1,125 @@
+/* This is based on
+    node_modules/prismjs/themes/prism.css
+as of Mar 26, 2021.
+
+The reason we're not importing all of their CSS is because it contains a lot of
+selectors that we never use. In particular, it has (lots!) CSS for selectors
+like `pre[class*="language-"]` and `code[class*="language-"]` but because we
+don't use any of that, we can safely ignore it.
+*/
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.token.namespace {
+  opacity: 0.7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  /* This background color was intended by the author of this theme. */
+  background: hsla(0, 0%, 100%, 0.5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #dd4a68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}
+
+// MINIMALIST....
+
+// .token.keyword {
+//   color: $primary-50;
+// }
+
+// .token.selector,
+// .token.attr-name,
+// .token.string,
+// .token.char,
+// .token.builtin,
+// .token.inserted {
+//   color: $green-100;
+// }
+
+// .token.operator,
+// .token.entity,
+// .token.url,
+// .language-css .token.string,
+// .style .token.string,
+// .token.variable {
+//   background-color: transparent;
+//   color: $neutral-100;
+// }
+
+// .token.atrule,
+// .token.attr-value,
+// .token.function {
+//   color: $red-200;
+// }
+
+// .token.comment,
+// .token.prolog,
+// .token.doctype,
+// .token.cdata {
+//   color: $neutral-300;
+// }
+
+// .token.regex,
+// .token.important {
+//   color: $orange-100;
+// }

From 91683baae92cd797ad6d4e92621900726456a123 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 26 Mar 2021 09:42:47 -0400
Subject: [PATCH 075/288] It's "Account settings" not "Account Settings"
 (#3346)

Fixes #3345
---
 build/spas.js                  | 2 +-
 client/src/settings/index.tsx  | 5 +++--
 testing/tests/headless.test.js | 4 ++--
 testing/tests/index.test.js    | 7 ++++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build/spas.js b/build/spas.js
index f948cf3fd08e..7b15a262e408 100644
--- a/build/spas.js
+++ b/build/spas.js
@@ -51,7 +51,7 @@ async function buildSPAs(options) {
         { prefix: "search", pageTitle: "Search" },
         { prefix: "signin", pageTitle: "Sign in" },
         { prefix: "signup", pageTitle: "Sign up" },
-        { prefix: "settings", pageTitle: "Settings" },
+        { prefix: "settings", pageTitle: "Account settings" },
       ];
       for (const { prefix, pageTitle } of SPAs) {
         const url = `/${locale}/${prefix}`;
diff --git a/client/src/settings/index.tsx b/client/src/settings/index.tsx
index 055c9cd1458a..a5c4979dcab7 100644
--- a/client/src/settings/index.tsx
+++ b/client/src/settings/index.tsx
@@ -5,8 +5,9 @@ import { PageContentContainer } from "../ui/atoms/page-content";
 const SettingsApp = React.lazy(() => import("./app"));
 
 export function Settings() {
+  const pageTitle = "Account settings";
   React.useEffect(() => {
-    document.title = "Settings";
+    document.title = pageTitle;
   }, []);
   const isServer = typeof window === "undefined";
   return (
@@ -19,7 +20,7 @@ export function Settings() {
           present the page feels less flickery at a very affordable cost of
           allowing this to be part of the main JS bundle.
        */}
-        <h1 className="slab-highlight">Account Settings</h1>
+        <h1 className="slab-highlight">{pageTitle}</h1>
         {!isServer && (
           <React.Suspense fallback={<p>Loading...</p>}>
             <SettingsApp />
diff --git a/testing/tests/headless.test.js b/testing/tests/headless.test.js
index f659b8a145c8..4280dcf54e7d 100644
--- a/testing/tests/headless.test.js
+++ b/testing/tests/headless.test.js
@@ -304,7 +304,7 @@ describe("Basic viewing of functional pages", () => {
 
   it("should say you're not signed in on the settings page", async () => {
     await page.goto(testURL("/en-US/settings"));
-    await expect(page).toMatchElement("h1", { text: "Account Settings" });
+    await expect(page).toMatchElement("h1", { text: "Account settings" });
     await expect(page).toMatchElement("a", {
       text: "Please sign in to continue",
     });
@@ -321,7 +321,7 @@ describe("Basic viewing of functional pages", () => {
     });
 
     await page.goto(url);
-    await expect(page).toMatchElement("h1", { text: "Account Settings" });
+    await expect(page).toMatchElement("h1", { text: "Account settings" });
     await expect(page).toMatchElement("button", { text: "Close account" });
 
     // Change locale to French
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 11a83fadbf16..2f6ccb665ea1 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -977,12 +977,13 @@ test("settings page", () => {
   const htmlFile = path.join(builtFolder, "index.html");
   const html = fs.readFileSync(htmlFile, "utf-8");
   const $ = cheerio.load(html);
-  expect($("h1").text()).toContain("Settings");
-  expect($("title").text()).toContain("Settings");
+  expect($("h1").text()).toBe("Account settings");
+  console.log($("title").text());
+  expect($("title").text()).toContain("Account settings");
 
   const jsonFile = path.join(builtFolder, "index.json");
   const data = JSON.parse(fs.readFileSync(jsonFile));
-  expect(data.pageTitle).toBe("Settings");
+  expect(data.pageTitle).toBe("Account settings");
   expect(data.possibleLocales).toBeTruthy();
   const possibleLocale = data.possibleLocales.find((p) => p.locale === "en-US");
   expect(possibleLocale.English).toBe("English (US)");

From 7bbf906ce505f0bd570d016c56bb3f6b70c45b52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 13:52:53 +0000
Subject: [PATCH 076/288] build(deps-dev): bump @mdn/minimalist from 0.7.4 to
 0.8.0 (#3348)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 67183cfe2c69..020767562920 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
   "devDependencies": {
     "@babel/core": "^7.13.10",
     "@mdn/dinocons": "^0.3.0",
-    "@mdn/minimalist": "^0.7.4",
+    "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.1.21",
     "@storybook/addon-actions": "^6.1.21",
     "@storybook/addon-essentials": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index 1210a94f5381..5bd39e0b0814 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1894,10 +1894,10 @@
   resolved "https://registry.yarnpkg.com/@mdn/dinocons/-/dinocons-0.3.0.tgz#2162eb6c12b36dd9bfc69f344d9150b4b5a3c9ad"
   integrity sha512-++oqKEzbWtc4DHELnS9R6HoGt+7AGRe2zlxTyk5YCSwouIIiI4DEGuoMCdtBCrZOoHtp2WHZ1mZ6BqEmQh8hLA==
 
-"@mdn/minimalist@^0.7.4":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@mdn/minimalist/-/minimalist-0.7.4.tgz#83e6bfba5d0ded8d05e0b72f92123ea1d77ec1fb"
-  integrity sha512-5n0cB1HCdRe6Mw78+SFG3UZkXx2xcuv33SfnPTU9dQAFQ13JOjwACJrNBvQZdqtjo2+hjXi6Xu50eyf5tP30Sg==
+"@mdn/minimalist@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@mdn/minimalist/-/minimalist-0.8.0.tgz#e466fc2f7820eeb00dca1f4b41412f1a7ddf2d4b"
+  integrity sha512-VHKjKieSaXRtnm2UGX85TRUmCQNfRGQrhLATZLNzhfq8JizwFETDM0eNxGI+qPbMGG12Lbx6EAlbjdXT61/axQ==
 
 "@mdx-js/loader@^1.6.19":
   version "1.6.21"

From 90eecba22493aba244b76c5e0a6427b8b62d6fe0 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 26 Mar 2021 10:53:19 -0400
Subject: [PATCH 077/288] add a note to _redirects.txt about not editing it
 (#3343)

---
 content/redirect.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/content/redirect.js b/content/redirect.js
index 992927803028..40c49840ef27 100644
--- a/content/redirect.js
+++ b/content/redirect.js
@@ -198,7 +198,7 @@ function loadPairsFromFile(filePath, locale, strict = true) {
     .trim()
     .split("\n")
     // Skip the header line.
-    .slice(1)
+    .filter((line) => line && !line.startsWith("#"))
     .map((line) => line.trim().split(/\t+/));
 
   if (strict) {
@@ -461,10 +461,19 @@ function validatePairs(pairs, locale, checkExists = true) {
   }
 }
 
+const redirectsFileOpening = `
+# DO NOT EDIT THIS FILE MANUALLY.
+# Use the CLI instead:
+#
+#    yarn content add-redirect <fromURL> <toURL>
+#
+# FROM-URL\tTO-URL
+`.trim();
+
 function save(localeFolder, pairs) {
   const filePath = path.join(localeFolder, "_redirects.txt");
   const writeStream = fs.createWriteStream(filePath);
-  writeStream.write(`# FROM-URL\tTO-URL\n`);
+  writeStream.write(`${redirectsFileOpening}\n`);
   for (const [fromURL, toURL] of pairs) {
     writeStream.write(`${fromURL}\t${toURL}\n`);
   }

From 4a8544f3787d564efcdda5e8062b9d78263c6611 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 26 Mar 2021 10:53:47 -0400
Subject: [PATCH 078/288] use sync fs to populate search index (#3322)

Fixes #3297
---
 server/search-index.js | 43 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/server/search-index.js b/server/search-index.js
index 304b621d8028..eea1740a858c 100644
--- a/server/search-index.js
+++ b/server/search-index.js
@@ -1,6 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const util = require("util");
 
 const fm = require("front-matter");
 
@@ -11,14 +10,12 @@ const {
 } = require("../content");
 const { SearchIndex } = require("../build");
 
-const promisifed = util.promisify(fs.readFile);
-
 function* walker(root) {
-  const files = fs.readdirSync(root);
-  for (const name of files) {
-    const filepath = path.join(root, name);
-    const isDirectory = fs.statSync(filepath).isDirectory();
-    if (isDirectory) {
+  const dirents = fs.readdirSync(root, { withFileTypes: true });
+  for (const dirent of dirents) {
+    // Doing it this way is faster than doing `path.join(root, dirent.name)`
+    const filepath = `${root}${path.sep}${dirent.name}`;
+    if (dirent.isDirectory()) {
       yield* walker(filepath);
     } else {
       yield filepath;
@@ -26,27 +23,25 @@ function* walker(root) {
   }
 }
 
-async function populateSearchIndex(searchIndex, localeLC) {
+function populateSearchIndex(searchIndex, localeLC) {
   const root = path.join(
     localeLC === "en-us" ? CONTENT_ROOT : CONTENT_TRANSLATED_ROOT,
     localeLC
   );
-  const filePaths = [...walker(root)].filter((filePath) => {
-    const basename = path.basename(filePath);
-    return basename === "index.html" || basename === "index.md";
-  });
   const locale = VALID_LOCALES.get(localeLC);
-  await Promise.all(
-    filePaths.map(async (filePath) => {
-      const rawContent = await promisifed(filePath, "utf-8");
-      const { attributes: metadata } = fm(rawContent);
-      metadata.locale = locale;
+  for (const filePath of walker(root)) {
+    const basename = path.basename(filePath);
+    if (!(basename === "index.html" || basename === "index.md")) {
+      continue;
+    }
+    const rawContent = fs.readFileSync(filePath, "utf-8");
+    const { attributes: metadata } = fm(rawContent);
+    metadata.locale = locale;
 
-      const url = `/${locale}/docs/${metadata.slug}`;
-      const doc = { metadata, url };
-      searchIndex.add(doc);
-    })
-  );
+    const url = `/${locale}/docs/${metadata.slug}`;
+    const doc = { metadata, url };
+    searchIndex.add(doc);
+  }
 }
 
 async function searchIndexRoute(req, res) {
@@ -77,7 +72,7 @@ async function searchIndexRoute(req, res) {
 
   const label = "Populate search-index";
   console.time(label);
-  await populateSearchIndex(searchIndex, locale);
+  populateSearchIndex(searchIndex, locale);
   searchIndex.sort();
   console.timeEnd(label);
   res.json(searchIndex.getItems()[locale]);

From 5c6f184b30c5edf39f17cd2d8c4d0a7a27951ce2 Mon Sep 17 00:00:00 2001
From: Schalk Neethling <sneethling@mozilla.com>
Date: Fri, 26 Mar 2021 18:08:09 +0200
Subject: [PATCH 079/288] fix: merge prism styles from minimalist with
 minimal-prism (#3347)

Merge prismjs overrides from minimalist with minimal-prism in Yari

Fix #3344
---
 client/src/app.scss           |  2 +-
 client/src/minimal-prism.scss | 72 +++++++----------------------------
 2 files changed, 14 insertions(+), 60 deletions(-)

diff --git a/client/src/app.scss b/client/src/app.scss
index c7d77d1591ed..8dd5c9576654 100644
--- a/client/src/app.scss
+++ b/client/src/app.scss
@@ -1,6 +1,6 @@
 // We're assuming that code snippets are so common that it's OK to always
 // include them in every page.
-@import "./minimal-prism.scss";
+@import "./minimal-prism";
 
 @import "~@mdn/minimalist/sass/mdn-minimalist";
 @import "./ui/molecules/grids/grids";
diff --git a/client/src/minimal-prism.scss b/client/src/minimal-prism.scss
index a8e0582e2f00..2319fa361829 100644
--- a/client/src/minimal-prism.scss
+++ b/client/src/minimal-prism.scss
@@ -1,6 +1,5 @@
-/* This is based on
-    node_modules/prismjs/themes/prism.css
-as of Mar 26, 2021.
+/* 
+This is based on node_modules/prismjs/themes/prism.css as of Mar 26, 2021.
 
 The reason we're not importing all of their CSS is because it contains a lot of
 selectors that we never use. In particular, it has (lots!) CSS for selectors
@@ -8,15 +7,14 @@ like `pre[class*="language-"]` and `code[class*="language-"]` but because we
 don't use any of that, we can safely ignore it.
 */
 
+@import "~@mdn/minimalist/sass/vars/color-palette";
+
 .token.comment,
 .token.prolog,
 .token.doctype,
-.token.cdata {
-  color: slategray;
-}
-
+.token.cdata,
 .token.punctuation {
-  color: #999;
+  color: $neutral-300;
 }
 
 .token.namespace {
@@ -30,7 +28,7 @@ don't use any of that, we can safely ignore it.
 .token.constant,
 .token.symbol,
 .token.deleted {
-  color: #905;
+  color: $red-100;
 }
 
 .token.selector,
@@ -39,7 +37,7 @@ don't use any of that, we can safely ignore it.
 .token.char,
 .token.builtin,
 .token.inserted {
-  color: #690;
+  color: $green-100;
 }
 
 .token.operator,
@@ -47,32 +45,31 @@ don't use any of that, we can safely ignore it.
 .token.url,
 .language-css .token.string,
 .style .token.string {
-  color: #9a6e3a;
-  /* This background color was intended by the author of this theme. */
-  background: hsla(0, 0%, 100%, 0.5);
+  color: $neutral-100;
 }
 
 .token.atrule,
 .token.attr-value,
 .token.keyword {
-  color: #07a;
+  color: $primary-50;
 }
 
 .token.function,
 .token.class-name {
-  color: #dd4a68;
+  color: $red-200;
 }
 
 .token.regex,
 .token.important,
 .token.variable {
-  color: #e90;
+  color: $orange-200;
 }
 
 .token.important,
 .token.bold {
   font-weight: bold;
 }
+
 .token.italic {
   font-style: italic;
 }
@@ -80,46 +77,3 @@ don't use any of that, we can safely ignore it.
 .token.entity {
   cursor: help;
 }
-
-// MINIMALIST....
-
-// .token.keyword {
-//   color: $primary-50;
-// }
-
-// .token.selector,
-// .token.attr-name,
-// .token.string,
-// .token.char,
-// .token.builtin,
-// .token.inserted {
-//   color: $green-100;
-// }
-
-// .token.operator,
-// .token.entity,
-// .token.url,
-// .language-css .token.string,
-// .style .token.string,
-// .token.variable {
-//   background-color: transparent;
-//   color: $neutral-100;
-// }
-
-// .token.atrule,
-// .token.attr-value,
-// .token.function {
-//   color: $red-200;
-// }
-
-// .token.comment,
-// .token.prolog,
-// .token.doctype,
-// .token.cdata {
-//   color: $neutral-300;
-// }
-
-// .token.regex,
-// .token.important {
-//   color: $orange-100;
-// }

From 9ab36796e8c032b6d20eae65ce5067456bd2f4cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 16:36:18 +0000
Subject: [PATCH 080/288] build(deps-dev): bump react and react-dom (#3308)

---
 package.json |  4 ++--
 yarn.lock    | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 020767562920..01bd995c3fa9 100644
--- a/package.json
+++ b/package.json
@@ -134,8 +134,8 @@
     "prettier-plugin-packagejson": "^2.2.10",
     "pretty-quick": "3.1.0",
     "puppeteer": "2",
-    "react": "17.0.1",
-    "react-dom": "17.0.1",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
     "react-is": "^17.0.2",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
diff --git a/yarn.lock b/yarn.lock
index 5bd39e0b0814..81139a7155c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14948,14 +14948,14 @@ react-docgen@^5.0.0:
     node-dir "^0.1.10"
     strip-indent "^3.0.0"
 
-react-dom@17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
-  integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==
+react-dom@17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
+  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
-    scheduler "^0.20.1"
+    scheduler "^0.20.2"
 
 react-draggable@^4.0.3:
   version "4.4.3"
@@ -15158,10 +15158,10 @@ react-textarea-autosize@^8.1.1:
     use-composed-ref "^1.0.0"
     use-latest "^1.0.0"
 
-react@17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
-  integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
+react@17.0.2:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
+  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -15997,10 +15997,10 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@^0.20.1:
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
-  integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
+scheduler@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
+  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"

From 5f1f4a4391a590819abe70d3316e01cc105821f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 06:27:37 +0000
Subject: [PATCH 081/288] build(deps-dev): bump @babel/core from 7.13.10 to
 7.13.13 (#3361)

---
 package.json |   2 +-
 yarn.lock    | 125 ++++++++++++++++++++++++++-------------------------
 2 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/package.json b/package.json
index 01bd995c3fa9..11c105a0c278 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "unist-util-visit": "2.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.10",
+    "@babel/core": "^7.13.13",
     "@mdn/dinocons": "^0.3.0",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index 81139a7155c8..2d7840919b0f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -21,10 +21,10 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
   integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
 
-"@babel/compat-data@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.8.tgz#5b783b9808f15cef71547f1b691f34f8ff6003a6"
-  integrity sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==
+"@babel/compat-data@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1"
+  integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==
 
 "@babel/core@7.11.6":
   version "7.11.6"
@@ -70,20 +70,20 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.1", "@babel/core@^7.12.3", "@babel/core@^7.13.10", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.10.tgz#07de050bbd8193fcd8a3c27918c0890613a94559"
-  integrity sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==
+"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.1", "@babel/core@^7.12.3", "@babel/core@^7.13.13", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
+  version "7.13.13"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.13.tgz#bc44c4a2be2288ec4ddf56b66fc718019c76ac29"
+  integrity sha512-1xEs9jZAyKIouOoCmpsgk/I26PoKyvzQ2ixdRpRzfbcp1fL+ozw7TUgdDgwonbTovqRaTfRh50IXuw4QrWO0GA==
   dependencies:
     "@babel/code-frame" "^7.12.13"
     "@babel/generator" "^7.13.9"
-    "@babel/helper-compilation-targets" "^7.13.10"
-    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-compilation-targets" "^7.13.13"
+    "@babel/helper-module-transforms" "^7.13.12"
     "@babel/helpers" "^7.13.10"
-    "@babel/parser" "^7.13.10"
+    "@babel/parser" "^7.13.13"
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
+    "@babel/traverse" "^7.13.13"
+    "@babel/types" "^7.13.13"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -92,7 +92,7 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.11.6", "@babel/generator@^7.12.1", "@babel/generator@^7.13.0", "@babel/generator@^7.13.9":
+"@babel/generator@^7.11.6", "@babel/generator@^7.12.1", "@babel/generator@^7.13.9":
   version "7.13.9"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
   integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
@@ -140,12 +140,12 @@
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz#1310a1678cb8427c07a753750da4f8ce442bdd0c"
-  integrity sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==
+"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.13.13":
+  version "7.13.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5"
+  integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==
   dependencies:
-    "@babel/compat-data" "^7.13.8"
+    "@babel/compat-data" "^7.13.12"
     "@babel/helper-validator-option" "^7.12.17"
     browserslist "^4.14.5"
     semver "^6.3.0"
@@ -241,12 +241,12 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
-"@babel/helper-member-expression-to-functions@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091"
-  integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==
+"@babel/helper-member-expression-to-functions@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
+  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
   dependencies:
-    "@babel/types" "^7.13.0"
+    "@babel/types" "^7.13.12"
 
 "@babel/helper-module-imports@^7.0.0":
   version "7.10.4"
@@ -276,20 +276,26 @@
   dependencies:
     "@babel/types" "^7.12.5"
 
-"@babel/helper-module-transforms@^7.11.0", "@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1"
-  integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==
+"@babel/helper-module-imports@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
+  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
   dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.13.0"
-    "@babel/helper-simple-access" "^7.12.13"
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-module-transforms@^7.11.0", "@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz#600e58350490828d82282631a1422268e982ba96"
+  integrity sha512-7zVQqMO3V+K4JOOj40kxiCrMf6xlQAkewBB0eu2b03OO/Q21ZutOzjpfD79A5gtE/2OWi1nv625MrDlGlkbknQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.13.12"
+    "@babel/helper-replace-supers" "^7.13.12"
+    "@babel/helper-simple-access" "^7.13.12"
     "@babel/helper-split-export-declaration" "^7.12.13"
     "@babel/helper-validator-identifier" "^7.12.11"
     "@babel/template" "^7.12.13"
     "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
-    lodash "^4.17.19"
+    "@babel/types" "^7.13.12"
 
 "@babel/helper-optimise-call-expression@^7.10.4":
   version "7.10.4"
@@ -341,15 +347,15 @@
     "@babel/traverse" "^7.12.1"
     "@babel/types" "^7.12.1"
 
-"@babel/helper-replace-supers@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24"
-  integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==
+"@babel/helper-replace-supers@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
+  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.13.0"
+    "@babel/helper-member-expression-to-functions" "^7.13.12"
     "@babel/helper-optimise-call-expression" "^7.12.13"
     "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
+    "@babel/types" "^7.13.12"
 
 "@babel/helper-simple-access@^7.12.1":
   version "7.12.1"
@@ -358,12 +364,12 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
-"@babel/helper-simple-access@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"
-  integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==
+"@babel/helper-simple-access@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
+  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
   dependencies:
-    "@babel/types" "^7.12.13"
+    "@babel/types" "^7.13.12"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
   version "7.12.1"
@@ -443,10 +449,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.11.5", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.13.0", "@babel/parser@^7.13.10", "@babel/parser@^7.7.0":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.10.tgz#8f8f9bf7b3afa3eabd061f7a5bcdf4fec3c48409"
-  integrity sha512-0s7Mlrw9uTWkYua7xWr99Wpk2bnGa0ANleKfksYAES8LpWH4gW1OUr42vqKNf0us5UQNfru2wPqMqRITzq/SIQ==
+"@babel/parser@^7.1.0", "@babel/parser@^7.11.5", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.13.13", "@babel/parser@^7.7.0":
+  version "7.13.13"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df"
+  integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==
 
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.1"
@@ -1378,25 +1384,24 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.7.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc"
-  integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.7.0":
+  version "7.13.13"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.13.tgz#39aa9c21aab69f74d948a486dd28a2dbdbf5114d"
+  integrity sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.0"
+    "@babel/generator" "^7.13.9"
     "@babel/helper-function-name" "^7.12.13"
     "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.0"
-    "@babel/types" "^7.13.0"
+    "@babel/parser" "^7.13.13"
+    "@babel/types" "^7.13.13"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.19"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80"
-  integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.13", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.13.13"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.13.tgz#dcd8b815b38f537a3697ce84c8e3cc62197df96f"
+  integrity sha512-kt+EpC6qDfIaqlP+DIbIJOclYy/A1YXs9dAf/ljbi+39Bcbc073H6jKVpXEr/EoIh5anGn5xq/yRVzKl+uIc9w==
   dependencies:
     "@babel/helper-validator-identifier" "^7.12.11"
     lodash "^4.17.19"

From 8086a247949eb7173972bb1a395aa7ca91da84ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 06:29:30 +0000
Subject: [PATCH 082/288] build(deps-dev): bump jsdom from 16.5.1 to 16.5.2
 (#3362)

---
 package.json |  2 +-
 yarn.lock    | 39 +++++++++++++++++----------------------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 11c105a0c278..4641524503d6 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "jest-environment-jsdom-sixteen": "^1.0.3",
     "jest-junit-reporter": "^1.1.0",
     "jest-puppeteer": "4.4.0",
-    "jsdom": "^16.5.1",
+    "jsdom": "^16.5.2",
     "jsesc": "^3.0.2",
     "nodemon": "2.0.7",
     "pegjs": "^0.10.0",
diff --git a/yarn.lock b/yarn.lock
index 2d7840919b0f..91561296b342 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3644,10 +3644,10 @@ acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.5:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.5.tgz#a3bfb872a74a6a7f661bc81b9849d9cac12601b7"
-  integrity sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg==
+acorn@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe"
+  integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==
 
 address@1.1.2, address@^1.0.1:
   version "1.1.2"
@@ -11212,13 +11212,13 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdom@^16.2.1, jsdom@^16.4.0, jsdom@^16.5.1:
-  version "16.5.1"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.1.tgz#4ced6bbd7b77d67fb980e64d9e3e6fb900f97dd6"
-  integrity sha512-pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==
+jsdom@^16.2.1, jsdom@^16.4.0, jsdom@^16.5.2:
+  version "16.5.2"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.2.tgz#583fac89a0aea31dbf6237e7e4bedccd9beab472"
+  integrity sha512-JxNtPt9C1ut85boCbJmffaQ06NBnzkQY/MWO3YxPW8IWS38A26z+B1oBvA9LwKrytewdfymnhi4UNH3/RAgZrg==
   dependencies:
     abab "^2.0.5"
-    acorn "^8.0.5"
+    acorn "^8.1.0"
     acorn-globals "^6.0.0"
     cssom "^0.4.4"
     cssstyle "^2.3.0"
@@ -11240,7 +11240,7 @@ jsdom@^16.2.1, jsdom@^16.4.0, jsdom@^16.5.1:
     webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
+    whatwg-url "^8.5.0"
     ws "^7.4.4"
     xml-name-validator "^3.0.0"
 
@@ -11669,11 +11669,6 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
-lodash.sortby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
-
 lodash.template@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
@@ -11694,7 +11689,7 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.15, "lodash@>=3.5 <5", lodash@>=4.17.15, lodash@^4.0.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5:
+lodash@4.17.15, "lodash@>=3.5 <5", lodash@>=4.17.15, lodash@^4.0.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.7.0:
   version "4.17.19"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
   integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
@@ -18543,14 +18538,14 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
-whatwg-url@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.1.0.tgz#c628acdcf45b82274ce7281ee31dd3c839791771"
-  integrity sha512-vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw==
+whatwg-url@^8.0.0, whatwg-url@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3"
+  integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==
   dependencies:
-    lodash.sortby "^4.7.0"
+    lodash "^4.7.0"
     tr46 "^2.0.2"
-    webidl-conversions "^5.0.0"
+    webidl-conversions "^6.1.0"
 
 which-boxed-primitive@^1.0.1:
   version "1.0.2"

From d6328d6861861d6beec9cfb6d5542e949bafae4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 06:30:30 +0000
Subject: [PATCH 083/288] build(deps): bump http-proxy-middleware from 1.0.6 to
 1.1.0 (#3363)

---
 package.json |  2 +-
 yarn.lock    | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 4641524503d6..ee10d95eb80b 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "fs-extra": "9.1.0",
     "glob": "^7.1.6",
     "got": "11.8.2",
-    "http-proxy-middleware": "1.0.6",
+    "http-proxy-middleware": "1.1.0",
     "image-size": "0.9.7",
     "image-type": "4.1.0",
     "imagemin": "7.0.1",
diff --git a/yarn.lock b/yarn.lock
index 91561296b342..33823723f203 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2964,7 +2964,7 @@
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a"
   integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==
 
-"@types/http-proxy@^1.17.4":
+"@types/http-proxy@^1.17.5":
   version "1.17.5"
   resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.5.tgz#c203c5e6e9dc6820d27a40eb1e511c70a220423d"
   integrity sha512-GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q==
@@ -9513,15 +9513,16 @@ http-proxy-middleware@0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
-http-proxy-middleware@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.0.6.tgz#0618557722f450375d3796d701a8ac5407b3b94e"
-  integrity sha512-NyL6ZB6cVni7pl+/IT2W0ni5ME00xR0sN27AQZZrpKn1b+qRh+mLbBxIq9Cq1oGfmTc7BUq4HB77mxwCaxAYNg==
+http-proxy-middleware@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.1.0.tgz#b896b2cc6836019af4a4f2d5f7b21b99c77ea13f"
+  integrity sha512-OnjU5vyVgcZVe2AjLJyMrk8YLNOC2lspCHirB5ldM+B/dwEfZ5bgVTrFyzE9R7xRWAP/i/FXtvIqKjTNEZBhBg==
   dependencies:
-    "@types/http-proxy" "^1.17.4"
+    "@types/http-proxy" "^1.17.5"
+    camelcase "^6.2.0"
     http-proxy "^1.18.1"
     is-glob "^4.0.1"
-    lodash "^4.17.20"
+    is-plain-obj "^3.0.0"
     micromatch "^4.0.2"
 
 http-proxy@^1.17.0, http-proxy@^1.18.1:
@@ -10324,6 +10325,11 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
+is-plain-obj@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
+  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
+
 is-plain-object@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928"

From 4895006761d94a8ce65cdb21a943fe750f357079 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 06:31:00 +0000
Subject: [PATCH 084/288] build(deps-dev): bump html-validate from 4.7.1 to
 4.8.0 (#3364)

---
 package.json |  2 +-
 yarn.lock    | 33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index ee10d95eb80b..9affbdeb07bd 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "fuzzyjs": "4.0.4",
     "fuzzysearch": "1.0.3",
     "history": "5.0.0",
-    "html-validate": "4.7.1",
+    "html-validate": "4.8.0",
     "husky": "4.3.8",
     "ignore-loader": "^0.1.2",
     "jest-environment-jsdom-sixteen": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index 33823723f203..891ddfdc18e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,7 +9,7 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
   integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
@@ -1622,7 +1622,7 @@
   dependencies:
     "@hapi/hoek" "^8.3.0"
 
-"@html-validate/stylish@1.0.0":
+"@html-validate/stylish@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@html-validate/stylish/-/stylish-1.0.0.tgz#f8700775d8863e7de50564f8d3e6908a5f40ab9d"
   integrity sha512-NW6TZ7/GA+Z+1fNGDqkxutHQEsDivuN6ZM9ALMqSsDuO1QHJ4Ws1hAecwzvDezwSEXArLcqXd1RqZCYi3GA6KQ==
@@ -6553,7 +6553,7 @@ deep-object-diff@^1.1.0:
   resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a"
   integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==
 
-deepmerge@^4.2.2:
+deepmerge@^4.2.0, deepmerge@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
@@ -8723,7 +8723,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.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.0, 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==
@@ -9391,22 +9391,23 @@ html-tags@^3.1.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
   integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
 
-html-validate@4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.7.1.tgz#7d7a504ce9555fe83e40a5d1c4c3544929491141"
-  integrity sha512-GelR6b//NLRrgbdn9K//dCJd/FhU6IPNliPIryLq0EUb/6a9hD1+ihoqIHHoqZHMIdk5e7epKEJpaxEZeRJ1Fg==
+html-validate@4.8.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.8.0.tgz#938d3b1eeaae21b0114173d79f822905652c9551"
+  integrity sha512-d7PTUw8fGupEw3/PozLTReKySwq2wtLQNJ8ZmWIqdW63zw7IprXzNJ2LmQwC9yETP+NJGcFCzysvzzi2A0sCWw==
   dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@html-validate/stylish" "1.0.0"
+    "@babel/code-frame" "^7.10.0"
+    "@html-validate/stylish" "^1.0.0"
     "@sidvind/better-ajv-errors" "^0.8.0"
     acorn-walk "^8.0.0"
     ajv "^7.0.0"
     chalk "^4.0.0"
-    deepmerge "^4.2.2"
+    deepmerge "^4.2.0"
     espree "^7.3.0"
-    glob "^7.1.6"
-    json-merge-patch "^1.0.1"
-    minimist "^1.2.5"
+    glob "^7.1.0"
+    ignore "^5.0.0"
+    json-merge-patch "^1.0.0"
+    minimist "^1.2.0"
     prompts "^2.0.0"
 
 html-void-elements@^1.0.0:
@@ -9636,7 +9637,7 @@ ignore@^4.0.3, ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
+ignore@^5.0.0, ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
@@ -11275,7 +11276,7 @@ json-buffer@3.0.1:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-json-merge-patch@^1.0.1:
+json-merge-patch@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-merge-patch/-/json-merge-patch-1.0.1.tgz#7ab1f9e51927d42fb7b355549460914b08f50c18"
   integrity sha512-yvT2j/jJZ2S53t+WLt1/y2pvyR1UKPl1d/tJUjwnbtwdQQcloPhGS0bkEq/L6I32l1nhleU57GTkbv64t8eHQA==

From d3e38ab317fe5b1277a5965c1d2fa068c910077a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 06:32:12 +0000
Subject: [PATCH 085/288] build(deps-dev): bump ts-loader from 8.0.18 to 8.1.0
 (#3365)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9affbdeb07bd..2ff8adc784b1 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "stylelint-prettier": "^1.2.0",
     "stylelint-scss": "^3.19.0",
     "swr": "^0.5.4",
-    "ts-loader": "^8.0.18",
+    "ts-loader": "^8.1.0",
     "typescript": "^4.2.3",
     "use-debounce": "^5.2.1",
     "webpack": "^4.44.2",
diff --git a/yarn.lock b/yarn.lock
index 891ddfdc18e0..6e206f090c34 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17622,10 +17622,10 @@ ts-essentials@^2.0.3:
   resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
   integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==
 
-ts-loader@^8.0.18:
-  version "8.0.18"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.18.tgz#b2385cbe81c34ad9f997915129cdde3ad92a61ea"
-  integrity sha512-hRZzkydPX30XkLaQwJTDcWDoxZHK6IrEMDQpNd7tgcakFruFkeUp/aY+9hBb7BUGb+ZWKI0jiOGMo0MckwzdDQ==
+ts-loader@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.1.0.tgz#d6292487df279c7cc79b6d3b70bb9d31682b693e"
+  integrity sha512-YiQipGGAFj2zBfqLhp28yUvPP9jUGqHxRzrGYuc82Z2wM27YIHbElXiaZDc93c3x0mz4zvBmS6q/DgExpdj37A==
   dependencies:
     chalk "^4.1.0"
     enhanced-resolve "^4.0.0"

From 09a418a0eaeffbb4ff6eeced7ced07fbe9750dce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 06:33:20 +0000
Subject: [PATCH 086/288] build(deps-dev): bump webpack-cli from 4.5.0 to 4.6.0
 (#3366)

---
 package.json |  2 +-
 yarn.lock    | 45 ++++++++++++++++++++-------------------------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index 2ff8adc784b1..368de9648873 100644
--- a/package.json
+++ b/package.json
@@ -154,7 +154,7 @@
     "typescript": "^4.2.3",
     "use-debounce": "^5.2.1",
     "webpack": "^4.44.2",
-    "webpack-cli": "^4.5.0",
+    "webpack-cli": "^4.6.0",
     "webpack-node-externals": "^2.5.2"
   },
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index 6e206f090c34..b8501518d0ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3544,22 +3544,22 @@
     "@webassemblyjs/wast-parser" "1.9.0"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.1.tgz#241aecfbdc715eee96bed447ed402e12ec171935"
-  integrity sha512-B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ==
+"@webpack-cli/configtest@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz#2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836"
+  integrity sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA==
 
-"@webpack-cli/info@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.2.tgz#ef3c0cd947a1fa083e174a59cb74e0b6195c236c"
-  integrity sha512-5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ==
+"@webpack-cli/info@^1.2.3":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz#ef819d10ace2976b6d134c7c823a3e79ee31a92c"
+  integrity sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q==
   dependencies:
     envinfo "^7.7.3"
 
-"@webpack-cli/serve@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.0.tgz#2730c770f5f1f132767c63dcaaa4ec28f8c56a6c"
-  integrity sha512-k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw==
+"@webpack-cli/serve@^1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz#911d1b3ff4a843304b9c3bacf67bb34672418441"
+  integrity sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw==
 
 "@webpack-contrib/schema-utils@^1.0.0-beta.0":
   version "1.0.0-beta.0"
@@ -5661,12 +5661,7 @@ commander@^5.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
-commander@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
-  integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==
-
-commander@^7.1.0:
+commander@^7.0.0, commander@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff"
   integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==
@@ -18344,15 +18339,15 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-cli@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.5.0.tgz#b5213b84adf6e1f5de6391334c9fa53a48850466"
-  integrity sha512-wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q==
+webpack-cli@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz#27ae86bfaec0cf393fcfd58abdc5a229ad32fd16"
+  integrity sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.0.1"
-    "@webpack-cli/info" "^1.2.2"
-    "@webpack-cli/serve" "^1.3.0"
+    "@webpack-cli/configtest" "^1.0.2"
+    "@webpack-cli/info" "^1.2.3"
+    "@webpack-cli/serve" "^1.3.1"
     colorette "^1.2.1"
     commander "^7.0.0"
     enquirer "^2.3.6"

From 8afca3044f8543d173e03baafcb3bb1a9557af85 Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Mon, 29 Mar 2021 16:10:45 +0900
Subject: [PATCH 087/288] =?UTF-8?q?Drop=20all=20=E2=80=9CDoc=20status?=
 =?UTF-8?q?=E2=80=9D=20links=20from=20sidebars=20(#3367)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes https://github.com/mdn/content/issues/3602
---
 kumascript/macros/HTMLSidebar.ejs          | 5 -----
 kumascript/macros/ServiceWorkerSidebar.ejs | 3 ---
 kumascript/macros/WebGLSidebar.ejs         | 5 -----
 kumascript/macros/WebRTCSidebar.ejs        | 3 ---
 4 files changed, 16 deletions(-)

diff --git a/kumascript/macros/HTMLSidebar.ejs b/kumascript/macros/HTMLSidebar.ejs
index c40e54cdda78..d4eb435f5507 100644
--- a/kumascript/macros/HTMLSidebar.ejs
+++ b/kumascript/macros/HTMLSidebar.ejs
@@ -43,7 +43,6 @@ var text = mdn.localStringMap({
     'Index': 'All pages index',
     'HTML_tag': 'Pages tagged "HTML"',
     'Contribute': 'Contribute',
-    'Doc_status': 'HTML doc status',
     'The_MDN_project': 'The MDN project',
   },
   'fr': {
@@ -62,7 +61,6 @@ var text = mdn.localStringMap({
     'Index': 'Index de toutes les pages',
     'HTML_tag': 'Pages étiquetées "HTML"',
     'Contribute': 'Contribuer',
-    'Doc_status': 'Statut de la documentation HTML',
     'The_MDN_project': 'Le projet MDN',
   },
   'pt-BR': {
@@ -96,7 +94,6 @@ var text = mdn.localStringMap({
     'Index': 'Índice para todas as páginas',
     'HTML_tag': 'Páginas com a tag "HTML"',
     'Contribute': 'Contribua!',
-    'Doc_status': 'Estado da documentação do HTML',
     'The_MDN_project': 'O projeto MDN',
   },
   'ru': {
@@ -115,7 +112,6 @@ var text = mdn.localStringMap({
     'Index': 'Индекс всех страниц',
     'HTML_tag': 'Страницы отмеченные "HTML"',
     'Contribute': 'Внести вклад',
-    'Doc_status': 'Статус HTML документации',
     'The_MDN_project': 'Проект MDN',
   }
 });
@@ -187,7 +183,6 @@ var text = mdn.localStringMap({
     <details <%=state('Contribute')%>>
       <summary><%=text['Contribute']%></summary>
       <ol>
-        <li><a href="/<%=locale%>/docs/MDN/Doc_status/HTML"><%=text['Doc_status']%></a></li>
         <li><a href="/<%=locale%>/docs/MDN"><%=text['The_MDN_project']%></a></li>
       </ol>
     </details>
diff --git a/kumascript/macros/ServiceWorkerSidebar.ejs b/kumascript/macros/ServiceWorkerSidebar.ejs
index 313888808961..2fe15cda6013 100644
--- a/kumascript/macros/ServiceWorkerSidebar.ejs
+++ b/kumascript/macros/ServiceWorkerSidebar.ejs
@@ -19,7 +19,6 @@ var text = mdn.localStringMap({
     'Useful_lists': 'Useful lists',
     'Service_Worker_tag': 'Pages tagged "ServiceWorker"',
     'Contribute': 'Contribute',
-    'Doc_status': 'Service Worker doc status',
     'The_MDN_project': 'The MDN project',
     'Using_Service_Workers': 'Using Service Workers',
     'Related_APIs': 'Related APIs',
@@ -37,7 +36,6 @@ var text = mdn.localStringMap({
     'Useful_lists': 'Полезные списки',
     'Service_Worker_tag': 'Страницы отмеченные "ServiceWorker"',
     'Contribute': 'Внести вклад',
-    'Doc_status': 'Статус документации по Service Worker',
     'The_MDN_project': 'Проект MDN',
     'Using_Service_Workers': 'Использование Service Workers',
     'Related_APIs': 'Похожие API',
@@ -110,7 +108,6 @@ var text = mdn.localStringMap({
     <details <%=state('Contribute')%>>
         <summary><%=text['Contribute']%></summary>
         <ol>
-          <li><a href="/<%=locale%>/docs/MDN/Doc_status/API/ServiceWorkers"><%=text['Doc_status']%></a></li>
           <li><a href="/<%=locale%>/docs/MDN"><%=text['The_MDN_project']%></a></li>
         </ol>
     </details>
diff --git a/kumascript/macros/WebGLSidebar.ejs b/kumascript/macros/WebGLSidebar.ejs
index 586e4c5fd92f..bdaa66ca5609 100644
--- a/kumascript/macros/WebGLSidebar.ejs
+++ b/kumascript/macros/WebGLSidebar.ejs
@@ -33,7 +33,6 @@ var text = mdn.localStringMap({
     'Useful_lists': 'Useful lists',
     'WebGL_tag': 'Pages tagged "WebGL"',
     'Contribute': 'Contribute',
-    'Doc_status': 'WebGL doc status',
     'The_MDN_project': 'The MDN project',
   },
    'de': {
@@ -58,7 +57,6 @@ var text = mdn.localStringMap({
     'Useful_lists': 'Nützliche Listen',
     'WebGL_tag': 'Seiten mit dem Tag "WebGL"',
     'Contribute': 'Mitmachen',
-    'Doc_status': 'Status der WebGL-Dokumentation',
     'The_MDN_project': 'Das MDN-Projekt',
   },
   'fr': {
@@ -83,7 +81,6 @@ var text = mdn.localStringMap({
     'Useful_lists': 'Listes utiles',
     'WebGL_tag': 'Pages étiquetées "WebGL"',
     'Contribute': 'Contribuer',
-    'Doc_status': 'Statut de la documentation',
     'The_MDN_project': 'Le projet MDN',
   },
   'ru': {
@@ -108,7 +105,6 @@ var text = mdn.localStringMap({
     'Useful_lists': 'Полезные списки',
     'WebGL_tag': 'Страницы отмеченные "WebGL"',
     'Contribute': 'Внести вклад',
-    'Doc_status': 'Стутус документации WebGL',
     'The_MDN_project': 'Проект MDN',
   }
 });
@@ -182,7 +178,6 @@ var text = mdn.localStringMap({
     <details <%=state('Contribute')%>>
       <summary><%=text['Contribute']%></summary>
       <ol>
-        <li><a href="/<%=locale%>/docs/MDN/Doc_status/API/WebGL"><%=text['Doc_status']%></a></li>
         <li><a href="/<%=locale%>/docs/MDN"><%=text['The_MDN_project']%></a></li>
       </ol>
     </details>
diff --git a/kumascript/macros/WebRTCSidebar.ejs b/kumascript/macros/WebRTCSidebar.ejs
index b13c427c95b0..86711088b47a 100644
--- a/kumascript/macros/WebRTCSidebar.ejs
+++ b/kumascript/macros/WebRTCSidebar.ejs
@@ -29,7 +29,6 @@ var text = mdn.localStringMap({
     'Useful_lists': 'Useful lists',
     'WebRTC_tag': 'Pages tagged "WebRTC"',
     'Contribute': 'Contribute',
-    'Doc_status': 'WebRTC doc status',
     'The_MDN_project': 'The MDN project',
     'build_a_phone_with_peer_js': 'Building an internet-connected phone with Peer.js',
   },
@@ -51,7 +50,6 @@ var text = mdn.localStringMap({
     'Useful_lists': 'Полезные списки',
     'WebRTC_tag': 'Страницы, отмеченные "WebRTC"',
     'Contribute': 'Внести вклад',
-    'Doc_status': 'Статус документации по WebRTC',
     'The_MDN_project': 'Проект MDN',
   }
 });
@@ -116,7 +114,6 @@ var text = mdn.localStringMap({
     <details <%=state('Contribute')%>>
       <summary><%=text['Contribute']%></summary>
       <ol>
-        <li><a href="/<%=locale%>/docs/MDN/Doc_status/API/WebRTC"><%=text['Doc_status']%></a></li>
         <li><a href="/<%=locale%>/docs/MDN"><%=text['The_MDN_project']%></a></li>
       </ol>
     </details>

From eed9a77a046c06c576981a38df0b42c1316c57a6 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 29 Mar 2021 07:01:44 -0400
Subject: [PATCH 088/288] update search-index till we figure out
 yari/issues/3359 (#3370)

---
 .github/workflows/prod-build.yml  | 4 +++-
 .github/workflows/stage-build.yml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
index a4d21ac71729..d5a19aa22263 100644
--- a/.github/workflows/prod-build.yml
+++ b/.github/workflows/prod-build.yml
@@ -238,7 +238,9 @@ jobs:
           # where the Elasticsearch server is nearly empty.
           # Consider doing something like a clean indexing on Sundays and
           # use `--update` on all the other week days.
-          poetry run deployer search-index ../client/build --priority-prefix=en-us/docs/web
+          # poetry run deployer search-index ../client/build --priority-prefix=en-us/docs/web
+          # TEMPORARY
+          poetry run deployer search-index ../client/build --update
 
           # Record the deployment in our Speedcurve account. This should always
           # be done after the upload of the documents and Lambda functions, as well
diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
index 824fce3eda64..d533ca7c3c26 100644
--- a/.github/workflows/stage-build.yml
+++ b/.github/workflows/stage-build.yml
@@ -251,7 +251,9 @@ jobs:
           # where the Elasticsearch server is nearly empty.
           # Consider doing something like a clean indexing on Sundays and
           # use `--update` on all the other week days.
-          poetry run deployer search-index ../client/build --priority-prefix=en-us/docs/web
+          # poetry run deployer search-index ../client/build --priority-prefix=en-us/docs/web
+          # TEMPORARY
+          poetry run deployer search-index ../client/build --update
 
           # Record the deployment in our Speedcurve account. This should always
           # be done after the upload of the documents and Lambda functions, as well

From 3547a5a015265d9f49daaeac4bcce1d6905b062b Mon Sep 17 00:00:00 2001
From: Florian Dieminger <me@fiji-flo.de>
Date: Mon, 29 Mar 2021 15:18:53 +0200
Subject: [PATCH 089/288] replace rawHTML -> rawBody where forgotten (#3374)

---
 content/document.js |  2 +-
 tool/cli.js         | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/content/document.js b/content/document.js
index d4fc1f99b300..72c2be94916f 100644
--- a/content/document.js
+++ b/content/document.js
@@ -513,7 +513,7 @@ function move(oldSlug, newSlug, locale, { dry = false } = {}) {
   }
 
   doc.metadata.slug = newSlug;
-  update(oldUrl, doc.rawHTML, doc.metadata);
+  update(oldUrl, doc.rawBody, doc.metadata);
 
   return pairs;
 }
diff --git a/tool/cli.js b/tool/cli.js
index 580001d9f596..208f93df92d5 100644
--- a/tool/cli.js
+++ b/tool/cli.js
@@ -822,7 +822,7 @@ if (Mozilla && !Mozilla.dntEnabled()) {
       for (const document of documents.iter()) {
         countTotal++;
         console.group(`${document.fileInfo.path}:`);
-        const originalRawHTML = document.rawHTML;
+        const originalRawBody = document.rawBody;
         let [renderedHTML, flaws] = await renderOrRemoveMacros(document);
         if (flaws.length) {
           const fixableFlaws = flaws.filter((f) => f.redirectInfo);
@@ -844,13 +844,13 @@ if (Mozilla && !Mozilla.dntEnabled()) {
               );
               // Let's start fresh so we don't keep the "data-flaw-src"
               // attributes that may have been injected during the rendering.
-              document.rawHTML = originalRawHTML;
+              document.rawBody = originalRawBody;
               for (const flaw of fixableFlaws) {
                 const suggestion = flaw.macroSource.replace(
                   flaw.redirectInfo.current,
                   flaw.redirectInfo.suggested
                 );
-                document.rawHTML = document.rawHTML.replace(
+                document.rawBody = document.rawBody.replace(
                   flaw.macroSource,
                   suggestion
                 );
@@ -859,7 +859,7 @@ if (Mozilla && !Mozilla.dntEnabled()) {
               console.groupEnd();
               Document.update(
                 document.url,
-                document.rawHTML,
+                document.rawBody,
                 document.metadata
               );
               // Ok, we've fixed the fixable flaws, now let's render again.
@@ -881,7 +881,7 @@ if (Mozilla && !Mozilla.dntEnabled()) {
         // to get what we'll store in the document.
         const $ = cheerio.load(renderedHTML);
         const newRawHTML = $("body").html();
-        if (newRawHTML !== originalRawHTML) {
+        if (newRawHTML !== originalRawBody) {
           Document.update(document.url, newRawHTML, document.metadata);
           console.log(`modified`);
           countModified++;

From d862690a466d8c111b395f0fd9c8b00a2926e6b7 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 29 Mar 2021 09:26:04 -0400
Subject: [PATCH 090/288] Alternate lang link tags are broken (#3372)

Fixes #3358
---
 ssr/render.js               | 6 +++++-
 testing/tests/index.test.js | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ssr/render.js b/ssr/render.js
index 1918621f10bf..67aac4f00f35 100644
--- a/ssr/render.js
+++ b/ssr/render.js
@@ -197,12 +197,16 @@ export default function render(
         url: doc.mdn_url,
       };
       for (const translation of [...doc.other_translations, thisLocale]) {
+        const translationURL = doc.mdn_url.replace(
+          `/${doc.locale}/`,
+          `/${translation.locale}/`
+        );
         // The locale used in `<link rel="alternate">` needs to be the ISO-639-1
         // code. For example, it's "en", not "en-US". And it's "sv" not "sv-SE".
         // See https://developers.google.com/search/docs/advanced/crawling/localized-versions?hl=en&visit_id=637411409912568511-3980844248&rd=1#language-codes
         $('<link rel="alternate">')
           .attr("title", translation.title)
-          .attr("href", `https://developer.mozilla.org${translation.url}`)
+          .attr("href", `https://developer.mozilla.org${translationURL}`)
           .attr("hreflang", getHrefLang(translation.locale, allOtherLocales))
           .insertAfter("title");
       }
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 2f6ccb665ea1..1bbb2592b2ae 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -154,6 +154,13 @@ test("content built foo page", () => {
   expect($('link[rel="alternate"]').length).toBe(2);
   expect($('link[rel="alternate"][hreflang="en"]').length).toBe(1);
   expect($('link[rel="alternate"][hreflang="fr"]').length).toBe(1);
+  const toEnUSURL = $('link[rel="alternate"][hreflang="en"]').attr("href");
+  const toFrURL = $('link[rel="alternate"][hreflang="fr"]').attr("href");
+  // The domain is hardcoded because the URL needs to be absolute and when
+  // building static assets for Dev or Stage, you don't know what domain is
+  // going to be used.
+  expect(toEnUSURL).toBe("https://developer.mozilla.org/en-US/docs/Web/Foo");
+  expect(toFrURL).toBe("https://developer.mozilla.org/fr/docs/Web/Foo");
 });
 
 test("icons mentioned in <head> should resolve", () => {
@@ -978,7 +985,6 @@ test("settings page", () => {
   const html = fs.readFileSync(htmlFile, "utf-8");
   const $ = cheerio.load(html);
   expect($("h1").text()).toBe("Account settings");
-  console.log($("title").text());
   expect($("title").text()).toContain("Account settings");
 
   const jsonFile = path.join(builtFolder, "index.json");

From 0c21ec6d9dc420eaeb41cd119bb6d904bd401fc7 Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Mon, 29 Mar 2021 23:03:01 +0900
Subject: [PATCH 091/288] =?UTF-8?q?Drop=20all=20=E2=80=9CPages=20tagged=20?=
 =?UTF-8?q?Foo=E2=80=9D=20stuff=20from=20sidebars=20(#3352)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes https://github.com/mdn/content/issues/3557
---
 kumascript/macros/CanvasSidebar.ejs        | 13 -------------
 kumascript/macros/HTMLSidebar.ejs          |  5 -----
 kumascript/macros/ServiceWorkerSidebar.ejs | 10 ----------
 kumascript/macros/WebGLSidebar.ejs         | 12 ------------
 kumascript/macros/WebRTCSidebar.ejs        | 10 ----------
 5 files changed, 50 deletions(-)

diff --git a/kumascript/macros/CanvasSidebar.ejs b/kumascript/macros/CanvasSidebar.ejs
index 31bd58b5abfd..402e556e411f 100644
--- a/kumascript/macros/CanvasSidebar.ejs
+++ b/kumascript/macros/CanvasSidebar.ejs
@@ -33,7 +33,6 @@ var text = mdn.localStringMap({
     'Interfaces': 'Interfaces',
     'Documentation': 'Documentation:',
     'Useful_lists': 'Useful lists',
-    'Canvas_tag': 'Pages tagged "Canvas"',
     'Contribute': 'Contribute',
     'The_MDN_project': 'The MDN project',
   },
@@ -60,7 +59,6 @@ var text = mdn.localStringMap({
     'Interfaces': '接口',
     'Documentation': '文档:',
     'Useful_lists': '常用页面列表',
-    'Canvas_tag': '拥有 "Canvas" 标签的页面',
     'Contribute': '贡献',
     'The_MDN_project': 'MDN 项目',
   },
@@ -87,7 +85,6 @@ var text = mdn.localStringMap({
     'Interfaces': 'Интерфейсы',
     'Documentation': 'Документация:',
     'Useful_lists': 'Полезные списки',
-    'Canvas_tag': 'Страницы отмеченные "Canvas"',
     'Contribute': 'Внести свой вклад',
     'The_MDN_project': 'Проект MDN',
   },
@@ -114,7 +111,6 @@ var text = mdn.localStringMap({
     'Interfaces': 'インターフェイス',
     'Documentation': 'ドキュメント:',
     'Useful_lists': '有益なリスト',
-    'Canvas_tag': '"Canvas" とタグ付けされたページ',
     'Contribute': '貢献',
     'The_MDN_project': 'MDN プロジェクト',
   },
@@ -141,7 +137,6 @@ var text = mdn.localStringMap({
     'Interfaces': '인터페이스',
     'Documentation': '문서:',
     'Useful_lists': '유용한 리스트',
-    'Canvas_tag': '"Canvas"가 태그된 페이지',
     'Contribute': '기여하기',
     'The_MDN_project': 'MDN 프로젝트',
   }
@@ -196,14 +191,6 @@ var text = mdn.localStringMap({
     </details>
   </li>
   <li><strong><a href="/<%=locale%>/docs/MDN"><%=text['Documentation']%></a></strong></li>
-  <li class="toggle">
-    <details <%=state('Useful_lists')%>>
-      <summary><%=text['Useful_lists']%></summary>
-      <ol>
-        <li><a href="/<%=locale%>/docs/tag/Canvas"><%=text['Canvas_tag']%></a></li>
-      </ol>
-    </details>
-  </li>
   <li class="toggle">
     <details <%=state('Contribute')%>>
       <summary><%=text['Contribute']%></summary>
diff --git a/kumascript/macros/HTMLSidebar.ejs b/kumascript/macros/HTMLSidebar.ejs
index d4eb435f5507..c89c18b73030 100644
--- a/kumascript/macros/HTMLSidebar.ejs
+++ b/kumascript/macros/HTMLSidebar.ejs
@@ -41,7 +41,6 @@ var text = mdn.localStringMap({
     'Documentation': 'Documentation:',
     'Useful_lists': 'Useful lists',
     'Index': 'All pages index',
-    'HTML_tag': 'Pages tagged "HTML"',
     'Contribute': 'Contribute',
     'The_MDN_project': 'The MDN project',
   },
@@ -59,7 +58,6 @@ var text = mdn.localStringMap({
     'Documentation': 'Documentation\xa0:',
     'Useful_lists': 'Listes utiles',
     'Index': 'Index de toutes les pages',
-    'HTML_tag': 'Pages étiquetées "HTML"',
     'Contribute': 'Contribuer',
     'The_MDN_project': 'Le projet MDN',
   },
@@ -92,7 +90,6 @@ var text = mdn.localStringMap({
     'Documentation': 'Documentação:',
     'Useful_lists': 'Listas úteis',
     'Index': 'Índice para todas as páginas',
-    'HTML_tag': 'Páginas com a tag "HTML"',
     'Contribute': 'Contribua!',
     'The_MDN_project': 'O projeto MDN',
   },
@@ -110,7 +107,6 @@ var text = mdn.localStringMap({
     'Documentation': 'Документация:',
     'Useful_lists': 'Полезные списки',
     'Index': 'Индекс всех страниц',
-    'HTML_tag': 'Страницы отмеченные "HTML"',
     'Contribute': 'Внести вклад',
     'The_MDN_project': 'Проект MDN',
   }
@@ -176,7 +172,6 @@ var text = mdn.localStringMap({
     <details <%=state('Useful_lists')%>>
       <summary><%=text['Useful_lists']%></summary>
       <li><a href="/<%=locale%>/docs/Web/HTML/Index"><%=text['Index']%></a></li>
-      <li><a href="/<%=locale%>/docs/tag/HTML"><%=text['HTML_tag']%></a></li>
     </details>
   </li>
   <li class="toggle">
diff --git a/kumascript/macros/ServiceWorkerSidebar.ejs b/kumascript/macros/ServiceWorkerSidebar.ejs
index 2fe15cda6013..4a4c73234cdd 100644
--- a/kumascript/macros/ServiceWorkerSidebar.ejs
+++ b/kumascript/macros/ServiceWorkerSidebar.ejs
@@ -17,7 +17,6 @@ var text = mdn.localStringMap({
     'Interfaces': 'Interfaces',
     'Documentation': 'Documentation:',
     'Useful_lists': 'Useful lists',
-    'Service_Worker_tag': 'Pages tagged "ServiceWorker"',
     'Contribute': 'Contribute',
     'The_MDN_project': 'The MDN project',
     'Using_Service_Workers': 'Using Service Workers',
@@ -34,7 +33,6 @@ var text = mdn.localStringMap({
     'Interfaces': 'Интерфейсы',
     'Documentation': 'Документация:',
     'Useful_lists': 'Полезные списки',
-    'Service_Worker_tag': 'Страницы отмеченные "ServiceWorker"',
     'Contribute': 'Внести вклад',
     'The_MDN_project': 'Проект MDN',
     'Using_Service_Workers': 'Использование Service Workers',
@@ -96,14 +94,6 @@ var text = mdn.localStringMap({
     </details>
   </li>
   <li><strong><a href="/<%=locale%>/docs/MDN"><%=text['Documentation']%></a></strong></li>
-  <li class="toggle">
-    <details <%=state('Useful_lists')%>>
-        <summary><%=text['Useful_lists']%></summary>
-        <ol>
-          <li><a href="/<%=locale%>/docs/tag/ServiceWorker"><%=text['Service_Worker_tag']%></a></li>
-        </ol>
-    </details>
-  </li>
   <li class="toggle">
     <details <%=state('Contribute')%>>
         <summary><%=text['Contribute']%></summary>
diff --git a/kumascript/macros/WebGLSidebar.ejs b/kumascript/macros/WebGLSidebar.ejs
index bdaa66ca5609..9e5323ede06e 100644
--- a/kumascript/macros/WebGLSidebar.ejs
+++ b/kumascript/macros/WebGLSidebar.ejs
@@ -31,7 +31,6 @@ var text = mdn.localStringMap({
     'Interfaces': 'Interfaces',
     'Documentation': 'Documentation:',
     'Useful_lists': 'Useful lists',
-    'WebGL_tag': 'Pages tagged "WebGL"',
     'Contribute': 'Contribute',
     'The_MDN_project': 'The MDN project',
   },
@@ -55,7 +54,6 @@ var text = mdn.localStringMap({
     'Interfaces': 'Interfaces',
     'Documentation': 'Dokumentation:',
     'Useful_lists': 'Nützliche Listen',
-    'WebGL_tag': 'Seiten mit dem Tag "WebGL"',
     'Contribute': 'Mitmachen',
     'The_MDN_project': 'Das MDN-Projekt',
   },
@@ -79,7 +77,6 @@ var text = mdn.localStringMap({
     'Interfaces': 'Interfaces',
     'Documentation': 'Documentation:',
     'Useful_lists': 'Listes utiles',
-    'WebGL_tag': 'Pages étiquetées "WebGL"',
     'Contribute': 'Contribuer',
     'The_MDN_project': 'Le projet MDN',
   },
@@ -103,7 +100,6 @@ var text = mdn.localStringMap({
     'Interfaces': 'Интерфейсы',
     'Documentation': 'Доментация:',
     'Useful_lists': 'Полезные списки',
-    'WebGL_tag': 'Страницы отмеченные "WebGL"',
     'Contribute': 'Внести вклад',
     'The_MDN_project': 'Проект MDN',
   }
@@ -166,14 +162,6 @@ var text = mdn.localStringMap({
   </li>
 
   <li><strong><a href="/<%=locale%>/docs/MDN"><%=text['Documentation']%></a></strong></li>
-  <li class="toggle">
-    <details <%=state('Useful lists')%>>
-      <summary><%=text['Useful_lists']%></summary>
-      <ol>
-        <li><a href="/<%=locale%>/docs/tag/WebGL"><%=text['WebGL_tag']%></a></li>
-      </ol>
-    </details>
-  </li>
   <li class="toggle">
     <details <%=state('Contribute')%>>
       <summary><%=text['Contribute']%></summary>
diff --git a/kumascript/macros/WebRTCSidebar.ejs b/kumascript/macros/WebRTCSidebar.ejs
index 86711088b47a..b4a1364e5872 100644
--- a/kumascript/macros/WebRTCSidebar.ejs
+++ b/kumascript/macros/WebRTCSidebar.ejs
@@ -27,7 +27,6 @@ var text = mdn.localStringMap({
     'Interfaces': 'Interfaces',
     'Documentation': 'Documentation:',
     'Useful_lists': 'Useful lists',
-    'WebRTC_tag': 'Pages tagged "WebRTC"',
     'Contribute': 'Contribute',
     'The_MDN_project': 'The MDN project',
     'build_a_phone_with_peer_js': 'Building an internet-connected phone with Peer.js',
@@ -48,7 +47,6 @@ var text = mdn.localStringMap({
     'Interfaces': 'Интерфейсы',
     'Documentation': 'Документация:',
     'Useful_lists': 'Полезные списки',
-    'WebRTC_tag': 'Страницы, отмеченные "WebRTC"',
     'Contribute': 'Внести вклад',
     'The_MDN_project': 'Проект MDN',
   }
@@ -102,14 +100,6 @@ var text = mdn.localStringMap({
     </details>
   </li>
   <li><strong><a href="/<%=locale%>/docs/MDN"><%=text['Documentation']%></a></strong></li>
-  <li class="toggle">
-    <details <%=state('Useful lists')%>>
-      <summary><%=text['Useful_lists']%></summary>
-      <ol>
-        <li><a href="/<%=locale%>/docs/tag/WebRTC"><%=text['WebRTC_tag']%></a></li>
-      </ol>
-    </details>
-  </li>
   <li class="toggle">
     <details <%=state('Contribute')%>>
       <summary><%=text['Contribute']%></summary>

From 6702a915ec6736ac473d4086b5819386ce47dc20 Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Tue, 30 Mar 2021 00:06:57 +0900
Subject: [PATCH 092/288] Specify overview for XMLHttpRequest in GroupData
 (#3354)

Fixes https://github.com/mdn/content/issues/3549
---
 kumascript/macros/GroupData.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kumascript/macros/GroupData.json b/kumascript/macros/GroupData.json
index bc54207ff160..de8bab268c7d 100644
--- a/kumascript/macros/GroupData.json
+++ b/kumascript/macros/GroupData.json
@@ -2126,6 +2126,7 @@
       "events": []
     },
     "XMLHttpRequest": {
+      "overview": ["XMLHttpRequest"],
       "guides": [
         "/docs/Web/API/XMLHttpRequest/Using_XMLHttpRequest",
         "/docs/Web/API/XMLHttpRequest/HTML_in_XMLHttpRequest",

From defdef0a9cf66cff59556eee8854c2990467e0d3 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 29 Mar 2021 17:34:17 -0400
Subject: [PATCH 093/288] ES streaming bulk with continue-on-errors and smaller
 chunk size (#3380)

---
 deployer/src/deployer/search/__init__.py | 48 ++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/deployer/src/deployer/search/__init__.py b/deployer/src/deployer/search/__init__.py
index 2807b9442f96..b25047d68a1f 100644
--- a/deployer/src/deployer/search/__init__.py
+++ b/deployer/src/deployer/search/__init__.py
@@ -2,7 +2,7 @@
 import re
 import time
 from pathlib import Path
-from collections import defaultdict
+from collections import defaultdict, Counter
 
 import click
 from elasticsearch.helpers import streaming_bulk
@@ -21,7 +21,7 @@ def index(
 ):
     # We can confidently use a single host here because we're not searching
     # a cluster.
-    connections.create_connection(hosts=[url])
+    connections.create_connection(hosts=[url], retry_on_timeout=True)
     connection = connections.get_connection()
     health = connection.cluster.health()
     status = health["status"]
@@ -82,10 +82,40 @@ def get_progressbar():
             return VoidProgressBar()
         return click.progressbar(length=count_todo, label="Indexing", width=0)
 
-    count_done = 0
+    count_done = count_worked = count_errors = 0
+    count_shards_worked = count_shards_failed = 0
+    errors_counter = Counter()
     t0 = time.time()
     with get_progressbar() as bar:
-        for x in streaming_bulk(connection, generator(), index=document_index._name):
+        for success, info in streaming_bulk(
+            connection,
+            generator(),
+            index=document_index._name,
+            # It's an inexact science as to what the perfect chunk_size should be.
+            # The default according to
+            # https://elasticsearch-py.readthedocs.io/en/v7.12.0/helpers.html#elasticsearch.helpers.streaming_bulk
+            # is 500.
+            # We've noticed that it works a bit better with a lower number because
+            # sometimes you get a `ReadTimeoutError` and combined with
+            # setting `raise_on_exception=False` you put less strain on each "bulk
+            # block".
+            chunk_size=100,
+            # If the bulk indexing failed, it will by default raise a BulkIndexError.
+            # Setting this to 'False' will suppress that.
+            raise_on_exception=False,
+            # If the bulk operation failed for some other reason like a ReadTimeoutError
+            # it will raise whatever the error but default.
+            # We prefer to swallow all errors under the assumption that the holes
+            # will hopefully be fixed in the next attempt.
+            raise_on_error=False,
+        ):
+            if success:
+                count_shards_worked += info["index"]["_shards"]["successful"]
+                count_shards_failed += info["index"]["_shards"]["failed"]
+                count_worked += 1
+            else:
+                count_errors += 1
+                errors_counter[info["index"]["error"]] += 1
             count_done += 1
             bar.update(1)
 
@@ -99,6 +129,16 @@ def get_progressbar():
         f"Took {format_time(took)} to index {count_done:,} documents. "
         f"Approximately {rate:.1f} docs/second"
     )
+    click.echo(
+        f"Count shards - successful: {count_shards_worked:,} "
+        f"failed: {count_shards_failed:,}"
+    )
+    click.echo(f"Counts - worked: {count_worked:,} errors: {count_errors:,}")
+    if errors_counter:
+        click.echo("Most common errors....")
+        for error, count in errors_counter.most_common():
+            click.echo(f"{count:,}\t{error[:80]}")
+
     if priority_prefixes:
         click.echo("Counts per priority prefixes:")
         rest = sum(v for v in count_by_prefix.values())

From 1a1dc0793e42bd148d4f73cfafe7e53e943a20a4 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 29 Mar 2021 18:49:07 -0400
Subject: [PATCH 094/288] Toolbar but read-only mode (#3335)

* Toolbar but read-only mode

Fixes #3334

* more places where it doesn't make sense in read-only mode

* Update client/src/document/toolbar/flaws.tsx

Co-authored-by: Ryan Johnson <escattone@gmail.com>
---
 client/src/constants.ts                      |   4 +
 client/src/document/toolbar/edit-actions.tsx |  41 +++--
 client/src/document/toolbar/flaws.tsx        | 176 +++++++++++--------
 client/src/document/toolbar/index.tsx        |   8 +
 client/src/sitemap/index.tsx                 |  28 +--
 docs/envvars.md                              |   7 +
 6 files changed, 164 insertions(+), 100 deletions(-)

diff --git a/client/src/constants.ts b/client/src/constants.ts
index d455a90a1a50..9aa482d821c7 100644
--- a/client/src/constants.ts
+++ b/client/src/constants.ts
@@ -7,6 +7,10 @@ export const CRUD_MODE = JSON.parse(
     JSON.stringify(process.env.NODE_ENV === "development")
 );
 
+export const CRUD_MODE_READONLY = JSON.parse(
+  process.env.REACT_APP_CRUD_MODE_READONLY || "false"
+);
+
 export const AUTOCOMPLETE_SEARCH_WIDGET = JSON.parse(
   process.env.REACT_APP_AUTOCOMPLETE_SEARCH_WIDGET || JSON.stringify(CRUD_MODE)
 );
diff --git a/client/src/document/toolbar/edit-actions.tsx b/client/src/document/toolbar/edit-actions.tsx
index 2799f6c51efd..3cafe13fe432 100644
--- a/client/src/document/toolbar/edit-actions.tsx
+++ b/client/src/document/toolbar/edit-actions.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from "react";
 import { Link, useLocation, useParams } from "react-router-dom";
+import { CRUD_MODE_READONLY } from "../../constants";
 
 import "./edit-actions.scss";
 
@@ -62,16 +63,18 @@ export function EditActions({
 
   return (
     <ul className="edit-actions">
-      <li>
-        <button
-          type="button"
-          className="button"
-          title={`Folder: ${folder}`}
-          onClick={openInEditorHandler}
-        >
-          Open in your <b>editor</b>
-        </button>
-      </li>
+      {!CRUD_MODE_READONLY && (
+        <li>
+          <button
+            type="button"
+            className="button"
+            title={`Folder: ${folder}`}
+            onClick={openInEditorHandler}
+          >
+            Open in your <b>editor</b>
+          </button>
+        </li>
+      )}
 
       <li>
         <a
@@ -82,14 +85,16 @@ export function EditActions({
         </a>
       </li>
 
-      <li>
-        <Link
-          to={location.pathname.replace("/docs/", "/_edit/")}
-          className="button"
-        >
-          Quick-edit
-        </Link>
-      </li>
+      {!CRUD_MODE_READONLY && (
+        <li>
+          <Link
+            to={location.pathname.replace("/docs/", "/_edit/")}
+            className="button"
+          >
+            Quick-edit
+          </Link>
+        </li>
+      )}
 
       {editorOpeningError ? (
         <p className="error-message editor-opening-error">
diff --git a/client/src/document/toolbar/flaws.tsx b/client/src/document/toolbar/flaws.tsx
index 076428db36e9..1669026fb7e2 100644
--- a/client/src/document/toolbar/flaws.tsx
+++ b/client/src/document/toolbar/flaws.tsx
@@ -4,7 +4,7 @@ import { annotate, annotationGroup } from "rough-notation";
 import { RoughAnnotation } from "rough-notation/lib/model";
 import { diffWords } from "diff";
 
-import { CRUD_MODE } from "../../constants";
+import { CRUD_MODE, CRUD_MODE_READONLY } from "../../constants";
 import { humanizeFlawName } from "../../flaw-utils";
 import { useDocumentURL } from "../hooks";
 import {
@@ -201,7 +201,7 @@ function Flaws({
 
   return (
     <div id="document-flaws">
-      {!!fixableFlaws.length && (
+      {!!fixableFlaws.length && !CRUD_MODE_READONLY && (
         <FixableFlawsAction
           count={fixableFlaws.length}
           reloadPage={reloadPage}
@@ -445,16 +445,24 @@ function BrokenLinks({
               >
                 👀
               </span>{" "}
-              <a
-                href={`file://${filepath}`}
-                onClick={(event: React.MouseEvent) => {
-                  event.preventDefault();
-                  openInEditor(key, flaw.line, flaw.column);
-                }}
-                title="Click to open in your editor"
-              >
-                line {flaw.line}:{flaw.column}
-              </a>{" "}
+              {CRUD_MODE_READONLY ? (
+                <>
+                  {/* It would be cool if we can change this to a link to the line in the
+                  file in GitHub's UI. */}
+                  line {flaw.line}:{flaw.column}
+                </>
+              ) : (
+                <a
+                  href={`file://${filepath}`}
+                  onClick={(event: React.MouseEvent) => {
+                    event.preventDefault();
+                    openInEditor(key, flaw.line, flaw.column);
+                  }}
+                  title="Click to open in your editor"
+                >
+                  line {flaw.line}:{flaw.column}
+                </a>
+              )}{" "}
               {flaw.fixable && <FixableFlawBadge />}{" "}
               {opening && opening === key && <span>Opening...</span>}
               <br />
@@ -583,17 +591,23 @@ function BadPreTag({
               👀
             </span>{" "}
             {flaw.line && flaw.column ? (
-              <a
-                href={`file://${filepath}`}
-                onClick={(event: React.MouseEvent) => {
-                  event.preventDefault();
-                  if (flaw.line && flaw.column)
-                    openInEditor(flaw.id, flaw.line, flaw.column);
-                }}
-                title="Click to open in your editor"
-              >
-                line {flaw.line}:{flaw.column}
-              </a>
+              CRUD_MODE_READONLY ? (
+                <>
+                  line {flaw.line}:{flaw.column}
+                </>
+              ) : (
+                <a
+                  href={`file://${filepath}`}
+                  onClick={(event: React.MouseEvent) => {
+                    event.preventDefault();
+                    if (flaw.line && flaw.column)
+                      openInEditor(flaw.id, flaw.line, flaw.column);
+                  }}
+                  title="Click to open in your editor"
+                >
+                  line {flaw.line}:{flaw.column}
+                </a>
+              )
             ) : null}{" "}
             {flaw.fixable && <FixableFlawBadge />}{" "}
           </li>
@@ -655,16 +669,22 @@ function Macros({
             }
           >
             <summary>
-              <a
-                href={`file://${flaw.filepath}`}
-                onClick={(event: React.MouseEvent) => {
-                  event.preventDefault();
-                  openInEditor(flaw, flaw.id);
-                }}
-              >
-                <code>{flaw.name}</code> from <code>{flaw.macroName}</code> in
-                line {flaw.line}:{flaw.column}
-              </a>{" "}
+              <code>{flaw.name}</code> from <code>{flaw.macroName}</code>{" "}
+              {CRUD_MODE_READONLY ? (
+                <>
+                  line {flaw.line}:{flaw.column}
+                </>
+              ) : (
+                <a
+                  href={`file://${flaw.filepath}`}
+                  onClick={(event: React.MouseEvent) => {
+                    event.preventDefault();
+                    openInEditor(flaw, flaw.id);
+                  }}
+                >
+                  line {flaw.line}:{flaw.column}
+                </a>
+              )}{" "}
               {opening && opening === flaw.id && <span>Opening...</span>}{" "}
               {inPrerequisiteMacro && (
                 <span
@@ -770,16 +790,22 @@ function Images({
               >
                 👀
               </span>{" "}
-              <a
-                href={`file://${filepath}`}
-                onClick={(event: React.MouseEvent) => {
-                  event.preventDefault();
-                  openInEditor(key, flaw.line, flaw.column);
-                }}
-                title="Click to open in your editor"
-              >
-                line {flaw.line}:{flaw.column}
-              </a>{" "}
+              {CRUD_MODE_READONLY ? (
+                <>
+                  line {flaw.line}:{flaw.column}
+                </>
+              ) : (
+                <a
+                  href={`file://${filepath}`}
+                  onClick={(event: React.MouseEvent) => {
+                    event.preventDefault();
+                    openInEditor(key, flaw.line, flaw.column);
+                  }}
+                  title="Click to open in your editor"
+                >
+                  line {flaw.line}:{flaw.column}
+                </a>
+              )}{" "}
               {(flaw.fixable || flaw.externalImage) && <FixableFlawBadge />}{" "}
               <br />
               {flaw.suggestion && (
@@ -858,16 +884,22 @@ function ImageWidths({
               >
                 👀
               </span>{" "}
-              <a
-                href={`file://${filepath}`}
-                onClick={(event: React.MouseEvent) => {
-                  event.preventDefault();
-                  openInEditor(key, flaw.line, flaw.column);
-                }}
-                title="Click to open in your editor"
-              >
-                line {flaw.line}:{flaw.column}
-              </a>{" "}
+              {CRUD_MODE_READONLY ? (
+                <>
+                  line {flaw.line}:{flaw.column}
+                </>
+              ) : (
+                <a
+                  href={`file://${filepath}`}
+                  onClick={(event: React.MouseEvent) => {
+                    event.preventDefault();
+                    openInEditor(key, flaw.line, flaw.column);
+                  }}
+                  title="Click to open in your editor"
+                >
+                  line {flaw.line}:{flaw.column}
+                </a>
+              )}{" "}
               {(flaw.fixable || flaw.externalImage) && <FixableFlawBadge />}{" "}
               <br />
               {flaw.suggestion === "" && (
@@ -944,22 +976,28 @@ function HeadingLinks({
           return (
             <li key={key}>
               <b>{flaw.explanation}</b>{" "}
-              {flaw.line && flaw.column && (
-                <a
-                  href={`file://${filepath}`}
-                  onClick={(event: React.MouseEvent) => {
-                    event.preventDefault();
-                    openInEditor(
-                      key,
-                      flaw.line as number,
-                      flaw.column as number
-                    );
-                  }}
-                  title="Click to open in your editor"
-                >
-                  line {flaw.line}:{flaw.column}
-                </a>
-              )}{" "}
+              {flaw.line && flaw.column ? (
+                CRUD_MODE_READONLY ? (
+                  <>
+                    line {flaw.line}:{flaw.column}
+                  </>
+                ) : (
+                  <a
+                    href={`file://${filepath}`}
+                    onClick={(event: React.MouseEvent) => {
+                      event.preventDefault();
+                      openInEditor(
+                        key,
+                        flaw.line as number,
+                        flaw.column as number
+                      );
+                    }}
+                    title="Click to open in your editor"
+                  >
+                    line {flaw.line}:{flaw.column}
+                  </a>
+                )
+              ) : null}{" "}
               {flaw.fixable && <FixableFlawBadge />} <br />
               <b>HTML:</b> <code>{flaw.html}</code> <br />
               {flaw.suggestion && flaw.before ? (
diff --git a/client/src/document/toolbar/index.tsx b/client/src/document/toolbar/index.tsx
index 2c4ea9fe02d5..4219ed5164f6 100644
--- a/client/src/document/toolbar/index.tsx
+++ b/client/src/document/toolbar/index.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect } from "react";
+import { CRUD_MODE_READONLY } from "../../constants";
 import { Doc } from "../types";
 import { EditActions } from "./edit-actions";
 import { ToggleDocumentFlaws } from "./flaws";
@@ -40,6 +41,13 @@ export default function Toolbar({
           filename={doc.source.filename}
         />
       </div>
+      {CRUD_MODE_READONLY && (
+        <p>
+          <i>
+            You're in <b>read-only</b> mode.
+          </i>
+        </p>
+      )}
       <ToggleDocumentFlaws doc={doc} reloadPage={reloadPage} />
     </div>
   );
diff --git a/client/src/sitemap/index.tsx b/client/src/sitemap/index.tsx
index e4f63b73804c..17a860575485 100644
--- a/client/src/sitemap/index.tsx
+++ b/client/src/sitemap/index.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Link, useNavigate, useLocation } from "react-router-dom";
 import useSWR from "swr";
 
-import { CRUD_MODE } from "../constants";
+import { CRUD_MODE, CRUD_MODE_READONLY } from "../constants";
 import { useLocale } from "../hooks";
 import { PageContentContainer } from "../ui/atoms/page-content";
 
@@ -427,7 +427,7 @@ function Breadcrumb({
               <Link to={thisDoc.url}>
                 <em>{thisDoc.title}</em>
               </Link>{" "}
-              {CRUD_MODE && (
+              {CRUD_MODE && !CRUD_MODE_READONLY && (
                 <small>
                   (
                   <a
@@ -492,17 +492,19 @@ function ShowTree({
                 <Link to={doc.url} title={`Go to: ${doc.title}`}>
                   View
                 </Link>
-                {" | "}
-                <Link
-                  to={doc.url}
-                  title={`Edit: ${doc.title}`}
-                  onClick={(event) => {
-                    event.preventDefault();
-                    openInYourEditor(doc.url);
-                  }}
-                >
-                  Edit
-                </Link>
+                {!CRUD_MODE_READONLY && " | "}
+                {!CRUD_MODE_READONLY && (
+                  <Link
+                    to={doc.url}
+                    title={`Edit: ${doc.title}`}
+                    onClick={(event) => {
+                      event.preventDefault();
+                      openInYourEditor(doc.url);
+                    }}
+                  >
+                    Edit
+                  </Link>
+                )}
                 )
               </small>
             </li>
diff --git a/docs/envvars.md b/docs/envvars.md
index 934e24408219..ed9e28f243bf 100644
--- a/docs/envvars.md
+++ b/docs/envvars.md
@@ -283,3 +283,10 @@ Toolbar bar appears based on this.
 It defaults to `NODE_ENV==='development'` if not set which means that
 it's enable by default when doing development with the `localhost:3000`
 dev server.
+
+### `REACT_APP_CRUD_MODE_READONLY`
+
+**Default: `false`**
+
+Only applicable if `REACT_APP_CRUD_MODE` is truthy. This setting disables all
+options like "Fix fixable flaws" or "Quick-edit"

From 773e45aae268b8307a5769939f60f9b3a2294cbf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 05:44:04 +0000
Subject: [PATCH 095/288] build(deps-dev): bump @babel/core from 7.13.13 to
 7.13.14 (#3382)

---
 package.json |  2 +-
 yarn.lock    | 33 ++++++++++++++++-----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 368de9648873..45e84dd5ec35 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "unist-util-visit": "2.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.13",
+    "@babel/core": "^7.13.14",
     "@mdn/dinocons": "^0.3.0",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index b8501518d0ea..4268be1ae078 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -70,25 +70,24 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.1", "@babel/core@^7.12.3", "@babel/core@^7.13.13", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.13.tgz#bc44c4a2be2288ec4ddf56b66fc718019c76ac29"
-  integrity sha512-1xEs9jZAyKIouOoCmpsgk/I26PoKyvzQ2ixdRpRzfbcp1fL+ozw7TUgdDgwonbTovqRaTfRh50IXuw4QrWO0GA==
+"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.1", "@babel/core@^7.12.3", "@babel/core@^7.13.14", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
+  version "7.13.14"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.14.tgz#8e46ebbaca460a63497c797e574038ab04ae6d06"
+  integrity sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA==
   dependencies:
     "@babel/code-frame" "^7.12.13"
     "@babel/generator" "^7.13.9"
     "@babel/helper-compilation-targets" "^7.13.13"
-    "@babel/helper-module-transforms" "^7.13.12"
+    "@babel/helper-module-transforms" "^7.13.14"
     "@babel/helpers" "^7.13.10"
     "@babel/parser" "^7.13.13"
     "@babel/template" "^7.12.13"
     "@babel/traverse" "^7.13.13"
-    "@babel/types" "^7.13.13"
+    "@babel/types" "^7.13.14"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
-    lodash "^4.17.19"
     semver "^6.3.0"
     source-map "^0.5.0"
 
@@ -283,10 +282,10 @@
   dependencies:
     "@babel/types" "^7.13.12"
 
-"@babel/helper-module-transforms@^7.11.0", "@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz#600e58350490828d82282631a1422268e982ba96"
-  integrity sha512-7zVQqMO3V+K4JOOj40kxiCrMf6xlQAkewBB0eu2b03OO/Q21ZutOzjpfD79A5gtE/2OWi1nv625MrDlGlkbknQ==
+"@babel/helper-module-transforms@^7.11.0", "@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.13.14":
+  version "7.13.14"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
+  integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
   dependencies:
     "@babel/helper-module-imports" "^7.13.12"
     "@babel/helper-replace-supers" "^7.13.12"
@@ -294,8 +293,8 @@
     "@babel/helper-split-export-declaration" "^7.12.13"
     "@babel/helper-validator-identifier" "^7.12.11"
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.12"
+    "@babel/traverse" "^7.13.13"
+    "@babel/types" "^7.13.14"
 
 "@babel/helper-optimise-call-expression@^7.10.4":
   version "7.10.4"
@@ -1398,10 +1397,10 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.13", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.13.tgz#dcd8b815b38f537a3697ce84c8e3cc62197df96f"
-  integrity sha512-kt+EpC6qDfIaqlP+DIbIJOclYy/A1YXs9dAf/ljbi+39Bcbc073H6jKVpXEr/EoIh5anGn5xq/yRVzKl+uIc9w==
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.13", "@babel/types@^7.13.14", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.13.14"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
+  integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
   dependencies:
     "@babel/helper-validator-identifier" "^7.12.11"
     lodash "^4.17.19"

From 3a647c210cbc42be0dbb186c53211ed745452bce Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Tue, 30 Mar 2021 15:13:32 +0900
Subject: [PATCH 096/288] Drop obsolete items from InterfaceData macro (#3355)

This changes in this PR make some macros in MDN work as expected.
Otherwise, the removed items in this PR cause some macros used in
MDN to break.
---
 kumascript/macros/InterfaceData.json | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/kumascript/macros/InterfaceData.json b/kumascript/macros/InterfaceData.json
index 60c197534ca7..0521e5352cdb 100644
--- a/kumascript/macros/InterfaceData.json
+++ b/kumascript/macros/InterfaceData.json
@@ -489,11 +489,8 @@
       "impl": [
         "XPathEvaluator",
         "GlobalEventHandlers",
-        "TouchEventHandlers",
         "ParentNode",
-        "OnErrorEventHandlerForNodes",
-        "GeometryUtils",
-        "FontFaceSource"
+        "GeometryUtils"
       ]
     },
     "DocumentFragment": {
@@ -674,11 +671,7 @@
     },
     "HTMLElement": {
       "inh": "Element",
-      "impl": [
-        "GlobalEventHandlers",
-        "TouchEventHandlers",
-        "OnErrorEventHandlerForNodes"
-      ]
+      "impl": ["GlobalEventHandlers"]
     },
     "HTMLEmbedElement": {
       "inh": "HTMLElement",
@@ -1597,11 +1590,7 @@
     },
     "SVGElement": {
       "inh": "Element",
-      "impl": [
-        "GlobalEventHandlers",
-        "TouchEventHandlers",
-        "OnErrorEventHandlerForNodes"
-      ]
+      "impl": ["GlobalEventHandlers"]
     },
     "SVGEllipseElement": {
       "inh": "SVGGeometryElement",
@@ -2255,7 +2244,6 @@
         "GlobalCrypto",
         "SpeechSynthesisGetter",
         "WindowModal",
-        "TouchEventHandlers",
         "OnErrorEventHandlerForWindow",
         "ChromeWindow",
         "WindowOrWorkerGlobalScope"
@@ -2404,12 +2392,7 @@
     },
     "XULElement": {
       "inh": "Element",
-      "impl": [
-        "GlobalEventHandlers",
-        "TouchEventHandlers",
-        "MozFrameLoaderOwner",
-        "OnErrorEventHandlerForNodes"
-      ]
+      "impl": ["GlobalEventHandlers", "MozFrameLoaderOwner"]
     }
   }
 ]

From ebeffa7bd49098ec4277756ff05f4dbd96de3554 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 06:54:41 +0000
Subject: [PATCH 097/288] build(deps): bump boto3 from 1.17.38 to 1.17.40 in
 /deployer (#3384)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index e93812a6d55f..bed72e7b0d0b 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.38"
+version = "1.17.40"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.38,<1.21.0"
+botocore = ">=1.20.40,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.38"
+version = "1.20.40"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -533,7 +533,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "e064c869b5f8268810f4754029925ec8995b144e427c1e57a6341b2a4c3fecb2"
+content-hash = "c52e4f2837c77adb59180d059fde29e1a5990efc2d2d43d7872ce2af909308b6"
 
 [metadata.files]
 appdirs = [
@@ -552,12 +552,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.38-py2.py3-none-any.whl", hash = "sha256:f427d7f001f457bd2693411396897624a081d0d6a9f6c1fabf6ef565238f5282"},
-    {file = "boto3-1.17.38.tar.gz", hash = "sha256:d891964c43de16f0b43a8fa87ae786abfd4166222b5e53c1e1164514cde12073"},
+    {file = "boto3-1.17.40-py2.py3-none-any.whl", hash = "sha256:54380395ba52502a9877cd0c4c9c9834341ce74c96c9f1ecc6fd77bade1b201a"},
+    {file = "boto3-1.17.40.tar.gz", hash = "sha256:ee999b46b2c630e50e7b052d6dfe224203a348d83b00e168ca50009af0f276c1"},
 ]
 botocore = [
-    {file = "botocore-1.20.38-py2.py3-none-any.whl", hash = "sha256:6e6107109abad89d95c829b2c3c281d353113d4b54fcfeb65d71e58e8ebd77ed"},
-    {file = "botocore-1.20.38.tar.gz", hash = "sha256:da447f46d412749720ca08e19bf14487d35e23f2378f7245975e4f55af7570dd"},
+    {file = "botocore-1.20.40-py2.py3-none-any.whl", hash = "sha256:f2b68119050211139f21278166c9023d9251da84b500a4ccede4a4545d6a9514"},
+    {file = "botocore-1.20.40.tar.gz", hash = "sha256:6a35a9977cdbd7a839d948dd5f9e3d260c19b7dde74e0a844c97206884d3bba0"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 661aea354d52..6c797be0fa92 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.38"
+boto3 = "^1.17.40"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From ce1af504e7a30ddee7457adb802d70dd79564d77 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 30 Mar 2021 08:20:31 -0400
Subject: [PATCH 098/288] show errors if a 400 on sign-up (#3381)

Fixes #3377
---
 client/src/auth/sign-up.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/src/auth/sign-up.tsx b/client/src/auth/sign-up.tsx
index 6980add7181e..5ca6c3b7a398 100644
--- a/client/src/auth/sign-up.tsx
+++ b/client/src/auth/sign-up.tsx
@@ -101,6 +101,8 @@ export default function SignUpApp() {
       mutate("/api/v1/whoami");
 
       navigate(nextURL);
+    } else if (response.status === 400) {
+      setSignupError(new Error(JSON.stringify(await response.json())));
     } else {
       setSignupError(new Error(`${response.status} on ${signupURL}`));
     }

From 36311371014489782f5cac6e112b93cca2f87335 Mon Sep 17 00:00:00 2001
From: Rachel Andrew <rachel.andrew@edgeofmyseat.com>
Date: Tue, 30 Mar 2021 17:30:29 +0100
Subject: [PATCH 099/288] Adding Compression Streams spec (#3386)

---
 kumascript/macros/SpecData.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kumascript/macros/SpecData.json b/kumascript/macros/SpecData.json
index 9250cfa07e48..5e7903e5d520 100644
--- a/kumascript/macros/SpecData.json
+++ b/kumascript/macros/SpecData.json
@@ -109,6 +109,11 @@
     "url": "https://console.spec.whatwg.org/",
     "status": "Living"
   },
+  "Compression Streams": {
+    "name": "Compression Streams",
+    "url": "https://wicg.github.io/compression/",
+    "status": "Draft"
+  },
   "Contacts": {
     "name": "Contacts Manager API",
     "url": "https://www.w3.org/2012/sysapps/contacts-manager-api/",

From 92a4272d4f735ca79807ef96f0cdb5a7b1625d8f Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Wed, 31 Mar 2021 01:31:52 +0900
Subject: [PATCH 100/288] Specify overview for Web Speech API in GroupData
 (#3383)

Fixes https://github.com/mdn/content/issues/3627
---
 kumascript/macros/GroupData.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kumascript/macros/GroupData.json b/kumascript/macros/GroupData.json
index de8bab268c7d..05d06b94a618 100644
--- a/kumascript/macros/GroupData.json
+++ b/kumascript/macros/GroupData.json
@@ -1967,6 +1967,7 @@
       "events": []
     },
     "Web Speech API": {
+      "overview": ["Web Speech API"],
       "interfaces": [
         "SpeechGrammar",
         "SpeechGrammarList",

From a739c12b16e704437f10ad182bedb57793029ed5 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 30 Mar 2021 13:45:37 -0400
Subject: [PATCH 101/288] calm down the Dependabot upgrades for pip (#3387)

---
 .github/dependabot.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6b4d573baf33..5107fa066339 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -20,12 +20,12 @@ updates:
   - package-ecosystem: "pip"
     directory: "/deployer"
     schedule:
-      interval: "daily"
+      interval: "weekly"
 
   - package-ecosystem: "pip"
     directory: "/testing/integration"
     schedule:
-      interval: "daily"
+      interval: "weekly"
 
   - package-ecosystem: npm
     directory: "/deployer/aws-lambda/content-origin-request"

From 1f0210420832c74c36cd605c74ea99bbc975486d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 17:59:14 +0000
Subject: [PATCH 102/288] build(deps-dev): bump @storybook/node-logger from
 6.1.21 to 6.2.0 (#3388)

---
 package.json |  2 +-
 yarn.lock    | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 45e84dd5ec35..d70bb1d86845 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "@storybook/addon-actions": "^6.1.21",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.1.21",
-    "@storybook/node-logger": "^6.1.19",
+    "@storybook/node-logger": "^6.2.0",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
     "@testing-library/react": "^11.2.5",
diff --git a/yarn.lock b/yarn.lock
index 4268be1ae078..e104a53ac540 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2512,7 +2512,7 @@
   dependencies:
     lodash "^4.17.15"
 
-"@storybook/node-logger@6.1.21", "@storybook/node-logger@^6.1.19":
+"@storybook/node-logger@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.1.21.tgz#bcf882209697acfe4fc60bc224676400bce260ed"
   integrity sha512-wQZZw4n1PG3kGOsczWCBC6+8RagYkrGYDqsVOpUcs5shGbPg5beCXDuzP4nxz2IlsoP9ZtTSaX741H791OIOjA==
@@ -2523,6 +2523,17 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
+"@storybook/node-logger@^6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.0.tgz#66d69b3d22f2f94c0900b76cc015c93d4e693c25"
+  integrity sha512-8c2Nr3lrqYYril4VljOSAuGBu93ozxcTBMsFTg5UIOiItJSZLq3ihfCoIEh466toPGCBLJxiUk5/zI70Fv/Ytw==
+  dependencies:
+    "@types/npmlog" "^4.1.2"
+    chalk "^4.1.0"
+    core-js "^3.8.2"
+    npmlog "^4.1.2"
+    pretty-hrtime "^1.0.3"
+
 "@storybook/postinstall@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.1.21.tgz#a7598b53291e3ab74400feb492359cc0d725d9a3"
@@ -5884,10 +5895,10 @@ core-js@^2.4.0, core-js@^2.6.5:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
-core-js@^3.0.1, core-js@^3.0.4, core-js@^3.6.5:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
-  integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
+core-js@^3.0.1, core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz#cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"
+  integrity sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"

From 2fdcc93ffb07df1db521bccb3d746b9b57f6cb06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 18:06:30 +0000
Subject: [PATCH 103/288] build(deps-dev): bump @storybook/addon-a11y from
 6.1.21 to 6.2.0 (#3394)

---
 package.json |   2 +-
 yarn.lock    | 357 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 328 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index d70bb1d86845..e845d2675ffe 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "@babel/core": "^7.13.14",
     "@mdn/dinocons": "^0.3.0",
     "@mdn/minimalist": "^0.8.0",
-    "@storybook/addon-a11y": "^6.1.21",
+    "@storybook/addon-a11y": "^6.2.0",
     "@storybook/addon-actions": "^6.1.21",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index e104a53ac540..9711ffab4daf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1532,7 +1532,7 @@
     "@emotion/serialize" "^0.11.15"
     "@emotion/utils" "0.11.3"
 
-"@emotion/styled@^10.0.23":
+"@emotion/styled@^10.0.23", "@emotion/styled@^10.0.27":
   version "10.0.27"
   resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.27.tgz#12cb67e91f7ad7431e1875b1d83a94b814133eaf"
   integrity sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q==
@@ -2005,7 +2005,12 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.5.4.tgz#de25b5da9f727985a3757fd59b5d028aba75841a"
   integrity sha512-ZpKr+WTb8zsajqgDkvCEWgp6d5eJT6Q63Ng2neTbzBO76Lbe91vX/iVIW9dikq+Fs3yEo+ls4cxeXABD2LtcbQ==
 
-"@reach/router@^1.3.3":
+"@popperjs/core@^2.6.0":
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.1.tgz#7f554e7368c9ab679a11f4a042ca17149d70cf12"
+  integrity sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA==
+
+"@reach/router@^1.3.3", "@reach/router@^1.3.4":
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/@reach/router/-/router-1.3.4.tgz#d2574b19370a70c80480ed91f3da840136d10f8c"
   integrity sha512-+mtn9wjlB9NN2CNnnC/BRYtwdKBfSyyasPYraNAyvaV1occr/5NnB4CVzjEZipNHwYebQwcndGUmpFzxAUoqSA==
@@ -2083,24 +2088,24 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@storybook/addon-a11y@^6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.1.21.tgz#28e44c9f3b7b9e8a319f59b112092fb9aa15fb96"
-  integrity sha512-FTHQ0QdPhL+0D/E/og/xkT6tIEEOSCgCV+eX9UcDn3shnxVAHEHbqJ7Yf1fF5B/nRx+ptY57c9O64vIFd7UMHg==
-  dependencies:
-    "@storybook/addons" "6.1.21"
-    "@storybook/api" "6.1.21"
-    "@storybook/channels" "6.1.21"
-    "@storybook/client-api" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/components" "6.1.21"
-    "@storybook/core-events" "6.1.21"
-    "@storybook/theming" "6.1.21"
-    axe-core "^4.0.1"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    react-sizeme "^2.5.2"
+"@storybook/addon-a11y@^6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.0.tgz#bda142f0d3566184d66a40a940ba0421cb8fc7a4"
+  integrity sha512-i62S0xa9bKWon4NxYnYVQHG9t5BCwy2o/STeX6a5R+6qlmhb14+OrHQpib3p4esIb42XAtpxgAdHALyfcI7Img==
+  dependencies:
+    "@storybook/addons" "6.2.0"
+    "@storybook/api" "6.2.0"
+    "@storybook/channels" "6.2.0"
+    "@storybook/client-api" "6.2.0"
+    "@storybook/client-logger" "6.2.0"
+    "@storybook/components" "6.2.0"
+    "@storybook/core-events" "6.2.0"
+    "@storybook/theming" "6.2.0"
+    axe-core "^4.1.1"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    react-sizeme "^3.0.1"
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
@@ -2285,6 +2290,21 @@
     global "^4.3.2"
     regenerator-runtime "^0.13.7"
 
+"@storybook/addons@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.0.tgz#175cc7d7c6671f202f86cd59f9b53e1f2aea71c1"
+  integrity sha512-BB/GufdLX9NzswQxOJWq68UFs+zXzAp6fjMCJKrkmsR6O3IfkqM0vGqrbwitbHejbCNARgBJjOQVlw/DPtl9Xw==
+  dependencies:
+    "@storybook/api" "6.2.0"
+    "@storybook/channels" "6.2.0"
+    "@storybook/client-logger" "6.2.0"
+    "@storybook/core-events" "6.2.0"
+    "@storybook/router" "6.2.0"
+    "@storybook/theming" "6.2.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    regenerator-runtime "^0.13.7"
+
 "@storybook/api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.21.tgz#be753ca8d3602efe4a11783c81c689463bee0825"
@@ -2310,6 +2330,32 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.0.tgz#f0499f6797d0f7db5eaabaced787930afa5032a4"
+  integrity sha512-mqE9CINzMndLMwWzI8jDPaqgXe4MQ3WIT0qa7PDSEBeKzHNXAjw+b/BjOYLDRfI72UgyckoCEZqFxn1CTYM+Hw==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/channels" "6.2.0"
+    "@storybook/client-logger" "6.2.0"
+    "@storybook/core-events" "6.2.0"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "6.2.0"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.0"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    store2 "^2.12.0"
+    telejson "^5.1.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.1.21.tgz#acce71833499dba4c4e686de09f5b281a3239842"
@@ -2323,6 +2369,19 @@
     qs "^6.6.0"
     telejson "^5.0.2"
 
+"@storybook/channel-postmessage@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.0.tgz#ca6f4f5420f7c91a3276958d66584e233ebd16ec"
+  integrity sha512-ZKi73Fe6zAJeLjUUAM9SZyz0Gh83/Z/Tanb+ghnou4LGZZT/7v10TXYBeULh57ucW2tPIgbBwhkfob/w1OPkRg==
+  dependencies:
+    "@storybook/channels" "6.2.0"
+    "@storybook/client-logger" "6.2.0"
+    "@storybook/core-events" "6.2.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    qs "^6.10.0"
+    telejson "^5.1.0"
+
 "@storybook/channels@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.1.21.tgz#adbfae5f4767234c5b17d9578be983584dddead4"
@@ -2332,6 +2391,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/channels@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.0.tgz#80f6a7ae8e315e44236da643529d01a9ab479e40"
+  integrity sha512-vQiaWHm5Jv4x1Lo840tuNYfzAYOj/hAXqfCm/q/efQE8Ouu+3jj5q4BDgFRz8K5+C1eUIdOC1DPPV8/79+9o4g==
+  dependencies:
+    core-js "^3.8.2"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.1.21.tgz#c9f72bbc9bf9d12cc931eb824f6912173c73b0b3"
@@ -2356,6 +2424,30 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.0.tgz#be087adccf06f27bdc5e5a1556dc9b9d9224edda"
+  integrity sha512-0JwXqiF5yCRUC4Uy1maQgenNeUuVVDXDQikzHQzNFhRzJpmakjZB1een7sHXr5x8Wi0DMSDZPyFe+5qVQg08yg==
+  dependencies:
+    "@storybook/addons" "6.2.0"
+    "@storybook/channel-postmessage" "6.2.0"
+    "@storybook/channels" "6.2.0"
+    "@storybook/client-logger" "6.2.0"
+    "@storybook/core-events" "6.2.0"
+    "@storybook/csf" "0.0.1"
+    "@types/qs" "^6.9.5"
+    "@types/webpack-env" "^1.16.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    stable "^0.1.8"
+    store2 "^2.12.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.1.21.tgz#fe7d9e645ddb4eb9dc18fdacea24b4baf11bc6c9"
@@ -2364,6 +2456,14 @@
     core-js "^3.0.1"
     global "^4.3.2"
 
+"@storybook/client-logger@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.0.tgz#47e9fad5dd5452fe048fc57c737fa22d0d196f20"
+  integrity sha512-A7aF3T7VsxpCAMKkY/UD0tAg/KgEMpmGqwSFNv1ZWikKyZ0oWbkiwPt8ZNQaTHlapt9/9BnoxLTEFNhiinXMTQ==
+  dependencies:
+    core-js "^3.8.2"
+    global "^4.4.0"
+
 "@storybook/components@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.21.tgz#7b9bfd51e73c179654a114275e5073f494d2a005"
@@ -2391,6 +2491,36 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
+"@storybook/components@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.0.tgz#9e08d1e513e7a5bf4d5ef86f07caa9d1590980d2"
+  integrity sha512-pGUsgLy7KPBUkgKb4ydX2KtzA7Ij7TDBgDcwPKvDFB2u5GVxSb1NHXs38VKaOLa8cvOxDL6txxQmm50ontzU6g==
+  dependencies:
+    "@popperjs/core" "^2.6.0"
+    "@storybook/client-logger" "6.2.0"
+    "@storybook/csf" "0.0.1"
+    "@storybook/theming" "6.2.0"
+    "@types/color-convert" "^2.0.0"
+    "@types/overlayscrollbars" "^1.12.0"
+    "@types/react-syntax-highlighter" "11.0.5"
+    color-convert "^2.0.1"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    markdown-to-jsx "^7.1.0"
+    memoizerific "^1.11.3"
+    overlayscrollbars "^1.13.1"
+    polished "^4.0.5"
+    prop-types "^15.7.2"
+    react-colorful "^5.0.1"
+    react-popper-tooltip "^3.1.1"
+    react-syntax-highlighter "^13.5.3"
+    react-textarea-autosize "^8.3.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/core-events@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.1.21.tgz#11f537f78f8c73ba5e627b57b282a279793a3511"
@@ -2398,6 +2528,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/core-events@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.0.tgz#8ed60b46718653c02a5e5e481eae750ebfb413ee"
+  integrity sha512-9W6gvWB08rDQXcnq4tmHxF+IqMqVvc3CUJDBnVSIC1me3UB5FSS73Buu8PeMj5F4JuLimPidNDbLVy/dPjWfoA==
+  dependencies:
+    core-js "^3.8.2"
+
 "@storybook/core@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.1.21.tgz#e4c9f5ab361e0c4690f2827a71308757f9d46395"
@@ -2593,6 +2730,22 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
+"@storybook/router@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.0.tgz#17a22b0eb5f07c3eb3aa6c6d931e71f58f338c0c"
+  integrity sha512-H3VhLLwUgbC/xNrwculVrr2QMh7+HOgtbmI4Oxmi7SdMBwBxUW5bAkWP0pJ3+ZeZI1aKxph85Z752uPQ3vkaTQ==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/client-logger" "6.2.0"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/semver@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
@@ -2636,6 +2789,24 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
+"@storybook/theming@6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.0.tgz#03b892de0d2478add91ecc7c56d47ce0d42059fc"
+  integrity sha512-BAIfPdUahWLhwwebeYcxziCTQMg/bEgKTO1Rp2MqFVvvHR+bx74cjte4oXiyH1+RVBMmwoKERsvYVrj06XEPAA==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@emotion/is-prop-valid" "^0.8.6"
+    "@emotion/styled" "^10.0.27"
+    "@storybook/client-logger" "6.2.0"
+    core-js "^3.8.2"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.27"
+    global "^4.4.0"
+    memoizerific "^1.11.3"
+    polished "^4.0.5"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/ui@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.1.21.tgz#bf7cac3ba9a6250f573fa1ba12d4592891d5ece2"
@@ -2909,7 +3080,14 @@
     "@types/node" "*"
     "@types/responselike" "*"
 
-"@types/color-name@^1.1.1":
+"@types/color-convert@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.0.tgz#8f5ee6b9e863dcbee5703f5a517ffb13d3ea4e22"
+  integrity sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ==
+  dependencies:
+    "@types/color-name" "*"
+
+"@types/color-name@*", "@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==
@@ -3117,7 +3295,7 @@
   resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.2.tgz#d070fe6a6b78755d1092a3dc492d34c3d8f871c4"
   integrity sha512-4QQmOF5KlwfxJ5IGXFIudkeLCdMABz03RcUXu+LCb24zmln8QW6aDjuGl4d4XPVLf2j+FnjelHTP7dvceAFbhA==
 
-"@types/overlayscrollbars@^1.9.0":
+"@types/overlayscrollbars@^1.12.0", "@types/overlayscrollbars@^1.9.0":
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/@types/overlayscrollbars/-/overlayscrollbars-1.12.0.tgz#98456caceca8ad73bd5bb572632a585074e70764"
   integrity sha512-h/pScHNKi4mb+TrJGDon8Yb06ujFG0mSg12wIO0sWMUF3dQIe2ExRRdNRviaNt9IjxIiOfnRr7FsQAdHwK4sMg==
@@ -3152,6 +3330,11 @@
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.4.tgz#a59e851c1ba16c0513ea123830dd639a0a15cb6a"
   integrity sha512-+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ==
 
+"@types/qs@^6.9.5":
+  version "6.9.6"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
+  integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
+
 "@types/reach__router@^1.3.7":
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.7.tgz#de8ab374259ae7f7499fc1373b9697a5f3cd6428"
@@ -3181,6 +3364,13 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-syntax-highlighter@11.0.5":
+  version "11.0.5"
+  resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz#0d546261b4021e1f9d85b50401c0a42acb106087"
+  integrity sha512-VIOi9i2Oj5XsmWWoB72p3KlZoEbdRAcechJa8Ztebw7bDl2YmR+odxIqhtJGp1q2EozHs02US+gzxJ9nuf56qg==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react@*", "@types/react@^17.0.3":
   version "17.0.3"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz#ba6e215368501ac3826951eef2904574c262cc79"
@@ -3273,6 +3463,11 @@
   resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.3.tgz#fb602cd4c2f0b7c0fb857e922075fdf677d25d84"
   integrity sha512-5oiXqR7kwDGZ6+gmzIO2lTC+QsriNuQXZDWNYRV3l2XRN/zmPgnC21DLSx2D05zvD8vnXW6qUg7JnXZ4I6qLVQ==
 
+"@types/webpack-env@^1.16.0":
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.0.tgz#8c0a9435dfa7b3b1be76562f3070efb3f92637b4"
+  integrity sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==
+
 "@types/webpack-sources@*":
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-1.4.2.tgz#5d3d4dea04008a779a90135ff96fb5c0c9e6292c"
@@ -4155,10 +4350,10 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
   integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
 
-axe-core@^4.0.1, axe-core@^4.0.2:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.1.tgz#70a7855888e287f7add66002211a423937063eaf"
-  integrity sha512-5Kgy8Cz6LPC9DJcNb3yjAXTu3XihQgEdnIg50c//zOC/MyLP0Clg+Y8Sh9ZjjnvBrDZU4DgXS9C3T9r4/scGZQ==
+axe-core@^4.0.2, axe-core@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.3.tgz#64a4c85509e0991f5168340edc4bedd1ceea6966"
+  integrity sha512-vwPpH4Aj4122EW38mxO/fxhGKtwWTMLDIJfZ1He0Edbtjcfna/R3YB67yVhezUMzqc3Jr3+Ii50KRntlENL4xQ==
 
 axobject-query@^2.2.0:
   version "2.2.0"
@@ -7048,6 +7243,13 @@ element-resize-detector@^1.2.1:
   dependencies:
     batch-processor "1.0.0"
 
+element-resize-detector@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.2.tgz#bf7c3ff915957e4e62e86241ed2f9c86b078892b"
+  integrity sha512-+LOXRkCJc4I5WhEJxIDjhmE3raF8jtOMBDqSCgZTMz2TX3oXAX5pE2+MDeopJlGdXzP7KzPbBJaUGfNaP9HG4A==
+  dependencies:
+    batch-processor "1.0.0"
+
 elliptic@^6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
@@ -7096,7 +7298,7 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-emotion-theming@^10.0.19:
+emotion-theming@^10.0.19, emotion-theming@^10.0.27:
   version "10.0.27"
   resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.0.27.tgz#1887baaec15199862c89b1b984b79806f2b9ab10"
   integrity sha512-MlF1yu/gYh8u+sLUqA0YuA9JX0P4Hb69WlKc/9OLo+WCXuX6sy/KoIa+qJimgmr2dWqnypYKYPX37esjDBbhdw==
@@ -7926,7 +8128,7 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -8593,6 +8795,15 @@ get-intrinsic@^1.0.0, get-intrinsic@^1.0.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-intrinsic@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
@@ -11939,6 +12150,11 @@ markdown-to-jsx@^6.11.4:
     prop-types "^15.6.2"
     unquote "^1.1.0"
 
+markdown-to-jsx@^7.1.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.1.2.tgz#19d3da4cd8864045cdd13a0d179147fbd6a088d4"
+  integrity sha512-O8DMCl32V34RrD+ZHxcAPc2+kYytuDIoQYjY36RVdsLK7uHjgNVvFec4yv0X6LgB4YEZgSvK5QtFi5YVqEpoMA==
+
 material-colors@^1.2.1:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
@@ -12907,6 +13123,11 @@ object-inspect@^1.7.0, object-inspect@^1.8.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
   integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
 
+object-inspect@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
+
 object-is@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6"
@@ -13159,6 +13380,11 @@ overlayscrollbars@^1.10.2:
   resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.0.tgz#1edb436328133b94877b558f77966d5497ca36a7"
   integrity sha512-p8oHrMeRAKxXDMPI/EBNITj/zTVHKNnAnM59Im+xnoZUlV07FyTg46wom2286jJlXGGfcPFG/ba5NUiCwWNd4w==
 
+overlayscrollbars@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.1.tgz#0b840a88737f43a946b9d87875a2f9e421d0338a"
+  integrity sha512-gIQfzgGgu1wy80EB4/6DaJGHMEGmizq27xHIESrzXq0Y/J0Ay1P3DWk6tuVmEPIZH15zaBlxeEJOqdJKmowHCQ==
+
 ow@^0.17.0:
   version "0.17.0"
   resolved "https://registry.yarnpkg.com/ow/-/ow-0.17.0.tgz#4f938999fed6264c9048cd6254356e0f1e7f688c"
@@ -13710,6 +13936,13 @@ polished@^3.4.4:
   dependencies:
     "@babel/runtime" "^7.9.2"
 
+polished@^4.0.5:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/polished/-/polished-4.1.1.tgz#40442cc973348e466f2918cdf647531bb6c29bfb"
+  integrity sha512-4MZTrfPMPRLD7ac8b+2JZxei58zw6N1hFkdBDERif5Tlj19y3vPoPusrLG+mJIlPTGnUlKw3+yWz0BazvMx1vg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+
 portfinder@^1.0.26:
   version "1.0.28"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
@@ -14747,6 +14980,13 @@ qs@6.7.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
+qs@^6.10.0:
+  version "6.10.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
+  integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+  dependencies:
+    side-channel "^1.0.4"
+
 qs@^6.6.0:
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687"
@@ -14890,6 +15130,11 @@ react-color@^2.17.0:
     reactcss "^1.2.0"
     tinycolor2 "^1.4.1"
 
+react-colorful@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.1.0.tgz#45c8044d80bc0e7ee08dc78c760e6694f3745ca2"
+  integrity sha512-ZXKcQbSuuHaN5tOHORI+G9/tXsGxk/6qlAbfETfZILwwWwngyJiyYRhUJjI+Esk71BhhQRdj0v7cFHDnD95jtQ==
+
 react-dev-utils@^11.0.3:
   version "11.0.3"
   resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.3.tgz#b61ed499c7d74f447d4faddcc547e5e671e97c08"
@@ -15140,7 +15385,7 @@ react-scripts@4.0.3:
   optionalDependencies:
     fsevents "^2.1.3"
 
-react-sizeme@^2.5.2, react-sizeme@^2.6.7:
+react-sizeme@^2.6.7:
   version "2.6.12"
   resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-2.6.12.tgz#ed207be5476f4a85bf364e92042520499455453e"
   integrity sha512-tL4sCgfmvapYRZ1FO2VmBmjPVzzqgHA7kI8lSJ6JS6L78jXFNRdOZFpXyK6P1NBZvKPPCZxReNgzZNUajAerZw==
@@ -15150,7 +15395,17 @@ react-sizeme@^2.5.2, react-sizeme@^2.6.7:
     shallowequal "^1.1.0"
     throttle-debounce "^2.1.0"
 
-react-syntax-highlighter@^13.5.0:
+react-sizeme@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-3.0.1.tgz#4d12f4244e0e6a0fb97253e7af0314dc7c83a5a0"
+  integrity sha512-9Hf1NLgSbny1bha77l9HwvwwxQUJxFUqi44Ih+y3evA+PezBpGdCGlnvye6avss2cIgs9PgdYgMnfuzJWn/RUw==
+  dependencies:
+    element-resize-detector "^1.2.2"
+    invariant "^2.2.4"
+    shallowequal "^1.1.0"
+    throttle-debounce "^3.0.1"
+
+react-syntax-highlighter@^13.5.0, react-syntax-highlighter@^13.5.3:
   version "13.5.3"
   resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz#9712850f883a3e19eb858cf93fad7bb357eea9c6"
   integrity sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==
@@ -15170,6 +15425,15 @@ react-textarea-autosize@^8.1.1:
     use-composed-ref "^1.0.0"
     use-latest "^1.0.0"
 
+react-textarea-autosize@^8.3.0:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.2.tgz#4f9374d357b0a6f6469956726722549124a1b2db"
+  integrity sha512-JrMWVgQSaExQByP3ggI1eA8zF4mF0+ddVuX7acUeK2V7bmrpjVOY72vmLz2IXFJSAXoY3D80nEzrn0GWajWK3Q==
+  dependencies:
+    "@babel/runtime" "^7.10.2"
+    use-composed-ref "^1.0.0"
+    use-latest "^1.0.0"
+
 react@17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
@@ -16323,6 +16587,15 @@ side-channel@^1.0.3:
     es-abstract "^1.18.0-next.0"
     object-inspect "^1.8.0"
 
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
@@ -16675,6 +16948,11 @@ stealthy-require@^1.1.1:
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
+store2@^2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/store2/-/store2-2.12.0.tgz#e1f1b7e1a59b6083b2596a8d067f6ee88fd4d3cf"
+  integrity sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==
+
 store2@^2.7.1:
   version "2.11.2"
   resolved "https://registry.yarnpkg.com/store2/-/store2-2.11.2.tgz#a298e5e97b21b3ce7419b732540bc7c79cb007db"
@@ -17262,6 +17540,20 @@ telejson@^5.0.2:
     lodash "^4.17.19"
     memoizerific "^1.11.3"
 
+telejson@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/telejson/-/telejson-5.1.0.tgz#cc04e4c2a355f9eb6af557e37acd6449feb1d146"
+  integrity sha512-Yy0N2OV0mosmr1SCZEm3Ezhu/oi5Dbao5RqauZu4+VI5I/XtVBHXajRk0txuqbFYtKdzzWGDZFGSif9ovVLjEA==
+  dependencies:
+    "@types/is-function" "^1.0.0"
+    global "^4.4.0"
+    is-function "^1.0.2"
+    is-regex "^1.1.1"
+    is-symbol "^1.0.3"
+    isobject "^4.0.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+
 temp-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
@@ -17405,6 +17697,11 @@ throttle-debounce@^2.1.0:
   resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.2.1.tgz#fbd933ae6793448816f7d5b3cae259d464c98137"
   integrity sha512-i9hAVld1f+woAiyNGqWelpDD5W1tpMroL3NofTz9xzwq6acWBlO2dC8k5EFSZepU6oOINtV5Q3aSPoRg7o4+fA==
 
+throttle-debounce@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
+  integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==
+
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"

From 390b36b38da0dd61cf97aad635db9032ec78f577 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 18:07:39 +0000
Subject: [PATCH 104/288] build(deps-dev): bump downshift from 6.1.1 to 6.1.2
 (#3395)

---
 package.json |  2 +-
 yarn.lock    | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index e845d2675ffe..52dfe871bc53 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "braces": "^3.0.2",
     "cross-env": "^7.0.3",
     "diff": "^5.0.0",
-    "downshift": "^6.1.1",
+    "downshift": "^6.1.2",
     "eslint": "^7.18.0",
     "eslint-gitignore": "^0.1.0",
     "eslint-plugin-jest": "24.3.2",
diff --git a/yarn.lock b/yarn.lock
index 9711ffab4daf..889cec24b609 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1367,10 +1367,10 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
-  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
+  integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -7171,15 +7171,15 @@ download@^7.1.0:
     p-event "^2.1.0"
     pify "^3.0.0"
 
-downshift@^6.0.6, downshift@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.1.1.tgz#3c8f5a64cc678e1b45a87b80647ea5351af13e5e"
-  integrity sha512-ch8Sh/j7gVqQd7Kcv3A5TkGfldmxmlQrRPZJYWEhzh24+h7WA4vXssuhcGNJrD8YPJlZYQGHcaX8BNhS0IcOvg==
+downshift@^6.0.6, downshift@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.1.2.tgz#99d9a03d4da4bf369df766effc3b70f7e789950e"
+  integrity sha512-WnPoQ6miic4+uEzPEfqgeen0t5YREOUabMopU/Juo/UYDMZl0ZACkO6ykWCRg48dlEUmEt6zfaJlj1x7kEy78g==
   dependencies:
-    "@babel/runtime" "^7.12.5"
+    "@babel/runtime" "^7.13.10"
     compute-scroll-into-view "^1.0.17"
     prop-types "^15.7.2"
-    react-is "^17.0.1"
+    react-is "^17.0.2"
 
 duplexer3@^0.1.4:
   version "0.1.4"

From 5e73b9565634fb9a9b4852a0a2ce763914f6e484 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 18:10:02 +0000
Subject: [PATCH 105/288] build(deps-dev): bump @testing-library/react from
 11.2.5 to 11.2.6 (#3390)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 52dfe871bc53..e35d788ca766 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "@storybook/node-logger": "^6.2.0",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
-    "@testing-library/react": "^11.2.5",
+    "@testing-library/react": "^11.2.6",
     "@types/jest": "^26.0.22",
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.3",
diff --git a/yarn.lock b/yarn.lock
index 889cec24b609..9e351fedb61a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2997,10 +2997,10 @@
     lz-string "^1.4.4"
     pretty-format "^26.6.2"
 
-"@testing-library/react@^11.2.5":
-  version "11.2.5"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.5.tgz#ae1c36a66c7790ddb6662c416c27863d87818eb9"
-  integrity sha512-yEx7oIa/UWLe2F2dqK0FtMF9sJWNXD+2PPtp39BvE0Kh9MJ9Kl0HrZAgEuhUJR+Lx8Di6Xz+rKwSdEPY2UV8ZQ==
+"@testing-library/react@^11.2.6":
+  version "11.2.6"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.6.tgz#586a23adc63615985d85be0c903f374dab19200b"
+  integrity sha512-TXMCg0jT8xmuU8BkKMtp8l7Z50Ykew5WNX8UoIKTaLFwKkP2+1YDhOLA2Ga3wY4x29jyntk7EWfum0kjlYiSjQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@testing-library/dom" "^7.28.1"

From 533efd61f009816933bb0da54db6778393fd7ca7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 18:23:14 +0000
Subject: [PATCH 106/288] build(deps-dev): bump @storybook/addon-actions from
 6.1.21 to 6.2.0 (#3391)

---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index e35d788ca766..a909407329ec 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "@mdn/dinocons": "^0.3.0",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.2.0",
-    "@storybook/addon-actions": "^6.1.21",
+    "@storybook/addon-actions": "^6.2.0",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.1.21",
     "@storybook/node-logger": "^6.2.0",
diff --git a/yarn.lock b/yarn.lock
index 9e351fedb61a..2a56cc89bc2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1367,7 +1367,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.13.10"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
   integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
@@ -2110,7 +2110,7 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@6.1.21", "@storybook/addon-actions@^6.1.21":
+"@storybook/addon-actions@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.1.21.tgz#881dceb0ed650fe28086d9993703f8081b29f4ce"
   integrity sha512-H+nhSgK3X5L+JfArsC9ufvgJzQwPN9UXBxhMl74faEDCo9RGmq9ywNcjn9XlZGGnJ3jCaYrI/T1u0J7F6PBrTA==
@@ -2133,6 +2133,29 @@
     util-deprecate "^1.0.2"
     uuid "^8.0.0"
 
+"@storybook/addon-actions@^6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.0.tgz#1d2716a1241f157450fc56081a9e7e60713a4749"
+  integrity sha512-Xi7BOBHNEfY0UK/KgX9DLewP56FS5HPRDckIlV/EepriUS48nENYuO8sFKzMOKnNik/qQM8vSBtD48vG8oBdJw==
+  dependencies:
+    "@storybook/addons" "6.2.0"
+    "@storybook/api" "6.2.0"
+    "@storybook/client-api" "6.2.0"
+    "@storybook/components" "6.2.0"
+    "@storybook/core-events" "6.2.0"
+    "@storybook/theming" "6.2.0"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    polished "^4.0.5"
+    prop-types "^15.7.2"
+    react-inspector "^5.1.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+    uuid-browser "^3.1.0"
+
 "@storybook/addon-backgrounds@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.1.21.tgz#ada6c0a8a375855f99da0a7de770dd2c245d536d"
@@ -10343,7 +10366,7 @@ is-docker@^2.0.0, is-docker@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
   integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
 
-is-dom@^1.1.0:
+is-dom@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-dom/-/is-dom-1.1.0.tgz#af1fced292742443bb59ca3f76ab5e80907b4e8a"
   integrity sha512-u82f6mvhYxRPKpw8V1N0W8ce1xXwOrQtgGcxl6UCL5zBmZu3is/18K0rR7uFCnMDuAsS/3W54mGL4vsaFUQlEQ==
@@ -14841,7 +14864,7 @@ prompts@2.4.0, prompts@^2.0.0, prompts@^2.0.1, prompts@^2.3.0:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -15258,14 +15281,14 @@ react-hotkeys@2.0.0:
   dependencies:
     prop-types "^15.6.1"
 
-react-inspector@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-5.0.1.tgz#8a30f3d488c4f40203624bbe24800f508ae05d3a"
-  integrity sha512-qRIENuAIcRaytrmg/TL5nN5igYZMzyQqIKlWA8zoYRDltULsZC1bWy2Ua5wYJuwEYnC3gK4FCjcIQnb+5OyLsQ==
+react-inspector@^5.0.1, react-inspector@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-5.1.0.tgz#45a325e15f33e595be5356ca2d3ceffb7d6b8c3a"
+  integrity sha512-JAwswiengIcxi4X/Ssb8nf6suOuQsyit8Fxo04+iPKTnPNY3XIOuagjMZSzpJDDKkYcc/ARlySOYZZv626WUvA==
   dependencies:
-    "@babel/runtime" "^7.8.7"
-    is-dom "^1.1.0"
-    prop-types "^15.6.1"
+    "@babel/runtime" "^7.0.0"
+    is-dom "^1.0.0"
+    prop-types "^15.0.0"
 
 react-is@^16.7.0, react-is@^16.8.1:
   version "16.13.1"
@@ -18473,6 +18496,11 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
+uuid-browser@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/uuid-browser/-/uuid-browser-3.1.0.tgz#0f05a40aef74f9e5951e20efbf44b11871e56410"
+  integrity sha1-DwWkCu90+eWVHiDvv0SxGHHlZBA=
+
 uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2, uuid@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"

From e093af8df5ff034bcdf6fe2947fa5feb6831ad08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 18:34:56 +0000
Subject: [PATCH 107/288] build(deps-dev): bump @storybook/addon-links from
 6.1.21 to 6.2.0 (#3389)

---
 package.json |  2 +-
 yarn.lock    | 38 ++++++++++++++------------------------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index a909407329ec..5579dfdcce51 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "@storybook/addon-a11y": "^6.2.0",
     "@storybook/addon-actions": "^6.2.0",
     "@storybook/addon-essentials": "^6.1.21",
-    "@storybook/addon-links": "^6.1.21",
+    "@storybook/addon-links": "^6.2.0",
     "@storybook/node-logger": "^6.2.0",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index 2a56cc89bc2e..3314f6596be1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2252,21 +2252,21 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-links@^6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.1.21.tgz#59b04c4a0bd1c8dc86fecea64a2531154df382e6"
-  integrity sha512-DFPK6aYs9VIs1tO0PJ+mBwg64ZLv6NcVwFJ083ghCj/hR+0+3NRox+oRHXCWq7RHtnJeU4VKEiRx2EpE9L9Bkg==
+"@storybook/addon-links@^6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.0.tgz#20eaa5b685ccad87d9c1227724ef1d08947b3ab3"
+  integrity sha512-BmNIsMOQdcfJwQlKD0dlZnqNGa4mCcSI1s+t4YuQaorHRQ3TObBDwzleHHrLOwFQ9qhTQlGloNoT3cGVCnc9iA==
   dependencies:
-    "@storybook/addons" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/core-events" "6.1.21"
+    "@storybook/addons" "6.2.0"
+    "@storybook/client-logger" "6.2.0"
+    "@storybook/core-events" "6.2.0"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.1.21"
-    "@types/qs" "^6.9.0"
-    core-js "^3.0.1"
-    global "^4.3.2"
+    "@storybook/router" "6.2.0"
+    "@types/qs" "^6.9.5"
+    core-js "^3.8.2"
+    global "^4.4.0"
     prop-types "^15.7.2"
-    qs "^6.6.0"
+    qs "^6.10.0"
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
@@ -3348,12 +3348,7 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
   integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
 
-"@types/qs@^6.9.0":
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.4.tgz#a59e851c1ba16c0513ea123830dd639a0a15cb6a"
-  integrity sha512-+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ==
-
-"@types/qs@^6.9.5":
+"@types/qs@^6.9.0", "@types/qs@^6.9.5":
   version "6.9.6"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
   integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
@@ -15003,18 +14998,13 @@ qs@6.7.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
-qs@^6.10.0:
+qs@^6.10.0, qs@^6.6.0:
   version "6.10.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
   integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
   dependencies:
     side-channel "^1.0.4"
 
-qs@^6.6.0:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687"
-  integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==
-
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"

From 9b8b72c806d2e4199a1c3fc7cf49c6aa5fb81a50 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 30 Mar 2021 16:28:36 -0400
Subject: [PATCH 108/288] disallow linebreaks in SpecName first argument
 (#3375)

---
 kumascript/macros/SpecName.ejs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kumascript/macros/SpecName.ejs b/kumascript/macros/SpecName.ejs
index 19e646c8ef76..44acb85414ad 100644
--- a/kumascript/macros/SpecName.ejs
+++ b/kumascript/macros/SpecName.ejs
@@ -12,6 +12,9 @@
 //      appearance of the link.
 
 var spec   = $0;
+if (spec.includes('\n')) {
+  throw new Error("SpecName first argument can't have a newline character in it");
+}
 var anchor = $1;
 var name;
 var url;

From b68897f9f240bcbf9c2ae1df5b78c53688b6c2bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 05:38:59 +0000
Subject: [PATCH 109/288] build(deps-dev): bump @storybook/addon-a11y from
 6.2.0 to 6.2.1 (#3402)

---
 package.json |   2 +-
 yarn.lock    | 192 +++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 180 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 5579dfdcce51..a4437d37b5a9 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "@babel/core": "^7.13.14",
     "@mdn/dinocons": "^0.3.0",
     "@mdn/minimalist": "^0.8.0",
-    "@storybook/addon-a11y": "^6.2.0",
+    "@storybook/addon-a11y": "^6.2.1",
     "@storybook/addon-actions": "^6.2.0",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.0",
diff --git a/yarn.lock b/yarn.lock
index 3314f6596be1..a37a44b573d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2088,19 +2088,19 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@storybook/addon-a11y@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.0.tgz#bda142f0d3566184d66a40a940ba0421cb8fc7a4"
-  integrity sha512-i62S0xa9bKWon4NxYnYVQHG9t5BCwy2o/STeX6a5R+6qlmhb14+OrHQpib3p4esIb42XAtpxgAdHALyfcI7Img==
-  dependencies:
-    "@storybook/addons" "6.2.0"
-    "@storybook/api" "6.2.0"
-    "@storybook/channels" "6.2.0"
-    "@storybook/client-api" "6.2.0"
-    "@storybook/client-logger" "6.2.0"
-    "@storybook/components" "6.2.0"
-    "@storybook/core-events" "6.2.0"
-    "@storybook/theming" "6.2.0"
+"@storybook/addon-a11y@^6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.1.tgz#e55867b3e55d79aaeea87cc54faa0bdff44ff95f"
+  integrity sha512-NBBwtiJOgGEgwCYx9H+peREB1mjJGv3WnLTNewsQQCZ8pRSrhpXPFUYhd0vXq0SXQEjX6xWciAp5lEDzmvzl8Q==
+  dependencies:
+    "@storybook/addons" "6.2.1"
+    "@storybook/api" "6.2.1"
+    "@storybook/channels" "6.2.1"
+    "@storybook/client-api" "6.2.1"
+    "@storybook/client-logger" "6.2.1"
+    "@storybook/components" "6.2.1"
+    "@storybook/core-events" "6.2.1"
+    "@storybook/theming" "6.2.1"
     axe-core "^4.1.1"
     core-js "^3.8.2"
     global "^4.4.0"
@@ -2328,6 +2328,21 @@
     global "^4.4.0"
     regenerator-runtime "^0.13.7"
 
+"@storybook/addons@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.1.tgz#7f1c7042912b82023e4dfc08f31c4149d90800bd"
+  integrity sha512-HqrpqF+XMnqAJHhN6Te7YYR3Gjcj7Js9bO59jd5AQQ96PBoQ6k5I/tCmripvWVxdak4UfI2p4zn6x7Kkw5bHxA==
+  dependencies:
+    "@storybook/api" "6.2.1"
+    "@storybook/channels" "6.2.1"
+    "@storybook/client-logger" "6.2.1"
+    "@storybook/core-events" "6.2.1"
+    "@storybook/router" "6.2.1"
+    "@storybook/theming" "6.2.1"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    regenerator-runtime "^0.13.7"
+
 "@storybook/api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.21.tgz#be753ca8d3602efe4a11783c81c689463bee0825"
@@ -2379,6 +2394,32 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.1.tgz#e76b6c31578089f0df06fd67486d9bc7d2eca4c1"
+  integrity sha512-W5H5FExLExCbj67OAQYRopeTdADuHOUgQiMoeoYSckdyWQl5DJb2l85yDlr0auZNYbjFHzJqEOs0Loch/NNlYA==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/channels" "6.2.1"
+    "@storybook/client-logger" "6.2.1"
+    "@storybook/core-events" "6.2.1"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "6.2.1"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.1"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    store2 "^2.12.0"
+    telejson "^5.1.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.1.21.tgz#acce71833499dba4c4e686de09f5b281a3239842"
@@ -2405,6 +2446,19 @@
     qs "^6.10.0"
     telejson "^5.1.0"
 
+"@storybook/channel-postmessage@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.1.tgz#9bb22ef776c315ad09caf1a149fbe16496593821"
+  integrity sha512-6AXxq8QvUzO7OI4qENux2zFiK+n9pVDDRdazZPesWYaD11jrnh7IGMYwa9a3mbVWJchVwc6b74uWUOmvMhG0cQ==
+  dependencies:
+    "@storybook/channels" "6.2.1"
+    "@storybook/client-logger" "6.2.1"
+    "@storybook/core-events" "6.2.1"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    qs "^6.10.0"
+    telejson "^5.1.0"
+
 "@storybook/channels@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.1.21.tgz#adbfae5f4767234c5b17d9578be983584dddead4"
@@ -2423,6 +2477,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/channels@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.1.tgz#3b9f4164dddbb5a2b1628adfaeb0e7c1321d2a1b"
+  integrity sha512-p0QopD9JFIAYkDuVqqmpObcE4apnIZUG9bccRX2yNYCaNrRl3zalV4zDY/2TiwgoFOV2ydKPKdK2ZJcDY5JItg==
+  dependencies:
+    core-js "^3.8.2"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.1.21.tgz#c9f72bbc9bf9d12cc931eb824f6912173c73b0b3"
@@ -2471,6 +2534,30 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.1.tgz#21433c9b9baa019bd0bcdcf7f9f96e7e7058bfdf"
+  integrity sha512-ABl83n8F1F5fsjlxcpqWMYP9HDT7stkLKCIkN4zIC0uHWMHtWOYyJzJl166nv+nLjHiQdw+kimgA2jiKQfoF3Q==
+  dependencies:
+    "@storybook/addons" "6.2.1"
+    "@storybook/channel-postmessage" "6.2.1"
+    "@storybook/channels" "6.2.1"
+    "@storybook/client-logger" "6.2.1"
+    "@storybook/core-events" "6.2.1"
+    "@storybook/csf" "0.0.1"
+    "@types/qs" "^6.9.5"
+    "@types/webpack-env" "^1.16.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    stable "^0.1.8"
+    store2 "^2.12.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.1.21.tgz#fe7d9e645ddb4eb9dc18fdacea24b4baf11bc6c9"
@@ -2487,6 +2574,14 @@
     core-js "^3.8.2"
     global "^4.4.0"
 
+"@storybook/client-logger@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.1.tgz#6fb8b39309cdaf6fd431bfe0fe11e4454afc910e"
+  integrity sha512-VDdSaM9MRiiFQF545GFgNJNb6hMC+JHjiV0cfJ3adrs021JE/J3d6Nc8Kn/XcpcX2cFrQsbffrOGaCAWAIllNg==
+  dependencies:
+    core-js "^3.8.2"
+    global "^4.4.0"
+
 "@storybook/components@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.21.tgz#7b9bfd51e73c179654a114275e5073f494d2a005"
@@ -2544,6 +2639,36 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/components@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.1.tgz#da664c075844be49637c8d0b153f5a30cad68f20"
+  integrity sha512-pptXdgifINkc8K0yp55lOlqQywAyAwkuQVXAhbSGZriLn2kT6ei0GElJaEftcGlciOAUvi9H0rvcIvCAlxiPRQ==
+  dependencies:
+    "@popperjs/core" "^2.6.0"
+    "@storybook/client-logger" "6.2.1"
+    "@storybook/csf" "0.0.1"
+    "@storybook/theming" "6.2.1"
+    "@types/color-convert" "^2.0.0"
+    "@types/overlayscrollbars" "^1.12.0"
+    "@types/react-syntax-highlighter" "11.0.5"
+    color-convert "^2.0.1"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    markdown-to-jsx "^7.1.0"
+    memoizerific "^1.11.3"
+    overlayscrollbars "^1.13.1"
+    polished "^4.0.5"
+    prop-types "^15.7.2"
+    react-colorful "^5.0.1"
+    react-popper-tooltip "^3.1.1"
+    react-syntax-highlighter "^13.5.3"
+    react-textarea-autosize "^8.3.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/core-events@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.1.21.tgz#11f537f78f8c73ba5e627b57b282a279793a3511"
@@ -2558,6 +2683,13 @@
   dependencies:
     core-js "^3.8.2"
 
+"@storybook/core-events@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.1.tgz#54e41fde06e07d4518e18857bc0ecf0f8d9c79c2"
+  integrity sha512-zZyVkCOQX52n0++/2ui3os6G7CSS0APqG+AlOhu8vF1O+NOknkYSTDPVncFcoWCHnWsS9ANcMwkRRGCocFKD6g==
+  dependencies:
+    core-js "^3.8.2"
+
 "@storybook/core@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.1.21.tgz#e4c9f5ab361e0c4690f2827a71308757f9d46395"
@@ -2769,6 +2901,22 @@
     qs "^6.10.0"
     ts-dedent "^2.0.0"
 
+"@storybook/router@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.1.tgz#45a40a13c0cbae54ac4034e3d461d0e9a3f80bcb"
+  integrity sha512-gG4c7NB/z/8zaJjkMFPA4jzENFPg+eywzHK6deuja3iXiEHLd/O0nqwQh1jzxOXLNMWjrCrGm/TTOrz8LbO5Lw==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/client-logger" "6.2.1"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/semver@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
@@ -2830,6 +2978,24 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
+"@storybook/theming@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.1.tgz#ad0ebc0a22560b775eca691b5e72c9db235eaf07"
+  integrity sha512-4sX3Qy6mgYlWpJcJx3AmMfzXhj/o/lVpux9MdhNDRFkDU958k7NhoSdny3ahg59C9t7yQ4chakZynKLgnVkFTA==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@emotion/is-prop-valid" "^0.8.6"
+    "@emotion/styled" "^10.0.27"
+    "@storybook/client-logger" "6.2.1"
+    core-js "^3.8.2"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.27"
+    global "^4.4.0"
+    memoizerific "^1.11.3"
+    polished "^4.0.5"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/ui@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.1.21.tgz#bf7cac3ba9a6250f573fa1ba12d4592891d5ece2"

From 84268368af59b872efc50713e12ac9c5586bb893 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 05:39:28 +0000
Subject: [PATCH 110/288] build(deps-dev): bump @storybook/node-logger from
 6.2.0 to 6.2.1 (#3403)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a4437d37b5a9..2caec403267a 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "@storybook/addon-actions": "^6.2.0",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.0",
-    "@storybook/node-logger": "^6.2.0",
+    "@storybook/node-logger": "^6.2.1",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
     "@testing-library/react": "^11.2.6",
diff --git a/yarn.lock b/yarn.lock
index a37a44b573d7..c467aaeb30f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2815,10 +2815,10 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/node-logger@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.0.tgz#66d69b3d22f2f94c0900b76cc015c93d4e693c25"
-  integrity sha512-8c2Nr3lrqYYril4VljOSAuGBu93ozxcTBMsFTg5UIOiItJSZLq3ihfCoIEh466toPGCBLJxiUk5/zI70Fv/Ytw==
+"@storybook/node-logger@^6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.1.tgz#80afe89a3f85e2329c46d530f4690a13d30c7c29"
+  integrity sha512-PuyLORwbvs6uB6dzbY+Uvs/LUW94yD5sbarNGIg866lIzhNT6nZOCRkiEgo7+RD1/mcMz0Lho0kh5Hob2Y5mqQ==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^4.1.0"

From d87e4b40382cf276be8df43e62b324967d194029 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 05:41:54 +0000
Subject: [PATCH 111/288] build(deps-dev): bump swr from 0.5.4 to 0.5.5 (#3405)

---
 package.json |  2 +-
 yarn.lock    | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2caec403267a..b76c04a7a985 100644
--- a/package.json
+++ b/package.json
@@ -149,7 +149,7 @@
     "stylelint-config-sass-guidelines": "^8.0.0",
     "stylelint-prettier": "^1.2.0",
     "stylelint-scss": "^3.19.0",
-    "swr": "^0.5.4",
+    "swr": "^0.5.5",
     "ts-loader": "^8.1.0",
     "typescript": "^4.2.3",
     "use-debounce": "^5.2.1",
diff --git a/yarn.lock b/yarn.lock
index c467aaeb30f7..3e3b04d495b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7041,6 +7041,11 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
+dequal@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d"
+  integrity sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug==
+
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -17625,10 +17630,12 @@ svgo@^2.1.0:
     csso "^4.2.0"
     stable "^0.1.8"
 
-swr@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/swr/-/swr-0.5.4.tgz#9516af6ffd84ba2c23a804ff771be2eb83ba8d46"
-  integrity sha512-TUSxxuC8uP/4JKV22ml91WQ0tbif+9HVhm683xm8KYfwZIW5ogwcnU634dg3x6N7azpIDIOLokoIi+z5vCz/yA==
+swr@^0.5.5:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/swr/-/swr-0.5.5.tgz#c72c1615765f33570a16bbb13699e3ac87eaaa3a"
+  integrity sha512-u4mUorK9Ipt+6LEITvWRWiRWAQjAysI6cHxbMmMV1dIdDzxMnswWo1CyGoyBHXX91CchxcuoqgFZ/ycx+YfhCA==
+  dependencies:
+    dequal "2.0.2"
 
 symbol-tree@^3.2.4:
   version "3.2.4"

From 5da6d5a394ec964f84ae2bb1f0ccd8513ec4948e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 08:15:48 +0000
Subject: [PATCH 112/288] build(deps-dev): bump @storybook/addon-links from
 6.2.0 to 6.2.1 (#3404)

---
 package.json |  2 +-
 yarn.lock    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index b76c04a7a985..833e30fe0b0a 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "@storybook/addon-a11y": "^6.2.1",
     "@storybook/addon-actions": "^6.2.0",
     "@storybook/addon-essentials": "^6.1.21",
-    "@storybook/addon-links": "^6.2.0",
+    "@storybook/addon-links": "^6.2.1",
     "@storybook/node-logger": "^6.2.1",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index 3e3b04d495b6..d77b46027530 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2252,16 +2252,16 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-links@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.0.tgz#20eaa5b685ccad87d9c1227724ef1d08947b3ab3"
-  integrity sha512-BmNIsMOQdcfJwQlKD0dlZnqNGa4mCcSI1s+t4YuQaorHRQ3TObBDwzleHHrLOwFQ9qhTQlGloNoT3cGVCnc9iA==
+"@storybook/addon-links@^6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.1.tgz#64a9978b9eaec8a85de8b965d823cf5786c1a6ba"
+  integrity sha512-ZVAaNEVdQaL8+OLu6A7yfake0w8cn9YOZAnUcrIPalIVZ7MESy/vfxAE7lzYk17ngC9G+w5ELtzoD4WThTcCNg==
   dependencies:
-    "@storybook/addons" "6.2.0"
-    "@storybook/client-logger" "6.2.0"
-    "@storybook/core-events" "6.2.0"
+    "@storybook/addons" "6.2.1"
+    "@storybook/client-logger" "6.2.1"
+    "@storybook/core-events" "6.2.1"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.0"
+    "@storybook/router" "6.2.1"
     "@types/qs" "^6.9.5"
     core-js "^3.8.2"
     global "^4.4.0"

From 74ea2cfc2a5c0273834c9a5a86d806f15a319aa5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 08:27:18 +0000
Subject: [PATCH 113/288] build(deps-dev): bump @storybook/addon-actions from
 6.2.0 to 6.2.1 (#3406)

---
 package.json |   2 +-
 yarn.lock    | 188 +++------------------------------------------------
 2 files changed, 12 insertions(+), 178 deletions(-)

diff --git a/package.json b/package.json
index 833e30fe0b0a..df125b2250aa 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "@mdn/dinocons": "^0.3.0",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.2.1",
-    "@storybook/addon-actions": "^6.2.0",
+    "@storybook/addon-actions": "^6.2.1",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.1",
     "@storybook/node-logger": "^6.2.1",
diff --git a/yarn.lock b/yarn.lock
index d77b46027530..56102eea1019 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2133,17 +2133,17 @@
     util-deprecate "^1.0.2"
     uuid "^8.0.0"
 
-"@storybook/addon-actions@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.0.tgz#1d2716a1241f157450fc56081a9e7e60713a4749"
-  integrity sha512-Xi7BOBHNEfY0UK/KgX9DLewP56FS5HPRDckIlV/EepriUS48nENYuO8sFKzMOKnNik/qQM8vSBtD48vG8oBdJw==
-  dependencies:
-    "@storybook/addons" "6.2.0"
-    "@storybook/api" "6.2.0"
-    "@storybook/client-api" "6.2.0"
-    "@storybook/components" "6.2.0"
-    "@storybook/core-events" "6.2.0"
-    "@storybook/theming" "6.2.0"
+"@storybook/addon-actions@^6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.1.tgz#af5924969c691a4fe6ec9266ffefe02b95245063"
+  integrity sha512-pRzyJIcso+7FJ4Xv4lJZ/mppFgkdnJ3B/R6QPYl1Enwlxjk2CH2iDD+Hq85WFHGfg5cjtFm3fd9EbPXC09ReeA==
+  dependencies:
+    "@storybook/addons" "6.2.1"
+    "@storybook/api" "6.2.1"
+    "@storybook/client-api" "6.2.1"
+    "@storybook/components" "6.2.1"
+    "@storybook/core-events" "6.2.1"
+    "@storybook/theming" "6.2.1"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
     global "^4.4.0"
@@ -2313,21 +2313,6 @@
     global "^4.3.2"
     regenerator-runtime "^0.13.7"
 
-"@storybook/addons@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.0.tgz#175cc7d7c6671f202f86cd59f9b53e1f2aea71c1"
-  integrity sha512-BB/GufdLX9NzswQxOJWq68UFs+zXzAp6fjMCJKrkmsR6O3IfkqM0vGqrbwitbHejbCNARgBJjOQVlw/DPtl9Xw==
-  dependencies:
-    "@storybook/api" "6.2.0"
-    "@storybook/channels" "6.2.0"
-    "@storybook/client-logger" "6.2.0"
-    "@storybook/core-events" "6.2.0"
-    "@storybook/router" "6.2.0"
-    "@storybook/theming" "6.2.0"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    regenerator-runtime "^0.13.7"
-
 "@storybook/addons@6.2.1":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.1.tgz#7f1c7042912b82023e4dfc08f31c4149d90800bd"
@@ -2368,32 +2353,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/api@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.0.tgz#f0499f6797d0f7db5eaabaced787930afa5032a4"
-  integrity sha512-mqE9CINzMndLMwWzI8jDPaqgXe4MQ3WIT0qa7PDSEBeKzHNXAjw+b/BjOYLDRfI72UgyckoCEZqFxn1CTYM+Hw==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/channels" "6.2.0"
-    "@storybook/client-logger" "6.2.0"
-    "@storybook/core-events" "6.2.0"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.0"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.0"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.12.0"
-    telejson "^5.1.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@6.2.1":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.1.tgz#e76b6c31578089f0df06fd67486d9bc7d2eca4c1"
@@ -2433,19 +2392,6 @@
     qs "^6.6.0"
     telejson "^5.0.2"
 
-"@storybook/channel-postmessage@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.0.tgz#ca6f4f5420f7c91a3276958d66584e233ebd16ec"
-  integrity sha512-ZKi73Fe6zAJeLjUUAM9SZyz0Gh83/Z/Tanb+ghnou4LGZZT/7v10TXYBeULh57ucW2tPIgbBwhkfob/w1OPkRg==
-  dependencies:
-    "@storybook/channels" "6.2.0"
-    "@storybook/client-logger" "6.2.0"
-    "@storybook/core-events" "6.2.0"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    qs "^6.10.0"
-    telejson "^5.1.0"
-
 "@storybook/channel-postmessage@6.2.1":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.1.tgz#9bb22ef776c315ad09caf1a149fbe16496593821"
@@ -2468,15 +2414,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channels@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.0.tgz#80f6a7ae8e315e44236da643529d01a9ab479e40"
-  integrity sha512-vQiaWHm5Jv4x1Lo840tuNYfzAYOj/hAXqfCm/q/efQE8Ouu+3jj5q4BDgFRz8K5+C1eUIdOC1DPPV8/79+9o4g==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/channels@6.2.1":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.1.tgz#3b9f4164dddbb5a2b1628adfaeb0e7c1321d2a1b"
@@ -2510,30 +2447,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-api@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.0.tgz#be087adccf06f27bdc5e5a1556dc9b9d9224edda"
-  integrity sha512-0JwXqiF5yCRUC4Uy1maQgenNeUuVVDXDQikzHQzNFhRzJpmakjZB1een7sHXr5x8Wi0DMSDZPyFe+5qVQg08yg==
-  dependencies:
-    "@storybook/addons" "6.2.0"
-    "@storybook/channel-postmessage" "6.2.0"
-    "@storybook/channels" "6.2.0"
-    "@storybook/client-logger" "6.2.0"
-    "@storybook/core-events" "6.2.0"
-    "@storybook/csf" "0.0.1"
-    "@types/qs" "^6.9.5"
-    "@types/webpack-env" "^1.16.0"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    stable "^0.1.8"
-    store2 "^2.12.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-api@6.2.1":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.1.tgz#21433c9b9baa019bd0bcdcf7f9f96e7e7058bfdf"
@@ -2566,14 +2479,6 @@
     core-js "^3.0.1"
     global "^4.3.2"
 
-"@storybook/client-logger@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.0.tgz#47e9fad5dd5452fe048fc57c737fa22d0d196f20"
-  integrity sha512-A7aF3T7VsxpCAMKkY/UD0tAg/KgEMpmGqwSFNv1ZWikKyZ0oWbkiwPt8ZNQaTHlapt9/9BnoxLTEFNhiinXMTQ==
-  dependencies:
-    core-js "^3.8.2"
-    global "^4.4.0"
-
 "@storybook/client-logger@6.2.1":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.1.tgz#6fb8b39309cdaf6fd431bfe0fe11e4454afc910e"
@@ -2609,36 +2514,6 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/components@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.0.tgz#9e08d1e513e7a5bf4d5ef86f07caa9d1590980d2"
-  integrity sha512-pGUsgLy7KPBUkgKb4ydX2KtzA7Ij7TDBgDcwPKvDFB2u5GVxSb1NHXs38VKaOLa8cvOxDL6txxQmm50ontzU6g==
-  dependencies:
-    "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.2.0"
-    "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.2.0"
-    "@types/color-convert" "^2.0.0"
-    "@types/overlayscrollbars" "^1.12.0"
-    "@types/react-syntax-highlighter" "11.0.5"
-    color-convert "^2.0.1"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    markdown-to-jsx "^7.1.0"
-    memoizerific "^1.11.3"
-    overlayscrollbars "^1.13.1"
-    polished "^4.0.5"
-    prop-types "^15.7.2"
-    react-colorful "^5.0.1"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.3"
-    react-textarea-autosize "^8.3.0"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/components@6.2.1":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.1.tgz#da664c075844be49637c8d0b153f5a30cad68f20"
@@ -2676,13 +2551,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.0.tgz#8ed60b46718653c02a5e5e481eae750ebfb413ee"
-  integrity sha512-9W6gvWB08rDQXcnq4tmHxF+IqMqVvc3CUJDBnVSIC1me3UB5FSS73Buu8PeMj5F4JuLimPidNDbLVy/dPjWfoA==
-  dependencies:
-    core-js "^3.8.2"
-
 "@storybook/core-events@6.2.1":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.1.tgz#54e41fde06e07d4518e18857bc0ecf0f8d9c79c2"
@@ -2885,22 +2753,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/router@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.0.tgz#17a22b0eb5f07c3eb3aa6c6d931e71f58f338c0c"
-  integrity sha512-H3VhLLwUgbC/xNrwculVrr2QMh7+HOgtbmI4Oxmi7SdMBwBxUW5bAkWP0pJ3+ZeZI1aKxph85Z752uPQ3vkaTQ==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/client-logger" "6.2.0"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/router@6.2.1":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.1.tgz#45a40a13c0cbae54ac4034e3d461d0e9a3f80bcb"
@@ -2960,24 +2812,6 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/theming@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.0.tgz#03b892de0d2478add91ecc7c56d47ce0d42059fc"
-  integrity sha512-BAIfPdUahWLhwwebeYcxziCTQMg/bEgKTO1Rp2MqFVvvHR+bx74cjte4oXiyH1+RVBMmwoKERsvYVrj06XEPAA==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.2.0"
-    core-js "^3.8.2"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.27"
-    global "^4.4.0"
-    memoizerific "^1.11.3"
-    polished "^4.0.5"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/theming@6.2.1":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.1.tgz#ad0ebc0a22560b775eca691b5e72c9db235eaf07"

From 04cf886eafb648270c439b14cc6e5ae0eb491d2e Mon Sep 17 00:00:00 2001
From: Nathaniel Palmer <nathanielpalmer@me.com>
Date: Wed, 31 Mar 2021 10:49:11 -0400
Subject: [PATCH 114/288] Main menu a11y (#2997)

* set focus on first link when opening main menu submenu

* bind aria-expanded to submenu visibility

* Navigate main menu submenu items via arrow keys

* Close main menu submenu on losing focus

* Remove focused link styling when main-menu hovered

* reference main-menu submenus by id instead of label

* clean up code and add comments

* re-enable fast main-menu submenu changing via click

* Revert "Remove focused link styling when main-menu hovered"

This reverts commit 361d92b663cf42cf3662e56f704aa36ccb6e6dcf.

* focus main-menu submenu item on hover
---
 client/src/ui/molecules/main-menu/index.scss |   1 +
 client/src/ui/molecules/main-menu/index.tsx  | 133 ++++++++++++++++---
 2 files changed, 112 insertions(+), 22 deletions(-)

diff --git a/client/src/ui/molecules/main-menu/index.scss b/client/src/ui/molecules/main-menu/index.scss
index 1646a39d2455..34a7ad80c2bd 100644
--- a/client/src/ui/molecules/main-menu/index.scss
+++ b/client/src/ui/molecules/main-menu/index.scss
@@ -63,6 +63,7 @@ ul.main-menu {
         background-color: $dropdown-item-background-color;
         color: #fff;
         text-decoration: none;
+        outline: none;
       }
 
       @media #{$mq-tablet-and-up} {
diff --git a/client/src/ui/molecules/main-menu/index.tsx b/client/src/ui/molecules/main-menu/index.tsx
index 66e66a252095..71bd31807294 100644
--- a/client/src/ui/molecules/main-menu/index.tsx
+++ b/client/src/ui/molecules/main-menu/index.tsx
@@ -14,7 +14,14 @@ export default function MainMenu({
   const locale = useLocale();
   const previousActiveElement = useRef<null | HTMLButtonElement>(null);
   const mainMenuRef = useRef<null | HTMLUListElement>(null);
-  const [visibleSubMenu, setVisibleSubMenu] = useState<string | null>(null);
+  const [visibleSubMenuId, setVisibleSubMenuId] = useState<string | null>(null);
+  const [
+    focusedSubmenuItemIndex,
+    setFocusedSubmenuItemIndex,
+  ] = useState<number>(-1);
+  const [submenuCollapsedOnBlurId, setSubmenuCollapsedOnBlurId] = useState<
+    string | null
+  >(null);
   const ga = useGA();
 
   /**
@@ -44,8 +51,8 @@ export default function MainMenu({
   }
 
   function hideSubMenuIfVisible() {
-    if (visibleSubMenu) {
-      setVisibleSubMenu(null);
+    if (visibleSubMenuId) {
+      setVisibleSubMenuId(null);
     }
   }
 
@@ -53,17 +60,77 @@ export default function MainMenu({
    * Show and hide submenus in the main menu, send GA events and updates
    * the ARIA state.
    * @param {Object} event - onClick event triggered on top-level menu item
-   * @param {String} menuLabel - The current top-level menu item label
+   * @param {String} id - The current top-level menu item id
    */
-  function toggleSubMenu(event, menuLabel) {
-    const expandedState = visibleSubMenu === menuLabel ? false : true;
+  function toggleSubMenu(event, id) {
+    const expandedState = visibleSubMenuId === id ? false : true;
 
     // store the current activeElement
-    previousActiveElement.current = event.target;
-    event.target.setAttribute("aria-expanded", expandedState);
+    previousActiveElement.current = document.activeElement as HTMLButtonElement;
 
-    setVisibleSubMenu(visibleSubMenu === menuLabel ? null : menuLabel);
+    setVisibleSubMenuId(visibleSubMenuId === id ? null : id);
     sendMenuItemInteraction(event);
+
+    if (expandedState) {
+      setFocusedSubmenuItemIndex(0);
+    }
+  }
+
+  function onMenuButtonFocus(event: React.FocusEvent<HTMLButtonElement>) {
+    setFocusedSubmenuItemIndex(-1);
+    sendMenuItemInteraction(event);
+  }
+
+  /**
+   * Handle arrow keydown events on submenu to change focused item.
+   * @param {Object} event - keydown event triggered on submenu
+   * @param {String} id - submenu id
+   * @param {Number} itemCount - number of items in submenu
+   */
+  function onSubmenuKeydown(
+    event: React.KeyboardEvent,
+    id: string,
+    itemCount: number
+  ) {
+    if (event.key === "ArrowDown" || event.key === "ArrowUp") {
+      // prevent page scrolling
+      event.preventDefault();
+
+      // open submenu if closed
+      if (focusedSubmenuItemIndex === -1) {
+        previousActiveElement.current = event.target as HTMLButtonElement;
+        setVisibleSubMenuId(id);
+      }
+
+      switch (event.key) {
+        case "ArrowDown":
+          // focus below item and jump to top item if bottom item focused
+          setFocusedSubmenuItemIndex((focusedSubmenuItemIndex + 1) % itemCount);
+          break;
+        case "ArrowUp":
+          if (focusedSubmenuItemIndex <= 0) {
+            // jump to bottom item if top item focused
+            setFocusedSubmenuItemIndex(itemCount - 1);
+          } else {
+            setFocusedSubmenuItemIndex(focusedSubmenuItemIndex - 1);
+          }
+      }
+    }
+  }
+
+  /**
+   * Close submenu if focus leaves submenu due to tabbing or clicking outside
+   */
+  function onSubmenuItemBlur(submenuId: string, itemIndex: number) {
+    if (itemIndex === focusedSubmenuItemIndex) {
+      // prevent submenu from immediately re-opening if blur caused by clicking menu button
+      setSubmenuCollapsedOnBlurId(submenuId);
+      setTimeout(() => {
+        setSubmenuCollapsedOnBlurId(null);
+      }, 250);
+
+      hideSubMenuIfVisible();
+    }
   }
 
   useEffect(() => {
@@ -78,6 +145,11 @@ export default function MainMenu({
       mainMenu.classList.remove("nojs");
     }
 
+    const focusableSubmenuItemSelector = 'ul.show a[tabindex="0"]';
+    mainMenu
+      ?.querySelector<HTMLAnchorElement>(focusableSubmenuItemSelector)
+      ?.focus();
+
     document.addEventListener("keyup", (event) => {
       if (event.key === "Escape") {
         hideSubMenuIfVisible();
@@ -92,7 +164,7 @@ export default function MainMenu({
   const menus = [
     {
       label: "Technologies",
-      labelId: "technologies",
+      id: "technologies",
       items: [
         {
           url: `/${locale}/docs/Web`,
@@ -134,7 +206,7 @@ export default function MainMenu({
     },
     {
       label: "References & Guides",
-      labelId: "references-guides",
+      id: "references-guides",
       items: [
         {
           url: `/${locale}/docs/Learn`,
@@ -168,7 +240,7 @@ export default function MainMenu({
     },
     {
       label: "Feedback",
-      labelId: "feedback",
+      id: "feedback",
       items: [
         {
           url: `/${locale}/docs/MDN/Contribute/Feedback`,
@@ -206,31 +278,47 @@ export default function MainMenu({
     <nav className="main-nav" aria-label="Main menu">
       <ul className="main-menu nojs" ref={mainMenuRef}>
         {menus.map((menuEntry) => (
-          <li key={menuEntry.label} className="top-level-entry-container">
+          <li
+            key={menuEntry.id}
+            className="top-level-entry-container"
+            onKeyDown={(event) => {
+              onSubmenuKeydown(event, menuEntry.id, menuEntry.items.length);
+            }}
+          >
             <button
-              id={`${menuEntry.labelId}-button`}
+              id={`${menuEntry.id}-button`}
               type="button"
               className="top-level-entry"
               aria-haspopup="menu"
-              aria-expanded="false"
-              onFocus={sendMenuItemInteraction}
+              aria-expanded={menuEntry.id === visibleSubMenuId}
+              onFocus={onMenuButtonFocus}
               onClick={(event) => {
-                toggleSubMenu(event, menuEntry.label);
+                if (submenuCollapsedOnBlurId !== menuEntry.id) {
+                  // always toggle menu if not clicking button for currently open menu
+                  toggleSubMenu(event, menuEntry.id);
+                }
+                setSubmenuCollapsedOnBlurId(null);
               }}
             >
               {menuEntry.label}
             </button>
             <ul
-              className={`${menuEntry.labelId} ${
-                menuEntry.label === visibleSubMenu ? "show" : ""
+              className={`${menuEntry.id} ${
+                menuEntry.id === visibleSubMenuId ? "show" : ""
               }`}
               role="menu"
-              aria-labelledby={`${menuEntry.labelId}-button`}
+              aria-labelledby={`${menuEntry.id}-button`}
             >
-              {menuEntry.items.map((item) => (
-                <li key={item.url} role="none">
+              {menuEntry.items.map((item, index) => (
+                <li
+                  key={item.url}
+                  role="none"
+                  onBlur={() => onSubmenuItemBlur(menuEntry.id, index)}
+                  onMouseOver={() => setFocusedSubmenuItemIndex(index)}
+                >
                   {item.external ? (
                     <a
+                      tabIndex={index === focusedSubmenuItemIndex ? 0 : -1}
                       target="_blank"
                       rel="noopener noreferrer"
                       href={item.url}
@@ -246,6 +334,7 @@ export default function MainMenu({
                     </a>
                   ) : (
                     <a
+                      tabIndex={index === focusedSubmenuItemIndex ? 0 : -1}
                       href={item.url}
                       onClick={(event) => {
                         item.onClick

From f8d48cef15dc7734c56eac2f16e04fb1f272c32a Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Wed, 31 Mar 2021 11:21:14 -0400
Subject: [PATCH 115/288] don't fetch /api/v1/settings till you're
 authenticated (#3392)

Fixes #3378
---
 client/src/settings/app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/settings/app.tsx b/client/src/settings/app.tsx
index 6ed10898f517..969e00bbdf96 100644
--- a/client/src/settings/app.tsx
+++ b/client/src/settings/app.tsx
@@ -51,7 +51,7 @@ export default function SettingsApp({ ...appProps }) {
   const userData = useUserData();
 
   const { data, error } = useSWR<UserSettings | null, Error | null>(
-    userData ? "/api/v1/settings" : null,
+    userData && userData.isAuthenticated ? "/api/v1/settings" : null,
     async (url) => {
       const response = await fetch(url);
       if (!response.ok) {

From 224b747c3fd51d2870993015c9b829408dd4f5eb Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 1 Apr 2021 11:14:18 -0400
Subject: [PATCH 116/288] enable the new sign-in link (#3312)

* enable the new sign-in link

Fixes #2449

* fix tests
---
 .github/workflows/stage-build.yml         |  7 -----
 client/src/ui/atoms/signin-link/index.tsx | 38 ++++++++---------------
 testing/scripts/functional-test.sh        |  3 --
 testing/tests/headless.test.js            |  6 +++-
 4 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
index d533ca7c3c26..ef5fe64217ec 100644
--- a/.github/workflows/stage-build.yml
+++ b/.github/workflows/stage-build.yml
@@ -168,13 +168,6 @@ jobs:
           # kind of document it is.
           BUILD_ALWAYS_NO_ROBOTS: true
 
-          # (peterbe, Mar 2021) This is unique to Stage and temporary. We want to
-          # test the new Yari-based sign-in and sign-up. Setting this environment
-          # variable changes the behavior of the "Sign in" link in the top navbar.
-          # Once we know for sure that this new Yari sign in/up is working in Stage
-          # we'll make this the new default can we can remove these lines.
-          REACT_APP_USE_YARI_SIGNIN: true
-
         run: |
           if [ ${{ env.BUILD_ARCHIVED_CONTENT }} == "true" ]; then
             echo "Will build mdn/archived-content too"
diff --git a/client/src/ui/atoms/signin-link/index.tsx b/client/src/ui/atoms/signin-link/index.tsx
index f8b0b772e946..e2bb7e98426b 100644
--- a/client/src/ui/atoms/signin-link/index.tsx
+++ b/client/src/ui/atoms/signin-link/index.tsx
@@ -1,36 +1,24 @@
-import React from "react";
 import { Link, useLocation } from "react-router-dom";
 
 import { useLocale } from "../../../hooks";
-import { getAuthURL } from "../../../utils/auth-link";
 
 export default function SignInLink({ className }: { className?: string }) {
   const locale = useLocale();
   const { pathname } = useLocation();
+  const sp = new URLSearchParams();
+  // If pathname === '/en-US/sigin', i.e. you're already on the sign in page
+  // itself, then discard that as a 'next' parameter.
+  // Otherwise, you might get redirected back to the sign in page after you've
+  // successfully signed in.
+  sp.set("next", pathname === `/${locale}/signin` ? `/${locale}/` : pathname);
 
-  // NOTE! We can remove this if-statement and make it the default once
-  // https://github.com/mdn/yari/issues/2449 is resolved and it has been
-  // fully tested in Stage.
-  if (process.env.REACT_APP_USE_YARI_SIGNIN) {
-    return (
-      <Link
-        to={`/${locale}/signin?next=${pathname}`}
-        rel="nofollow"
-        className={className ? className : undefined}
-      >
-        Sign in
-      </Link>
-    );
-  }
   return (
-    <>
-      <a
-        href={getAuthURL(`/${locale}/users/account/signup-landing`)}
-        rel="nofollow"
-        className={className ? className : undefined}
-      >
-        Sign in
-      </a>
-    </>
+    <Link
+      to={`/${locale}/signin?${sp.toString()}`}
+      rel="nofollow"
+      className={className ? className : undefined}
+    >
+      Sign in
+    </Link>
   );
 }
diff --git a/testing/scripts/functional-test.sh b/testing/scripts/functional-test.sh
index 3dbb373d5dd7..a2fe15f632cf 100755
--- a/testing/scripts/functional-test.sh
+++ b/testing/scripts/functional-test.sh
@@ -6,9 +6,6 @@ export ENV_FILE=testing/.env
 # Temporary whilst only the functional tests use the autocomplete search widget.
 export REACT_APP_AUTOCOMPLETE_SEARCH_WIDGET=true
 
-# Temporary until we're still using the old Kuma for signin in.
-export REACT_APP_USE_YARI_SIGNIN=true
-
 yarn prepare-build
 yarn build
 
diff --git a/testing/tests/headless.test.js b/testing/tests/headless.test.js
index 4280dcf54e7d..734a053a7281 100644
--- a/testing/tests/headless.test.js
+++ b/testing/tests/headless.test.js
@@ -260,7 +260,11 @@ describe("Basic viewing of functional pages", () => {
     await expect(page).toClick("a", { text: "Sign in" });
     await expect(page).toMatchElement("h1", { text: "Sign in" });
     expect(page.url()).toContain(
-      testURL("/en-US/signin?next=/en-US/docs/Web/Foo")
+      testURL(
+        `/en-US/signin?${new URLSearchParams(
+          "next=/en-US/docs/Web/Foo"
+        ).toString()}`
+      )
     );
     await expect(page).toMatchElement("a", { text: "Google" });
     await expect(page).toMatchElement("a", { text: "GitHub" });

From fd7457d11ff95f2648fdbcd75fa9c4183470cb03 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 1 Apr 2021 11:27:53 -0400
Subject: [PATCH 117/288] compat tables to include Node for web APIs (#3412)

Fixes #3410
---
 .../ingredients/browser-compatibility-table/index.tsx  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/client/src/document/ingredients/browser-compatibility-table/index.tsx b/client/src/document/ingredients/browser-compatibility-table/index.tsx
index b39fc10b6415..dba1195a37a9 100644
--- a/client/src/document/ingredients/browser-compatibility-table/index.tsx
+++ b/client/src/document/ingredients/browser-compatibility-table/index.tsx
@@ -35,10 +35,14 @@ const NEW_ISSUE_TEMPLATE = `
 `;
 
 function gatherPlatformsAndBrowsers(
-  category: string
+  category: string,
+  data: bcd.Identifier
 ): [string[], bcd.BrowserNames[]] {
   let platforms = ["desktop", "mobile"];
-  if (category === "javascript") {
+  if (
+    category === "javascript" ||
+    (data.__compat && data.__compat.support.nodejs)
+  ) {
     platforms.push("server");
   } else if (category === "webextensions") {
     platforms = ["webextensions-desktop", "webextensions-mobile"];
@@ -111,7 +115,7 @@ export default function BrowserCompatibilityTable({
   const category = breadcrumbs[0];
   const name = breadcrumbs[breadcrumbs.length - 1];
 
-  const [platforms, browsers] = gatherPlatformsAndBrowsers(category);
+  const [platforms, browsers] = gatherPlatformsAndBrowsers(category, data);
 
   function getNewIssueURL() {
     const url = "https://github.com/mdn/browser-compat-data/issues/new";

From 9a21256994f8a98cfeeb428918e1d396d77eb44e Mon Sep 17 00:00:00 2001
From: Florian Dieminger <me@fiji-flo.de>
Date: Thu, 1 Apr 2021 18:31:43 +0200
Subject: [PATCH 118/288] download popularities from s3 (#3349)

* download popularities from s3

* update docs

* lint

* cap score

* make it a float again
---
 docs/popularities.md | 98 ++++++++++++++++++++++++++++++++++----------
 tool/cli.js          | 32 ++++-----------
 tool/popularities.js | 21 +++++++---
 3 files changed, 100 insertions(+), 51 deletions(-)

diff --git a/docs/popularities.md b/docs/popularities.md
index 18d6941bab67..74d1b86303a0 100644
--- a/docs/popularities.md
+++ b/docs/popularities.md
@@ -1,7 +1,7 @@
 # Popularities
 
-A popular page is one that has lot of pageviews. We get this from Google Analytics.
-Being popular helps search because when a certain search term matches many
+A popular page is one that has lot of pageviews. We get this from our CDN access
+logs. Being popular helps search because when a certain search term matches many
 documents, too many to display all, we need to sort them to try to predict
 which one the user most probably wanted to find.
 
@@ -28,39 +28,93 @@ Where the most popular page is `1`.
 Note that not all documents will have a popularity. So don't expect every known
 URL in the content to appear in the `popularities.json` file.
 
-## How to get the data
+## Where's the data from
 
-To update the `popularities.json` file, you need to generate an "Unsampled Report"
-in Google Analytics.
-In Google Analytics, go to "Behavior" -> "Site content" -> "All pages". Then,
-click on "Export" (upper right-hand corner) and select "Unsampled report" and leave
-all options to default.
-Once you've done that, it takes a while, but you can now go to "Customization"
--> "Unsampled reports" and there, there should be a report called "Pages". On that
-row there's a "Download" column. Click "CSV" to download the `Pages.csv` file.
-Download that file and save anywhere on your computer.
+Popularities are based on our CDN access logs. We use CloudFront for our CDN.
+Access logs are post processed using an
+[AWS Lambda function](https://github.com/aws-samples/amazon-cloudfront-access-logs-queries).
 
-## Run the CLI tool
+Every month these logs are aggregated by another Lambda called
+`popularitiesCron` using AWS Athena:
+
+```python
+import time
+import boto3
+
+from datetime import datetime, timezone, timedelta
+
+last_month = datetime.now(timezone.utc) - timedelta(weeks=1)
 
-Once you have the `Pages.csv` file run:
+month = "{:0>2}".format(last_month.month)
+year = "{}".format(last_month.year)
+
+query = """
+SELECT u AS Page,
+         count(*) AS Pageviews
+FROM
+    (SELECT replace(uri,
+         '/index.json', '') AS u
+    FROM partitioned_parquet
+    WHERE year = '{}'
+            AND month = '{}'
+            AND status = 200
+            AND user_agent LIKE 'Mozilla%'
+            AND uri NOT LIKE '%/_samples_/%'
+            AND (uri LIKE '/%/docs/%'
+            AND sc_content_type = 'text/html;%20charset=utf-8'
+            OR uri LIKE '/%/docs/%/index.json'))
+GROUP BY  u
+ORDER BY  Pageviews DESC
+""".format(year, month)
+
+DATABASE = 'yariprod_cf_access_logs_db'
+output='s3://mdn-popularities-prod/{}/{}/'.format(year, month)
+
+def lambda_handler(event, context):
+    client = boto3.client('athena')
+    response = client.start_query_execution(
+        QueryString=query,
+        QueryExecutionContext={
+            'Database': DATABASE
+        },
+        ResultConfiguration={
+            'OutputLocation': output,
+        }
+    )
+    s3 = boto3.resource('s3')
+    uuid=response["QueryExecutionId"]
+    if uuid:
+        content = (
+          "https://mdn-popularities-prod.s3.amazonaws.com/"
+          "{year}/{month}/{uuid}.csv"
+        ).format(year=year, month=month, uuid=uuid)
+        s3.Object(
+          'mdn-popularities-prod', 'current.txt'
+        ).put(Body=content, ContentType="text/plain; charset=utf-8")
+    return response
+```
+
+This is trigger at via a CloudWatch cron job (`popularities-cron-trigger`) every
+1st of the month.
+
+Output is stored in an S3 bucket named `mdn-popularities-prod`.
+<'s3://mdn-popularities-prod/current.txt> points to the current file.
+
+## Run the CLI tool
 
 ```bash
-yarn tool popularities ~/Downloads/Pages.csv
+yarn tool popularities
 ```
 
-This should now update the file `files/popularities.json` in your `mdn/content`
-repo. It takes the value of the `CONTENT_ROOT` constant.
+This should now download the latest popularities csv and update the file
+`files/popularities.json` in your `mdn/content` repo. It takes the value of the
+`CONTENT_ROOT` constant.
 
 Once you've done this, you need to make a pull request on the new `mdn/content`
 repo.
 
 ## The future
 
-We have talked about automating this. Not only is it very clunky to have to
-use the Google Analytics web app to get the report, it's also only a matter
-of time till it's out of date. And if a new page is introduced, since the last
-time you generated a report, it will be "unfavored" in search.
-
 One idea would be that we instead use Kuma to collect this. Then Yari could
 download it from Kuma right before the build starts. If we do this we would
 fully automate everything and the data would be more up-to-date.
diff --git a/tool/cli.js b/tool/cli.js
index 208f93df92d5..61424eec3ecc 100644
--- a/tool/cli.js
+++ b/tool/cli.js
@@ -634,37 +634,21 @@ program
 
   .command(
     "popularities",
-    "Convert a Google Analytics pageviews CSV into a popularities.json file"
+    "Convert an AWS Athena log aggregation CSV into a popularities.json file"
   )
-  .option(
-    "--outfile <path>",
-    "export from Google Analytics containing pageview counts",
-    {
-      default: path.join(CONTENT_ROOT, "popularities.json"),
-    }
-  )
-  .option(
-    "--max-uris <number>",
-    "export from Google Analytics containing pageview counts",
-    {
-      default: MAX_GOOGLE_ANALYTICS_URIS,
-    }
-  )
-  .argument("csvfile", "Google Analytics pageviews CSV file", {
-    validator: (value) => {
-      if (!fs.existsSync(value)) {
-        throw new Error(`${value} does not exist`);
-      }
-      return value;
-    },
+  .option("--outfile <path>", "output file", {
+    default: path.join(CONTENT_ROOT, "popularities.json"),
+  })
+  .option("--max-uris <number>", "limit to top <number> entries", {
+    default: MAX_GOOGLE_ANALYTICS_URIS,
   })
   .action(
-    tryOrExit(async ({ args, options, logger }) => {
+    tryOrExit(async ({ options, logger }) => {
       const {
         rowCount,
         popularities,
         pageviews,
-      } = await runMakePopularitiesFile(args.csvfile, options);
+      } = await runMakePopularitiesFile(options);
       logger.info(chalk.green(`Parsed ${rowCount.toLocaleString()} rows.`));
 
       const numberKeys = Object.keys(popularities).length;
diff --git a/tool/popularities.js b/tool/popularities.js
index bca18024c40a..ede9ee0952c9 100644
--- a/tool/popularities.js
+++ b/tool/popularities.js
@@ -1,7 +1,7 @@
 /**
  * This script exists only to periodically generate a
- * 'content/popularities.json' file from a Google Analytics pageviews CSV
- * export.
+ * 'content/popularities.json' file from a Cloudfront access CSV export.
+ *
  * Generally, only the core MDN Web Docs team needs to run this. The output
  * file gets checked into git so it's easily available to everyone.
  *
@@ -12,14 +12,25 @@
 const fs = require("fs");
 
 const csv = require("@fast-csv/parse");
+const got = require("got");
+
+const CURRENT_URL =
+  "https://mdn-popularities-prod.s3.amazonaws.com/current.txt";
+
+async function fetchPopularities() {
+  let { body: csvURL } = await got(CURRENT_URL);
+  let { body: csv } = await got(csvURL);
+  return csv;
+}
 
-function runMakePopularitiesFile(filepath, options) {
+async function runMakePopularitiesFile(options) {
   const { outfile, maxUris } = options;
   const pageviews = [];
   let biggestCount = null;
+  const raw = await fetchPopularities();
   return new Promise((resolve, reject) => {
     csv
-      .parseFile(filepath, {
+      .parseString(raw, {
         headers: true,
       })
       .on("error", (error) => console.error(error))
@@ -51,7 +62,7 @@ function runMakePopularitiesFile(filepath, options) {
         }
         const popularities = {};
         pageviews.slice(0, maxUris).forEach(([uri, popularity]) => {
-          popularities[uri] = popularity;
+          popularities[uri] = parseFloat(popularity.toFixed(5));
         });
         fs.writeFileSync(outfile, JSON.stringify(popularities, null, 2));
         resolve({ rowCount, popularities, pageviews });

From 2d6eb1468e5ec910622c46514040c647f6259d4d Mon Sep 17 00:00:00 2001
From: Ryan Johnson <rjohnson@mozilla.com>
Date: Thu, 1 Apr 2021 10:45:16 -0700
Subject: [PATCH 119/288] Settings not profiles (#3399)

* remove links to user profile

* redirect profile/account urls to settings

* feedbacked

* remove no-longer-used client/src/utils/auth-link.ts
---
 client/src/ui/molecules/login/index.tsx       | 12 +-------
 client/src/utils/auth-link.ts                 | 23 ---------------
 .../content-origin-request/server.test.js     |  4 +--
 libs/fundamental-redirects/index.js           | 17 +++++++++++
 testing/integration/headless/map_301.py       | 17 +++++++++++
 testing/integration/headless/test_cdn.py      | 13 ++-------
 .../integration/headless/test_endpoints.py    |  6 ++--
 testing/tests/redirects.test.js               | 29 +++++++++++++++++++
 8 files changed, 72 insertions(+), 49 deletions(-)
 delete mode 100644 client/src/utils/auth-link.ts

diff --git a/client/src/ui/molecules/login/index.tsx b/client/src/ui/molecules/login/index.tsx
index 5f40715f8e0f..cfdf6eb3f498 100644
--- a/client/src/ui/molecules/login/index.tsx
+++ b/client/src/ui/molecules/login/index.tsx
@@ -3,7 +3,6 @@ import * as React from "react";
 import Dropdown from "../dropdown";
 import { useLocale } from "../../../hooks";
 import SignInLink from "../../atoms/signin-link";
-import { getAuthURL } from "../../../utils/auth-link";
 import { useUserData } from "../../../user-context";
 
 import { DISABLE_AUTH } from "../../../constants";
@@ -50,12 +49,6 @@ function LoginInner() {
       <span className="avatar-username">{userData.username}</span>
     </>
   );
-  const viewProfileURL = getAuthURL(
-    `/${locale}/profiles/${userData.username}`,
-    false
-  );
-  const editProfileURL = viewProfileURL + "/edit";
-
   // Note that this component is never rendered server-side so it's safe to
   // rely on `window.location`.
   let next = window.location.pathname;
@@ -72,10 +65,7 @@ function LoginInner() {
   return (
     <Dropdown id="user-avatar-menu" label={label} right={true} hideArrow={true}>
       <li>
-        <a href={viewProfileURL}>View profile</a>
-      </li>
-      <li>
-        <a href={editProfileURL}>Edit profile</a>
+        <a href={`/${locale}/settings`}>Account settings</a>
       </li>
       <li>
         <form action={signOutURL} method="post">
diff --git a/client/src/utils/auth-link.ts b/client/src/utils/auth-link.ts
deleted file mode 100644
index f242ce6d0308..000000000000
--- a/client/src/utils/auth-link.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export function getAuthURL(pathname: string, appendNext: boolean = true) {
-  let next = window.location.pathname;
-  let prefix = "";
-
-  // When doing local development with Yari, the link to authenticate in Kuma
-  // needs to be absolute. And we also need to send the absolute URL as the
-  // `next` query string parameter so Kuma sends us back when the user has
-  // authenticated there.
-  if (
-    process.env.NODE_ENV === "development" &&
-    process.env.REACT_APP_KUMA_HOST
-  ) {
-    next = window.location.href;
-    prefix = `http://${process.env.REACT_APP_KUMA_HOST}`;
-  }
-  let url = `${prefix}${pathname}`;
-  if (appendNext) {
-    const sp = new URLSearchParams();
-    sp.set("next", next);
-    url += `?${sp.toString()}`;
-  }
-  return url;
-}
diff --git a/deployer/aws-lambda/content-origin-request/server.test.js b/deployer/aws-lambda/content-origin-request/server.test.js
index a350cf57e481..0f93938438fd 100644
--- a/deployer/aws-lambda/content-origin-request/server.test.js
+++ b/deployer/aws-lambda/content-origin-request/server.test.js
@@ -166,8 +166,8 @@ describe("remove trailing slash before doing an S3 lookup", () => {
 });
 
 describe("legacy kumaesque prefixes should be left alone", () => {
-  it("should not touch trailing slash on /account/", async () => {
-    const r = await get("/account/");
+  it("should not touch trailing slash on /maintenance-mode/", async () => {
+    const r = await get("/maintenance-mode/");
     expect(r.statusCode).toBe(200);
   });
   it("should not touch trailing slash on these /accounts/whatever/", async () => {
diff --git a/libs/fundamental-redirects/index.js b/libs/fundamental-redirects/index.js
index 439273327bdf..5343752b8859 100644
--- a/libs/fundamental-redirects/index.js
+++ b/libs/fundamental-redirects/index.js
@@ -1151,6 +1151,23 @@ for (const [pattern, path] of [
 }
 
 const MISC_REDIRECT_PATTERNS = [
+  localeRedirect(/^account\/?$/i, "/settings", {
+    permanent: false,
+  }),
+  localeRedirect(
+    /^profile(?:|\/stripe_subscription|\/edit)\/?$/i,
+    "/settings",
+    {
+      permanent: false,
+    }
+  ),
+  localeRedirect(
+    /^profiles\/(?:[^\/]+)(?:|\/edit|\/delete)\/?$/i,
+    "/settings",
+    {
+      permanent: false,
+    }
+  ),
   localeRedirect(/^docs\/Core_JavaScript_1.5_/i, "/docs/Web/JavaScript/", {
     permanent: true,
     // This will convert :
diff --git a/testing/integration/headless/map_301.py b/testing/integration/headless/map_301.py
index 1c5abf7ee3d9..d3f96afd2d83 100644
--- a/testing/integration/headless/map_301.py
+++ b/testing/integration/headless/map_301.py
@@ -983,6 +983,23 @@
 )
 
 MISC_REDIRECT_URLS = [
+    url_test("/fr/account", "/fr/settings", status_code=302),
+    url_test("/en-US/account", "/en-US/settings", status_code=302),
+    url_test("/en-US/account/", "/en-US/settings", status_code=302),
+    url_test("/ja/profile", "/ja/settings", status_code=302),
+    url_test("/en-US/profile", "/en-US/settings", status_code=302),
+    url_test("/en-US/profile/", "/en-US/settings", status_code=302),
+    url_test("/en-US/profile/edit", "/en-US/settings", status_code=302),
+    url_test("/en-US/profile/edit/", "/en-US/settings", status_code=302),
+    url_test("/en-US/profile/stripe_subscription", "/en-US/settings", status_code=302),
+    url_test("/en-US/profile/stripe_subscription/", "/en-US/settings", status_code=302),
+    url_test("/zh-CN/profiles/sheppy", "/zh-CN/settings", status_code=302),
+    url_test("/en-US/profiles/sheppy", "/en-US/settings", status_code=302),
+    url_test("/en-US/profiles/sheppy/", "/en-US/settings", status_code=302),
+    url_test("/en-US/profiles/sheppy/edit", "/en-US/settings", status_code=302),
+    url_test("/en-US/profiles/sheppy/edit/", "/en-US/settings", status_code=302),
+    url_test("/en-US/profiles/sheppy/delete", "/en-US/settings", status_code=302),
+    url_test("/en-US/profiles/sheppy/delete/", "/en-US/settings", status_code=302),
     url_test("/en-US/DOM", "/en-US/docs/DOM"),
     url_test("/en-US/DOM/", "/en-US/docs/DOM"),
     url_test(
diff --git a/testing/integration/headless/test_cdn.py b/testing/integration/headless/test_cdn.py
index 06bee9beec29..57ee5d25e541 100644
--- a/testing/integration/headless/test_cdn.py
+++ b/testing/integration/headless/test_cdn.py
@@ -140,15 +140,6 @@ def assert_cached(
         ("/readiness", 204, None),
         ("/api/v1/whoami", 200, None),
         ("/csp-violation-capture", 405, None),
-        ("/en-US/profile", 302, "/en-US/users/signin?next=/en-US/profile"),
-        ("/en-US/profile/edit", 302, "/en-US/users/signin?next=/en-US/profile/edit"),
-        ("/en-US/profiles/sheppy", 200, None),
-        ("/en-US/profiles/sheppy/edit", 403, None),
-        (
-            "/en-US/profiles/sheppy/delete",
-            302,
-            "/en-US/users/signin?next=/en-US/profiles/sheppy/delete",
-        ),
         ("/en-US/users/signin", 200, None),
         ("/en-US/users/signup", 200, None),
         ("/en-US/users/signout", 302, "/"),
@@ -202,7 +193,9 @@ def test_not_cached(base_url, is_behind_cdn, slug, status, expected_location):
         ("/sitemaps/en-US/sitemap.xml.gz", 200, None),
         ("/diagrams/workflow/workflow.svg", 200, None),
         ("/presentations/microsummaries/index.html", 200, None),
-        ("/en-US/account/", 200, None),
+        ("/en-US/signup", 200, None),
+        ("/en-US/signin", 200, None),
+        ("/en-US/settings", 200, None),
         ("/en-US/search/xml", 200, None),
         ("/en-US/search.json?q=yada", 301, "/api/v1/search?q=yada"),
         ("/en-US/search?q=css", 200, None),
diff --git a/testing/integration/headless/test_endpoints.py b/testing/integration/headless/test_endpoints.py
index 1df4031a898e..32b4f45ea21f 100644
--- a/testing/integration/headless/test_endpoints.py
+++ b/testing/integration/headless/test_endpoints.py
@@ -133,10 +133,10 @@ def test_api_basic(base_url, uri, expected_keys):
         "/search?q=video",
         "/search/?q=video",
         "/events",
-        "/profile",
-        "/profiles/sheppy",
+        "/signup",
+        "/signin",
+        "/settings",
         "/users/signin",
-        "/account",
     ],
 )
 def test_locale_selection(base_url, slug, expected, cookie, accept):
diff --git a/testing/tests/redirects.test.js b/testing/tests/redirects.test.js
index 19f618cd35d5..e0086dc78ce0 100644
--- a/testing/tests/redirects.test.js
+++ b/testing/tests/redirects.test.js
@@ -1003,6 +1003,35 @@ const LOCALE_ALIAS_URLS = [].concat(
 );
 
 const MISC_REDIRECT_URLS = [].concat(
+  url_test("/fr/account", "/fr/settings", { statusCode: 302 }),
+  url_test("/en-US/account", "/en-US/settings", { statusCode: 302 }),
+  url_test("/en-US/account/", "/en-US/settings", { statusCode: 302 }),
+  url_test("/ja/profile", "/ja/settings", { statusCode: 302 }),
+  url_test("/en-US/profile", "/en-US/settings", { statusCode: 302 }),
+  url_test("/en-US/profile/", "/en-US/settings", { statusCode: 302 }),
+  url_test("/en-US/profile/edit", "/en-US/settings", { statusCode: 302 }),
+  url_test("/en-US/profile/edit/", "/en-US/settings", { statusCode: 302 }),
+  url_test("/en-US/profile/stripe_subscription", "/en-US/settings", {
+    statusCode: 302,
+  }),
+  url_test("/en-US/profile/stripe_subscription/", "/en-US/settings", {
+    statusCode: 302,
+  }),
+  url_test("/zh-CN/profiles/sheppy", "/zh-CN/settings", { statusCode: 302 }),
+  url_test("/en-US/profiles/sheppy", "/en-US/settings", { statusCode: 302 }),
+  url_test("/en-US/profiles/sheppy/", "/en-US/settings", { statusCode: 302 }),
+  url_test("/en-US/profiles/sheppy/edit", "/en-US/settings", {
+    statusCode: 302,
+  }),
+  url_test("/en-US/profiles/sheppy/edit/", "/en-US/settings", {
+    statusCode: 302,
+  }),
+  url_test("/en-US/profiles/sheppy/delete", "/en-US/settings", {
+    statusCode: 302,
+  }),
+  url_test("/en-US/profiles/sheppy/delete/", "/en-US/settings", {
+    statusCode: 302,
+  }),
   url_test("/en-US/DOM", "/en-US/docs/DOM"),
   url_test("/en-US/DOM/", "/en-US/docs/DOM"),
   url_test(

From a27bddcdfc5581c71aea6027ddedeff41bc27155 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 1 Apr 2021 16:14:03 -0400
Subject: [PATCH 120/288] make it easier to debug site-search (#3411)

---
 client/src/constants.ts                   | 5 -----
 client/src/site-search/search-results.tsx | 4 ++--
 docs/debugging-sitesearch.md              | 7 +++----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/client/src/constants.ts b/client/src/constants.ts
index 9aa482d821c7..8130df29dcb2 100644
--- a/client/src/constants.ts
+++ b/client/src/constants.ts
@@ -15,11 +15,6 @@ export const AUTOCOMPLETE_SEARCH_WIDGET = JSON.parse(
   process.env.REACT_APP_AUTOCOMPLETE_SEARCH_WIDGET || JSON.stringify(CRUD_MODE)
 );
 
-// You can read more about this in `docs/debugging-sitesearch.md`.
-export const DEBUG_SEARCH_RESULTS = JSON.parse(
-  process.env.REACT_APP_DEBUG_SEARCH_RESULTS || "false"
-);
-
 // Remember to keep this in sync with the list inside the Node code.
 // E.g. libs/constants.js
 // Hardcoding the list in both places is most convenient and most performant.
diff --git a/client/src/site-search/search-results.tsx b/client/src/site-search/search-results.tsx
index 70a5c86f3c0d..d6d232ef5194 100644
--- a/client/src/site-search/search-results.tsx
+++ b/client/src/site-search/search-results.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Link, createSearchParams, useSearchParams } from "react-router-dom";
 import useSWR from "swr";
 
-import { CRUD_MODE, DEBUG_SEARCH_RESULTS } from "../constants";
+import { CRUD_MODE } from "../constants";
 import { useLocale } from "../hooks";
 import { appendURL } from "./utils";
 
@@ -367,7 +367,7 @@ function Results({
                   <span className="summary">{document.summary}</span>
                 )}
               </p>
-              {DEBUG_SEARCH_RESULTS && (
+              {searchParams.get("debug") !== null && (
                 <span className="nerd-data">
                   <b>score:</b> <code>{document.score}</code>,{" "}
                   <b>popularity:</b> <code>{document.popularity}</code>,{" "}
diff --git a/docs/debugging-sitesearch.md b/docs/debugging-sitesearch.md
index c8c754b0cdad..bc4cc0dfc8b0 100644
--- a/docs/debugging-sitesearch.md
+++ b/docs/debugging-sitesearch.md
@@ -13,11 +13,10 @@ displaying it in Yari is optional.
 
 ## How to enable it
 
-To display each search results `score` and `popularity`, set this in your `.env`:
+To display each search results `score` and `popularity`, simply add `&debug`
+to the current URL. E.g. `?q=foreach&debug` or `?debug=1&q=foreach`.
 
-    REACT_APP_DEBUG_SEARCH_RESULTS=true
-
-Now, when you open <http://localhost:3000/en-US/search?q=test> the `score`
+Now, when you open <http://localhost:3000/en-US/search?q=test&debug> the `score`
 and `popularity` is shown.
 
 ## How to use it

From 9daaec32eddd5005b5e628c3481f94637b1dd0b3 Mon Sep 17 00:00:00 2001
From: Florian Dieminger <me@fiji-flo.de>
Date: Thu, 1 Apr 2021 22:27:24 +0200
Subject: [PATCH 121/288] markdown next steps (#3331)

* markdown next steps

* use custom handlers for code blocks
* use custom div handler (h2m)
* initial html -> md conversion support

* lints

* move wrapText

* fix require

* fix/add tests

* comments and fixes

* sync not async

* fix validator
---
 content/markdown-converter.js                 |  28 ----
 content/rehype-codeblocks.js                  |  40 -----
 kumascript/index.js                           |   4 +-
 kumascript/src/info.js                        |   4 +-
 markdown/cli.js                               |  71 +++++++++
 markdown/h2m/handlers/div.js                  |  24 +++
 markdown/h2m/handlers/index.js                |   7 +
 markdown/h2m/handlers/pre.js                  |  47 ++++++
 markdown/h2m/index.js                         |  39 +++++
 markdown/h2m/utils/children.js                |  53 +++++++
 markdown/index.js                             |   9 ++
 markdown/m2h/handlers/code.js                 |  32 ++++
 markdown/m2h/handlers/index.js                |   5 +
 markdown/m2h/index.js                         |  43 +++++
 markdown/utils/index.js                       |  55 +++++++
 package.json                                  |  23 ++-
 testing/content/files/en-us/markdown/index.md |   8 +
 testing/tests/index.test.js                   |  11 +-
 yarn.lock                                     | 149 ++++++++++++++++--
 19 files changed, 556 insertions(+), 96 deletions(-)
 delete mode 100644 content/markdown-converter.js
 delete mode 100644 content/rehype-codeblocks.js
 create mode 100644 markdown/cli.js
 create mode 100644 markdown/h2m/handlers/div.js
 create mode 100644 markdown/h2m/handlers/index.js
 create mode 100644 markdown/h2m/handlers/pre.js
 create mode 100644 markdown/h2m/index.js
 create mode 100644 markdown/h2m/utils/children.js
 create mode 100644 markdown/index.js
 create mode 100644 markdown/m2h/handlers/code.js
 create mode 100644 markdown/m2h/handlers/index.js
 create mode 100644 markdown/m2h/index.js
 create mode 100644 markdown/utils/index.js

diff --git a/content/markdown-converter.js b/content/markdown-converter.js
deleted file mode 100644
index 4cef1b43870b..000000000000
--- a/content/markdown-converter.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const unified = require("unified");
-const parse = require("remark-parse");
-const gfm = require("remark-gfm");
-const stringify = require("rehype-stringify");
-const remark2rehype = require("remark-rehype");
-const raw = require("rehype-raw");
-
-const rehypeCodeBlocks = require("./rehype-codeblocks");
-
-/**
- * Converts Markdown -> HTML using unified.
- * Using `raw` enables us to process HTML embedded in the Markdown.
- */
-function markdownToHTML(md) {
-  return unified()
-    .use(parse)
-    .use(remark2rehype, { allowDangerousHtml: true })
-    .use(rehypeCodeBlocks)
-    .use(raw)
-    .use(gfm)
-    .use(stringify)
-    .processSync(md)
-    .toString();
-}
-
-module.exports = {
-  markdownToHTML,
-};
diff --git a/content/rehype-codeblocks.js b/content/rehype-codeblocks.js
deleted file mode 100644
index d446222800c4..000000000000
--- a/content/rehype-codeblocks.js
+++ /dev/null
@@ -1,40 +0,0 @@
-const visit = require("unist-util-visit");
-
-module.exports = () => {
-  function visitor(node, index, parent) {
-    if (!parent || parent.tagName !== "pre" || node.tagName !== "code") {
-      return;
-    }
-    // When you use the triple-backtick and a language, like...
-    //
-    //    ```css
-    //    ...
-    //
-    // What you get is:
-    //
-    //    <pre><code class="language-css">...
-    //
-    // Let's now convert that to:
-    //
-    //    <pre class="brush: css">
-    //
-    // The reason for doing this is entirely to pretend that nothing has changed.
-    // This way, the Markdown gets converted to HTML in the way Yari can process
-    // all other existing HTML.
-
-    const classNames = node.properties.className || [];
-    for (const className of classNames) {
-      if (className.startsWith("language-")) {
-        const classNamesBefore = parent.properties.className || [];
-        parent.properties.className = [
-          `brush: ${className.replace("language-", "").toLowerCase()}`,
-          ...classNamesBefore,
-        ];
-      }
-    }
-  }
-
-  return (tree) => {
-    visit(tree, "element", visitor);
-  };
-};
diff --git a/kumascript/index.js b/kumascript/index.js
index 32b6201681f9..40f2f04dd9fa 100644
--- a/kumascript/index.js
+++ b/kumascript/index.js
@@ -1,7 +1,7 @@
 const LRU = require("lru-cache");
 
 const { Document } = require("../content");
-const { markdownToHTML } = require("../content/markdown-converter");
+const { m2h } = require("../markdown");
 
 const {
   INTERACTIVE_EXAMPLES_BASE_URL,
@@ -52,7 +52,7 @@ const renderFromURL = async (
     );
   }
   const { rawBody, metadata, fileInfo, isMarkdown } = document;
-  const rawHTML = isMarkdown ? markdownToHTML(rawBody) : rawBody;
+  const rawHTML = isMarkdown ? await m2h(rawBody) : rawBody;
   const [renderedHtml, errors] = await renderMacros(
     rawHTML,
     {
diff --git a/kumascript/src/info.js b/kumascript/src/info.js
index dd406cd7185a..8cce918c8660 100644
--- a/kumascript/src/info.js
+++ b/kumascript/src/info.js
@@ -2,7 +2,7 @@ const cheerio = require("cheerio");
 
 const Parser = require("./parser.js");
 const { VALID_LOCALES, Document, Redirect } = require("../../content");
-const { markdownToHTML } = require("../../content/markdown-converter");
+const { m2hSync } = require("../../markdown");
 
 const DUMMY_BASE_URL = "https://example.com";
 
@@ -219,7 +219,7 @@ const info = {
         let $ = null;
         let summary = "";
         try {
-          $ = cheerio.load(isMarkdown ? markdownToHTML(rawBody) : rawBody);
+          $ = cheerio.load(isMarkdown ? m2hSync(rawBody) : rawBody);
           $("span.seoSummary, .summary").each((i, element) => {
             if (!summary) {
               const html = $(element)
diff --git a/markdown/cli.js b/markdown/cli.js
new file mode 100644
index 000000000000..d89e010a5902
--- /dev/null
+++ b/markdown/cli.js
@@ -0,0 +1,71 @@
+const fs = require("fs");
+
+const fm = require("front-matter");
+const program = require("@caporal/core").default;
+const chalk = require("chalk");
+
+const { h2m, m2h, withFm } = require(".");
+
+function tryOrExit(f) {
+  return async ({ options = {}, ...args }) => {
+    try {
+      await f({ options, ...args });
+    } catch (error) {
+      if (options.verbose || options.v) {
+        console.error(chalk.red(error.stack));
+      }
+      throw error;
+    }
+  };
+}
+
+program
+  .bin("yarn md")
+  .name("md")
+  .version("0.0.1")
+  .disableGlobalOption("--silent")
+  .cast(false)
+
+  .command("h2m", "Convert HTML to Markdown")
+  .argument("<htmlFile>", "input HTML file", {
+    validator: (f) => {
+      if (!fs.existsSync(f)) {
+        throw new Error(`${f} does not exist`);
+      }
+      return f;
+    },
+  })
+  .argument("[mdFile]", "output Markdown file")
+  .action(
+    tryOrExit(async ({ args }) => {
+      const { htmlFile } = args;
+      const mdFile = args.mdFile || htmlFile.replace(/\.html$/, ".md");
+      const raw = fs.readFileSync(htmlFile, { encoding: "utf-8" });
+      const { body: h, frontmatter } = fm(raw);
+      const m = await h2m(h);
+      fs.writeFileSync(mdFile, withFm(frontmatter, m));
+    })
+  )
+
+  .command("m2h", "Convert Markdown to HTML")
+  .argument("<mdFile>", "input Markdown file", {
+    validator: (f) => {
+      if (!fs.existsSync(f)) {
+        throw new Error(`${f} does not exist`);
+      }
+      return f;
+    },
+  })
+  .argument("[htmlFile]", "output HTML file")
+  .action(
+    tryOrExit(async ({ args }) => {
+      const { mdFile } = args;
+      const htmlFile = args.htmlFile || mdFile.replace(/\.md$/, ".html");
+      const raw = fs.readFileSync(mdFile, { encoding: "utf-8" });
+      const { body: m, frontmatter } = fm(raw);
+      const h = await m2h(m);
+      fs.writeFileSync(htmlFile, withFm(frontmatter, h));
+    })
+  );
+
+program.run();
diff --git a/markdown/h2m/handlers/div.js b/markdown/h2m/handlers/div.js
new file mode 100644
index 000000000000..fae9413a9138
--- /dev/null
+++ b/markdown/h2m/handlers/div.js
@@ -0,0 +1,24 @@
+const toHtml = require("hast-util-to-html");
+const { all } = require("../utils/children");
+
+/**
+ * Keeping a <div> as raw HTML with all attributes.
+ *
+ * ```css hidden
+ * ...
+ * ```
+ * becomes
+ * <pre class="brush: css hidden">...</pre>
+ */
+function div(h, node) {
+  if (!node.children) {
+    return h(node, "html", toHtml(node));
+  }
+  return [
+    h(node, "html", toHtml({ ...node, children: null }, { voids: ["div"] })),
+    ...all(h, node),
+    h(node, "html", "</div>"),
+  ];
+}
+
+module.exports = div;
diff --git a/markdown/h2m/handlers/index.js b/markdown/h2m/handlers/index.js
new file mode 100644
index 000000000000..96ca7628e91d
--- /dev/null
+++ b/markdown/h2m/handlers/index.js
@@ -0,0 +1,7 @@
+const pre = require("./pre");
+const div = require("./div");
+
+module.exports = {
+  pre,
+  div,
+};
diff --git a/markdown/h2m/handlers/pre.js b/markdown/h2m/handlers/pre.js
new file mode 100644
index 000000000000..2ec79155fda5
--- /dev/null
+++ b/markdown/h2m/handlers/pre.js
@@ -0,0 +1,47 @@
+const convert = require("hast-util-is-element/convert");
+const toText = require("hast-util-to-text");
+
+const { wrapText, trimTrailingNewLines } = require("../../utils");
+
+const isPre = convert("pre");
+
+/**
+ * Converting a <pre> tag into a markdown code block.
+ * We transform the class name into highlight tags.
+ *
+ * <pre class="brush: css hidden">...</pre>
+ * becomes
+ * ```css hidden
+ * ...
+ * ```
+ */
+function pre(h, node) {
+  let lang;
+  let meta;
+
+  if (isPre(node)) {
+    const metaList = [];
+    const classList = node.properties.className;
+    if (classList) {
+      const brush = classList.findIndex((e) => e === "brush:");
+
+      if (brush > -1 && classList.length > brush + 1) {
+        lang = classList[brush + 1];
+        metaList.push(...classList.slice(0, brush));
+        metaList.push(...classList.slice(brush + 2));
+      } else {
+        metaList.push(...classList);
+      }
+    }
+    meta = metaList.join(" ");
+  }
+
+  return h(
+    node,
+    "code",
+    { lang: lang || null, meta: meta || null },
+    trimTrailingNewLines(wrapText(h, toText(node)))
+  );
+}
+
+module.exports = pre;
diff --git a/markdown/h2m/index.js b/markdown/h2m/index.js
new file mode 100644
index 000000000000..e370f235537f
--- /dev/null
+++ b/markdown/h2m/index.js
@@ -0,0 +1,39 @@
+const unified = require("unified");
+const parse = require("rehype-parse");
+const rehype2remark = require("rehype-remark");
+const stringify = require("remark-stringify");
+const gfm = require("remark-gfm");
+
+const handlers = require("./handlers");
+const { decodeKS, encodeKS } = require("../utils");
+
+function makeProcessor() {
+  const processor = unified()
+    .use(parse)
+    .use(rehype2remark, { handlers })
+    .use(gfm)
+    .use(stringify, { fences: true, allowDangerousHtml: true });
+
+  return processor;
+}
+
+async function h2m(html) {
+  const ksEncoded = encodeKS(html);
+  const processor = makeProcessor();
+
+  const file = await processor.process(ksEncoded);
+  return decodeKS(String(file));
+}
+
+function h2mSync(html) {
+  const ksEncoded = encodeKS(html);
+  const processor = makeProcessor();
+
+  const file = processor.processSync(ksEncoded);
+  return decodeKS(String(file));
+}
+
+module.exports = {
+  h2m,
+  h2mSync,
+};
diff --git a/markdown/h2m/utils/children.js b/markdown/h2m/utils/children.js
new file mode 100644
index 000000000000..6144a82c8747
--- /dev/null
+++ b/markdown/h2m/utils/children.js
@@ -0,0 +1,53 @@
+const { wrapText } = require("../../utils");
+
+const own = {}.hasOwnProperty;
+
+function hasHandlerFor(h, name) {
+  return own.call(h.handlers, name);
+}
+
+function all(h, parent) {
+  const nodes = parent.children || [];
+  let values = [];
+  let index = -1;
+
+  while (++index < nodes.length) {
+    const result = one(h, nodes[index], parent);
+
+    if (result) {
+      values = values.concat(result);
+    }
+  }
+
+  return values;
+}
+
+function one(h, node, parent) {
+  let fn;
+
+  if (node.type === "element") {
+    if (node.properties && node.properties.dataMdast === "ignore") {
+      return;
+    }
+    if (hasHandlerFor(h, node.tagName)) {
+      fn = h.handlers[node.tagName];
+    }
+  } else if (hasHandlerFor(h, node.type)) {
+    fn = h.handlers[node.type];
+  }
+
+  return (typeof fn === "function" ? fn : unknown)(h, node, parent);
+}
+
+function unknown(h, node) {
+  if (node.value) {
+    return h(node, "text", wrapText(h, node.value));
+  }
+
+  return all(h, node);
+}
+
+module.exports = {
+  all,
+  one,
+};
diff --git a/markdown/index.js b/markdown/index.js
new file mode 100644
index 000000000000..0e2a3e8bb38f
--- /dev/null
+++ b/markdown/index.js
@@ -0,0 +1,9 @@
+const util = require("./utils");
+const h2m = require("./h2m");
+const m2h = require("./m2h");
+
+module.exports = {
+  ...util,
+  ...h2m,
+  ...m2h,
+};
diff --git a/markdown/m2h/handlers/code.js b/markdown/m2h/handlers/code.js
new file mode 100644
index 000000000000..6e8fbfd72fae
--- /dev/null
+++ b/markdown/m2h/handlers/code.js
@@ -0,0 +1,32 @@
+const u = require("unist-builder");
+
+/**
+ * Transform a markdown code block into a <pre>.
+ * Adding the highlight tags as classes prefixed by "brush:"
+ */
+function code(h, node) {
+  var value = node.value ? node.value + "\n" : "";
+  const lang = node.lang;
+  const meta = (node.meta || "").split(" ");
+  const props = {};
+
+  if (lang) {
+    props.className = ["brush:", lang.toLowerCase(), ...meta];
+  } else if (node.meta) {
+    props.className = meta;
+  }
+
+  /*
+   * Prism will inject a <code> element so we don't.
+   * If we wanna change this uncomment the following code:
+   */
+  // const code = h(node, "code", props, [u("text", value)]);
+  // if (node.meta) {
+  //   code.data = { meta: node.meta };
+  // }
+  // return h(node.position, "pre", props, [code]);
+
+  return h(node.position, "pre", props, [u("text", value)]);
+}
+
+module.exports = code;
diff --git a/markdown/m2h/handlers/index.js b/markdown/m2h/handlers/index.js
new file mode 100644
index 000000000000..b1b1fe23aa3f
--- /dev/null
+++ b/markdown/m2h/handlers/index.js
@@ -0,0 +1,5 @@
+const code = require("./code");
+
+module.exports = {
+  code,
+};
diff --git a/markdown/m2h/index.js b/markdown/m2h/index.js
new file mode 100644
index 000000000000..55f3591bac72
--- /dev/null
+++ b/markdown/m2h/index.js
@@ -0,0 +1,43 @@
+const unified = require("unified");
+const parse = require("remark-parse");
+const remark2rehype = require("remark-rehype");
+const stringify = require("rehype-stringify");
+const gfm = require("remark-gfm");
+const raw = require("rehype-raw");
+const format = require("rehype-format");
+
+const handlers = require("./handlers");
+const { decodeKS, encodeKS } = require("../utils");
+
+function makeProcessor() {
+  const processor = unified()
+    .use(parse)
+    .use(gfm)
+    .use(remark2rehype, { handlers, allowDangerousHtml: true })
+    .use(raw, { allowDangerousHtml: true })
+    .use(stringify, { allowDangerousHtml: true })
+    .use(format);
+
+  return processor;
+}
+
+async function m2h(md) {
+  const ksEncoded = encodeKS(md);
+  const processor = makeProcessor();
+
+  const file = await processor.process(ksEncoded);
+  return decodeKS(String(file));
+}
+
+function m2hSync(md) {
+  const ksEncoded = encodeKS(md);
+  const processor = makeProcessor();
+
+  const file = processor.processSync(ksEncoded);
+  return decodeKS(String(file));
+}
+
+module.exports = {
+  m2h,
+  m2hSync,
+};
diff --git a/markdown/utils/index.js b/markdown/utils/index.js
new file mode 100644
index 000000000000..f69ab230fedd
--- /dev/null
+++ b/markdown/utils/index.js
@@ -0,0 +1,55 @@
+const unified = require("unified");
+const parse = require("rehype-parse");
+const format = require("rehype-format");
+const stringify = require("rehype-stringify");
+
+const KS_RE = /{{([^}]*)}}/g;
+
+function encodeKS(raw) {
+  return raw.replace(
+    KS_RE,
+    (_, ks) => `{{${Buffer.from(ks).toString("base64")}}}`
+  );
+}
+
+function decodeKS(raw) {
+  return raw.replace(
+    KS_RE,
+    (_, ks) => `{{${Buffer.from(ks, "base64").toString()}}}`
+  );
+}
+
+function formatH(html) {
+  const ksEncoded = encodeKS(html);
+  const processor = unified()
+    .use(parse, { fragment: true })
+    .use(stringify, { allowDangerousHtml: true })
+    .use(format);
+
+  const file = processor.processSync(ksEncoded);
+  return decodeKS(String(file));
+}
+
+function withFm(frontmatter, content) {
+  if (frontmatter) {
+    return `---\n${frontmatter}\n---\n${content}`;
+  }
+  return content;
+}
+
+function trimTrailingNewLines(value) {
+  return String(value).replace(/\n+$/, "");
+}
+
+function wrapText(h, value) {
+  return h.wrapText ? value : value.replace(/\r?\n|\r/g, " ");
+}
+
+module.exports = {
+  encodeKS,
+  decodeKS,
+  formatH,
+  withFm,
+  trimTrailingNewLines,
+  wrapText,
+};
diff --git a/package.json b/package.json
index df125b2250aa..fce497125e14 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "filecheck": "cd filecheck && node cli.js",
     "fiori:build": "cd client && build-storybook",
     "fiori:start": "cd client && start-storybook -p 6006",
+    "md": "node markdown/cli.js",
     "prepare-build": "yarn build:client && yarn build:ssr && yarn tool google-analytics-code && yarn tool spas && yarn tool gather-git-history",
     "prettier-check": "prettier --check .",
     "prettier-format": "prettier --write .",
@@ -57,10 +58,13 @@
     "express": "4.17.1",
     "fast-xml-parser": "3.19.0",
     "file-type": "16.3.0",
-    "front-matter": "4.0.2",
+    "front-matter": "^4.0.2",
     "fs-extra": "9.1.0",
     "glob": "^7.1.6",
     "got": "11.8.2",
+    "hast-util-is-element": "^1.1.0",
+    "hast-util-to-html": "^7.1.2",
+    "hast-util-to-text": "^2.0.1",
     "http-proxy-middleware": "1.1.0",
     "image-size": "0.9.7",
     "image-type": "4.1.0",
@@ -79,16 +83,21 @@
     "open-editor": "3.0.0",
     "prismjs": "1.23.0",
     "read-chunk": "3.2.0",
-    "rehype-raw": "5.1.0",
-    "rehype-stringify": "8.0.0",
-    "remark-gfm": "1.0.0",
-    "remark-parse": "9.0.0",
-    "remark-rehype": "8.0.0",
+    "rehype-format": "^3.1.0",
+    "rehype-parse": "^7.0.1",
+    "rehype-raw": "^5.1.0",
+    "rehype-remark": "^8.0.0",
+    "rehype-stringify": "^8.0.0",
+    "remark-gfm": "^1.0.0",
+    "remark-parse": "^9.0.0",
+    "remark-rehype": "^8.0.0",
+    "remark-stringify": "^9.0.1",
     "sanitize-filename": "^1.6.3",
     "send": "0.17.1",
     "source-map-support": "0.5.19",
     "tempy": "1.0.1",
-    "unified": "9.2.1",
+    "unified": "^9.2.1",
+    "unist-builder": "^2.0.3",
     "unist-util-visit": "2.0.3"
   },
   "devDependencies": {
diff --git a/testing/content/files/en-us/markdown/index.md b/testing/content/files/en-us/markdown/index.md
index 8c5a3faac17e..d597ba89b20d 100644
--- a/testing/content/files/en-us/markdown/index.md
+++ b/testing/content/files/en-us/markdown/index.md
@@ -63,3 +63,11 @@ div#foo {
   color: pink;
 }
 ```
+
+Do a fancy div:
+
+<div class="fancy">
+
+**I am hidden**
+
+</div>
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 1bbb2592b2ae..5175786c1c20 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -1314,7 +1314,7 @@ test("basic markdown rendering", () => {
   expect($("article h2[id]").length).toBe(2);
   expect($("article h3[id]").length).toBe(3);
   expect($("article p code").length).toBe(2);
-  expect($("article strong").length).toBe(1);
+  expect($("article strong").length).toBe(2);
   expect($("article em").length).toBe(1);
   expect($("article ul li").length).toBe(6);
   expect($('article a[href^="/"]').length).toBe(2);
@@ -1323,12 +1323,11 @@ test("basic markdown rendering", () => {
   expect($("article pre.notranslate").length).toBe(3);
   expect($("article pre.css").hasClass("brush:")).toBe(true);
   expect($("article pre.javascript").hasClass("brush:")).toBe(true);
+  expect($("article .fancy strong").length).toBe(1);
 
-  // XXX This is currently broken! We need to figure out a better way to
-  // transform those ```css into `<pre class="brush: css">...`
-  // const jsonFile = path.join(builtFolder, "index.json");
-  // const { doc } = JSON.parse(fs.readFileSync(jsonFile));
-  // expect(Object.keys(doc.flaws).length).toBe(0);
+  const jsonFile = path.join(builtFolder, "index.json");
+  const { doc } = JSON.parse(fs.readFileSync(jsonFile));
+  expect(Object.keys(doc.flaws).length).toBe(0);
 });
 
 test("unsafe HTML gets flagged as flaws and replace with its raw HTML", () => {
diff --git a/yarn.lock b/yarn.lock
index 56102eea1019..d98a61d4be12 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8645,7 +8645,7 @@ from2@^2.1.0, from2@^2.1.1:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-front-matter@4.0.2:
+front-matter@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-4.0.2.tgz#b14e54dc745cfd7293484f3210d15ea4edd7f4d5"
   integrity sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==
@@ -9395,6 +9395,13 @@ hast-to-hyperscript@^9.0.0:
     unist-util-is "^4.0.0"
     web-namespaces "^1.0.0"
 
+hast-util-embedded@^1.0.0:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/hast-util-embedded/-/hast-util-embedded-1.0.6.tgz#ea7007323351cc43e19e1d6256b7cde66ad1aa03"
+  integrity sha512-JQMW+TJe0UAIXZMjCJ4Wf6ayDV9Yv3PBDPsHD4ExBpAspJ6MOcCX+nzVF+UJVv7OqPcg852WEMSHQPoRA+FVSw==
+  dependencies:
+    hast-util-is-element "^1.1.0"
+
 hast-util-from-parse5@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-6.0.0.tgz#b38793c81e1a99f5fd592a4a88fc2731dccd0f30"
@@ -9407,7 +9414,20 @@ hast-util-from-parse5@^6.0.0:
     vfile "^4.0.0"
     web-namespaces "^1.0.0"
 
-hast-util-is-element@^1.0.0:
+hast-util-has-property@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hast-util-has-property/-/hast-util-has-property-1.0.4.tgz#9f137565fad6082524b382c1e7d7d33ca5059f36"
+  integrity sha512-ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg==
+
+hast-util-is-body-ok-link@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.4.tgz#49ab2fad52ef04fe70adcbc95c9fc3a6358c32be"
+  integrity sha512-mFblNpLvFbD8dG2Nw5dJBYZkxIHeph1JAh5yr4huI7T5m8cV0zaXNiqzKPX/JdjA+tIDF7c33u9cxK132KRjyQ==
+  dependencies:
+    hast-util-has-property "^1.0.0"
+    hast-util-is-element "^1.0.0"
+
+hast-util-is-element@^1.0.0, hast-util-is-element@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz#3b3ed5159a2707c6137b48637fbfe068e175a425"
   integrity sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ==
@@ -9417,6 +9437,16 @@ hast-util-parse-selector@^2.0.0:
   resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz#60c99d0b519e12ab4ed32e58f150ec3f61ed1974"
   integrity sha512-gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA==
 
+hast-util-phrasing@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/hast-util-phrasing/-/hast-util-phrasing-1.0.5.tgz#45fb7d3efc70128b61491f9e3f080a554f138b1d"
+  integrity sha512-P3uxm+8bnwcfAS/XpGie9wMmQXAQqsYhgQQKRwmWH/V6chiq0lmTy8KjQRJmYjusdMtNKGCUksdILSZy1suSpQ==
+  dependencies:
+    hast-util-embedded "^1.0.0"
+    hast-util-has-property "^1.0.0"
+    hast-util-is-body-ok-link "^1.0.0"
+    hast-util-is-element "^1.0.0"
+
 hast-util-raw@6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977"
@@ -9450,7 +9480,7 @@ hast-util-raw@^6.1.0:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
-hast-util-to-html@^7.1.1:
+hast-util-to-html@^7.1.1, hast-util-to-html@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-7.1.2.tgz#db677f0ee483658cea0eecc9dec30aba42b67111"
   integrity sha512-pu73bvORzdF6XZgwl9eID/0RjBb/jtRfoGRRSykpR1+o9rCdiAHpgkSukZsQBRlIqMg6ylAcd7F0F7myJUb09Q==
@@ -9466,6 +9496,24 @@ hast-util-to-html@^7.1.1:
     unist-util-is "^4.0.0"
     xtend "^4.0.0"
 
+hast-util-to-mdast@^7.0.0:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/hast-util-to-mdast/-/hast-util-to-mdast-7.1.3.tgz#e4ad9098929355501773aed5e66c8181559eee04"
+  integrity sha512-3vER9p8B8mCs5b2qzoBiWlC9VnTkFmr8Ufb1eKdcvhVY+nipt52YfMRshk5r9gOE1IZ9/xtlSxebGCv1ig9uKA==
+  dependencies:
+    extend "^3.0.0"
+    hast-util-has-property "^1.0.0"
+    hast-util-is-element "^1.1.0"
+    hast-util-to-text "^2.0.0"
+    mdast-util-phrasing "^2.0.0"
+    mdast-util-to-string "^1.0.0"
+    rehype-minify-whitespace "^4.0.3"
+    repeat-string "^1.6.1"
+    trim-trailing-lines "^1.1.0"
+    unist-util-is "^4.0.0"
+    unist-util-visit "^2.0.0"
+    xtend "^4.0.1"
+
 hast-util-to-parse5@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz#1ec44650b631d72952066cea9b1445df699f8479"
@@ -9477,7 +9525,16 @@ hast-util-to-parse5@^6.0.0:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
-hast-util-whitespace@^1.0.0:
+hast-util-to-text@^2.0.0, hast-util-to-text@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/hast-util-to-text/-/hast-util-to-text-2.0.1.tgz#04f2e065642a0edb08341976084aa217624a0f8b"
+  integrity sha512-8nsgCARfs6VkwH2jJU9b8LNTuR4700na+0h3PqCaEk4MAnMDeu5P0tP8mjk9LLNGxIeQRLbiDbZVw6rku+pYsQ==
+  dependencies:
+    hast-util-is-element "^1.0.0"
+    repeat-string "^1.0.0"
+    unist-util-find-after "^3.0.0"
+
+hast-util-whitespace@^1.0.0, hast-util-whitespace@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz#e4fe77c4a9ae1cb2e6c25e02df0043d0164f6e41"
   integrity sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==
@@ -9669,6 +9726,11 @@ html-webpack-plugin@4.5.0, html-webpack-plugin@^4.2.1:
     tapable "^1.1.3"
     util.promisify "1.0.0"
 
+html-whitespace-sensitive-tag-names@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.3.tgz#60325c5bd331048d14ced6bac419c89d76cc9dd8"
+  integrity sha512-GX1UguduCBEAEo1hjFxc2Bz04/sDq0ACNyT7LsuoDcPfXYI3nS0NRPp3dyazLJyVUMp3GPBB56i/0Zr6CqD2PQ==
+
 htmlparser2@^3.10.0, htmlparser2@^3.3.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
@@ -12286,6 +12348,13 @@ mdast-util-gfm@^0.1.0:
     mdast-util-gfm-task-list-item "^0.1.0"
     mdast-util-to-markdown "^0.6.1"
 
+mdast-util-phrasing@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-phrasing/-/mdast-util-phrasing-2.0.0.tgz#57e61f2be908be9f5fce54fcc2fa593687986267"
+  integrity sha512-G1rNlW/sViwzbBYD7+k3mKGtoWV2v4GBFky66OYHfktHe7Hg9R+hH4xpeoOtjYiwTvle8C8wlKMpgqPCkaeK8Q==
+  dependencies:
+    unist-util-is "^4.0.0"
+
 mdast-util-to-hast@9.1.2:
   version "9.1.2"
   resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-9.1.2.tgz#10fa5ed9d45bf3755891e5801d0f32e2584a9423"
@@ -15734,14 +15803,53 @@ regjsparser@^0.6.4:
   dependencies:
     jsesc "~0.5.0"
 
-rehype-raw@5.1.0:
+rehype-format@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/rehype-format/-/rehype-format-3.1.0.tgz#3ed1214b4b0047cb7817e6b3471f3515caebab26"
+  integrity sha512-XC88CLU83x6ocwHbDsqbK/y+qNxqWcSp7gZdYeJzUZPQH05ABFke3Zb+H53UGsRAUTB2W95/UMMtn/pM+UFiKQ==
+  dependencies:
+    hast-util-embedded "^1.0.0"
+    hast-util-is-element "^1.0.0"
+    hast-util-phrasing "^1.0.0"
+    hast-util-whitespace "^1.0.0"
+    html-whitespace-sensitive-tag-names "^1.0.0"
+    rehype-minify-whitespace "^4.0.0"
+    repeat-string "^1.0.0"
+    unist-util-visit-parents "^3.0.0"
+
+rehype-minify-whitespace@^4.0.0, rehype-minify-whitespace@^4.0.3:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/rehype-minify-whitespace/-/rehype-minify-whitespace-4.0.5.tgz#5b4781786116216f6d5d7ceadf84e2489dd7b3cd"
+  integrity sha512-QC3Z+bZ5wbv+jGYQewpAAYhXhzuH/TVRx7z08rurBmh9AbG8Nu8oJnvs9LWj43Fd/C7UIhXoQ7Wddgt+ThWK5g==
+  dependencies:
+    hast-util-embedded "^1.0.0"
+    hast-util-is-element "^1.0.0"
+    hast-util-whitespace "^1.0.4"
+    unist-util-is "^4.0.0"
+
+rehype-parse@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-7.0.1.tgz#58900f6702b56767814afc2a9efa2d42b1c90c57"
+  integrity sha512-fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw==
+  dependencies:
+    hast-util-from-parse5 "^6.0.0"
+    parse5 "^6.0.0"
+
+rehype-raw@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/rehype-raw/-/rehype-raw-5.1.0.tgz#66d5e8d7188ada2d31bc137bc19a1000cf2c6b7e"
   integrity sha512-MDvHAb/5mUnif2R+0IPCYJU8WjHa9UzGtM/F4AVy5GixPlDZ1z3HacYy4xojDU+uBa+0X/3PIfyQI26/2ljJNA==
   dependencies:
     hast-util-raw "^6.1.0"
 
-rehype-stringify@8.0.0:
+rehype-remark@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/rehype-remark/-/rehype-remark-8.0.0.tgz#66233e5b6e096419353f4c5c0fb6808f7924dd57"
+  integrity sha512-d1EmgsqWc1v9E/URuzozU8pa4AYHIcfOMLhgzQRHeaxYyMHJKIrpBMdRhl+IbqcHLD699Ho/vO+DpSZgKsGM8Q==
+  dependencies:
+    hast-util-to-mdast "^7.0.0"
+
+rehype-stringify@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/rehype-stringify/-/rehype-stringify-8.0.0.tgz#9b6afb599bcf3165f10f93fc8548f9a03d2ec2ba"
   integrity sha512-VkIs18G0pj2xklyllrPSvdShAV36Ff3yE5PUO9u36f6+2qJFnn22Z5gKwBOwgXviux4UC7K+/j13AnZfPICi/g==
@@ -15769,7 +15877,7 @@ remark-footnotes@2.0.0:
   resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f"
   integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==
 
-remark-gfm@1.0.0:
+remark-gfm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-1.0.0.tgz#9213643001be3f277da6256464d56fd28c3b3c0d"
   integrity sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==
@@ -15813,14 +15921,14 @@ remark-parse@8.0.3:
     vfile-location "^3.0.0"
     xtend "^4.0.1"
 
-remark-parse@9.0.0, remark-parse@^9.0.0:
+remark-parse@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
   integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
   dependencies:
     mdast-util-from-markdown "^0.8.0"
 
-remark-rehype@8.0.0:
+remark-rehype@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-8.0.0.tgz#5a8afc8262a59d205fba21dafb27a673fb3b92fa"
   integrity sha512-gVvOH02TMFqXOWoL6iXU7NXMsDJguNkNuMrzfkQeA4V6WCyHQnOKptn+IQBVVPuIH2sMJBwo8hlrmtn1MLTh9w==
@@ -15850,6 +15958,13 @@ remark-stringify@^9.0.0:
   dependencies:
     mdast-util-to-markdown "^0.5.0"
 
+remark-stringify@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-9.0.1.tgz#576d06e910548b0a7191a71f27b33f1218862894"
+  integrity sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==
+  dependencies:
+    mdast-util-to-markdown "^0.6.0"
+
 remark@^13.0.0:
   version "13.0.0"
   resolved "https://registry.yarnpkg.com/remark/-/remark-13.0.0.tgz#d15d9bf71a402f40287ebe36067b66d54868e425"
@@ -17907,6 +18022,11 @@ trim-trailing-lines@^1.0.0:
   resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz#7f0739881ff76657b7776e10874128004b625a94"
   integrity sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==
 
+trim-trailing-lines@^1.1.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0"
+  integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==
+
 trim@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
@@ -18161,7 +18281,7 @@ unified@9.2.0, unified@^9.1.0:
     trough "^1.0.0"
     vfile "^4.0.0"
 
-unified@9.2.1:
+unified@^9.2.1:
   version "9.2.1"
   resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz#ae18d5674c114021bfdbdf73865ca60f410215a3"
   integrity sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==
@@ -18221,11 +18341,18 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
-unist-builder@2.0.3, unist-builder@^2.0.0:
+unist-builder@2.0.3, unist-builder@^2.0.0, unist-builder@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436"
   integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==
 
+unist-util-find-after@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-find-after/-/unist-util-find-after-3.0.0.tgz#5c65fcebf64d4f8f496db46fa8fd0fbf354b43e6"
+  integrity sha512-ojlBqfsBftYXExNu3+hHLfJQ/X1jYY/9vdm4yZWjIbf0VuWF6CRufci1ZyoD/wV2TYMKxXUoNuoqwy+CkgzAiQ==
+  dependencies:
+    unist-util-is "^4.0.0"
+
 unist-util-find-all-after@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz#fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6"

From c1473fa813ed6c26cddc36e4f26a6d4e134ffd26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Apr 2021 05:54:27 +0000
Subject: [PATCH 122/288] build(deps): bump @mdn/browser-compat-data from 3.2.2
 to 3.2.3 (#3419)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fce497125e14..9c8adc035066 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
   "dependencies": {
     "@caporal/core": "2.0.2",
     "@fast-csv/parse": "4.3.6",
-    "@mdn/browser-compat-data": "3.2.2",
+    "@mdn/browser-compat-data": "3.2.3",
     "accept-language-parser": "1.5.0",
     "chalk": "4.1.0",
     "cheerio": "1.0.0-rc.5",
diff --git a/yarn.lock b/yarn.lock
index d98a61d4be12..70ed5b94948d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1886,10 +1886,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@mdn/browser-compat-data@3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.2.2.tgz#0d4ca55e796d96a4d15935b8e51535ced5380573"
-  integrity sha512-W+f7ZugkxsB2xvRLb283m/weDx58yatbJTDRS8FAO9kR7igrQsZeTFaUoYogw36ywzwuOSnY6vKPFHbF6Xhd5A==
+"@mdn/browser-compat-data@3.2.3":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.2.3.tgz#0fb51d3363b531fd74ae68b00fe5c0f3025087a6"
+  integrity sha512-1vlKnnYAgIF5WbWpwBWSsT991ppuJrP6gdpu2RHjG24Vntx1w5c8yXpvtHuHW6RbnKVgwdGz33kpjAU0pDzIxw==
   dependencies:
     extend "3.0.2"
 

From 720e771d39c4c7a0fea74c67a081e6f5966891fd Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 2 Apr 2021 13:30:07 -0400
Subject: [PATCH 123/288] read-only crud mode by hostname (#3416)

* read-only crud mode by hostname

* feedbacked
---
 client/src/constants.ts                      | 10 ++++--
 client/src/document/toolbar/edit-actions.tsx | 10 ++++--
 client/src/document/toolbar/flaws.tsx        | 36 +++++++++++++++-----
 client/src/document/toolbar/index.tsx        |  6 ++--
 client/src/sitemap/index.tsx                 | 11 +++---
 docs/envvars.md                              | 22 ++++++++----
 6 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/client/src/constants.ts b/client/src/constants.ts
index 8130df29dcb2..2c14082ecfa5 100644
--- a/client/src/constants.ts
+++ b/client/src/constants.ts
@@ -7,9 +7,13 @@ export const CRUD_MODE = JSON.parse(
     JSON.stringify(process.env.NODE_ENV === "development")
 );
 
-export const CRUD_MODE_READONLY = JSON.parse(
-  process.env.REACT_APP_CRUD_MODE_READONLY || "false"
-);
+export const CRUD_MODE_HOSTNAMES = (
+  process.env.REACT_APP_CRUD_MODE_HOSTNAMES ||
+  "localhost,localhost.org,127.0.0.1"
+)
+  .split(",")
+  .map((x) => x.trim())
+  .filter(Boolean);
 
 export const AUTOCOMPLETE_SEARCH_WIDGET = JSON.parse(
   process.env.REACT_APP_AUTOCOMPLETE_SEARCH_WIDGET || JSON.stringify(CRUD_MODE)
diff --git a/client/src/document/toolbar/edit-actions.tsx b/client/src/document/toolbar/edit-actions.tsx
index 3cafe13fe432..dbf47637ae55 100644
--- a/client/src/document/toolbar/edit-actions.tsx
+++ b/client/src/document/toolbar/edit-actions.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react";
 import { Link, useLocation, useParams } from "react-router-dom";
-import { CRUD_MODE_READONLY } from "../../constants";
+import { CRUD_MODE_HOSTNAMES } from "../../constants";
 
 import "./edit-actions.scss";
 
@@ -61,9 +61,13 @@ export function EditActions({
     return null;
   }
 
+  // If window.location.host is 'localhost:3000` then
+  // window.location.hostname is 'localhost'
+  const isReadOnly = !CRUD_MODE_HOSTNAMES.includes(window.location.hostname);
+
   return (
     <ul className="edit-actions">
-      {!CRUD_MODE_READONLY && (
+      {!isReadOnly && (
         <li>
           <button
             type="button"
@@ -85,7 +89,7 @@ export function EditActions({
         </a>
       </li>
 
-      {!CRUD_MODE_READONLY && (
+      {!isReadOnly && (
         <li>
           <Link
             to={location.pathname.replace("/docs/", "/_edit/")}
diff --git a/client/src/document/toolbar/flaws.tsx b/client/src/document/toolbar/flaws.tsx
index 1669026fb7e2..11fa6fc03fe5 100644
--- a/client/src/document/toolbar/flaws.tsx
+++ b/client/src/document/toolbar/flaws.tsx
@@ -4,7 +4,7 @@ import { annotate, annotationGroup } from "rough-notation";
 import { RoughAnnotation } from "rough-notation/lib/model";
 import { diffWords } from "diff";
 
-import { CRUD_MODE, CRUD_MODE_READONLY } from "../../constants";
+import { CRUD_MODE, CRUD_MODE_HOSTNAMES } from "../../constants";
 import { humanizeFlawName } from "../../flaw-utils";
 import { useDocumentURL } from "../hooks";
 import {
@@ -199,9 +199,11 @@ function Flaws({
     })
     .flat();
 
+  const isReadOnly = !CRUD_MODE_HOSTNAMES.includes(window.location.hostname);
+
   return (
     <div id="document-flaws">
-      {!!fixableFlaws.length && !CRUD_MODE_READONLY && (
+      {!!fixableFlaws.length && !isReadOnly && (
         <FixableFlawsAction
           count={fixableFlaws.length}
           reloadPage={reloadPage}
@@ -216,6 +218,7 @@ function Flaws({
                 key="broken_links"
                 sourceFolder={doc.source.folder}
                 links={doc.flaws.broken_links}
+                isReadOnly={isReadOnly}
               />
             );
           case "bad_bcd_links":
@@ -238,6 +241,7 @@ function Flaws({
                 key="bad_pre_tags"
                 sourceFolder={doc.source.folder}
                 flaws={doc.flaws.bad_pre_tags}
+                isReadOnly={isReadOnly}
               />
             );
           case "macros":
@@ -246,6 +250,7 @@ function Flaws({
                 key="macros"
                 sourceFolder={doc.source.folder}
                 flaws={doc.flaws.macros}
+                isReadOnly={isReadOnly}
               />
             );
           case "images":
@@ -254,6 +259,7 @@ function Flaws({
                 key="images"
                 sourceFolder={doc.source.folder}
                 images={doc.flaws.images}
+                isReadOnly={isReadOnly}
               />
             );
           case "image_widths":
@@ -262,6 +268,7 @@ function Flaws({
                 key="image_widths"
                 sourceFolder={doc.source.folder}
                 flaws={doc.flaws.image_widths}
+                isReadOnly={isReadOnly}
               />
             );
           case "heading_links":
@@ -270,6 +277,7 @@ function Flaws({
                 key="heading_links"
                 sourceFolder={doc.source.folder}
                 flaws={doc.flaws.heading_links}
+                isReadOnly={isReadOnly}
               />
             );
           case "unsafe_html":
@@ -380,9 +388,11 @@ function ShowDiff({ before, after }: { before: string; after: string }) {
 function BrokenLinks({
   sourceFolder,
   links,
+  isReadOnly,
 }: {
   sourceFolder: string;
   links: BrokenLink[];
+  isReadOnly: boolean;
 }) {
   const [opening, setOpening] = React.useState<string | null>(null);
   useEffect(() => {
@@ -445,7 +455,7 @@ function BrokenLinks({
               >
                 👀
               </span>{" "}
-              {CRUD_MODE_READONLY ? (
+              {isReadOnly ? (
                 <>
                   {/* It would be cool if we can change this to a link to the line in the
                   file in GitHub's UI. */}
@@ -535,9 +545,11 @@ function Sectioning({ flaws }: { flaws: SectioningFlaw[] }) {
 function BadPreTag({
   flaws,
   sourceFolder,
+  isReadOnly,
 }: {
   flaws: BadPreTagFlaw[];
   sourceFolder: string;
+  isReadOnly: boolean;
 }) {
   const { focus } = useAnnotations(flaws);
 
@@ -591,7 +603,7 @@ function BadPreTag({
               👀
             </span>{" "}
             {flaw.line && flaw.column ? (
-              CRUD_MODE_READONLY ? (
+              isReadOnly ? (
                 <>
                   line {flaw.line}:{flaw.column}
                 </>
@@ -620,9 +632,11 @@ function BadPreTag({
 function Macros({
   flaws,
   sourceFolder,
+  isReadOnly,
 }: {
   flaws: MacroErrorMessage[];
   sourceFolder: string;
+  isReadOnly: boolean;
 }) {
   const [opening, setOpening] = React.useState<string | null>(null);
   useEffect(() => {
@@ -670,7 +684,7 @@ function Macros({
           >
             <summary>
               <code>{flaw.name}</code> from <code>{flaw.macroName}</code>{" "}
-              {CRUD_MODE_READONLY ? (
+              {isReadOnly ? (
                 <>
                   line {flaw.line}:{flaw.column}
                 </>
@@ -732,9 +746,11 @@ function Macros({
 function Images({
   sourceFolder,
   images,
+  isReadOnly,
 }: {
   sourceFolder: string;
   images: ImageReferenceFlaw[];
+  isReadOnly: boolean;
 }) {
   // XXX rewrite to a hook
   const [opening, setOpening] = React.useState<string | null>(null);
@@ -790,7 +806,7 @@ function Images({
               >
                 👀
               </span>{" "}
-              {CRUD_MODE_READONLY ? (
+              {isReadOnly ? (
                 <>
                   line {flaw.line}:{flaw.column}
                 </>
@@ -826,9 +842,11 @@ function Images({
 function ImageWidths({
   sourceFolder,
   flaws,
+  isReadOnly,
 }: {
   sourceFolder: string;
   flaws: ImageWidthFlaw[];
+  isReadOnly: boolean;
 }) {
   // XXX rewrite to a hook
   const [opening, setOpening] = React.useState<string | null>(null);
@@ -884,7 +902,7 @@ function ImageWidths({
               >
                 👀
               </span>{" "}
-              {CRUD_MODE_READONLY ? (
+              {isReadOnly ? (
                 <>
                   line {flaw.line}:{flaw.column}
                 </>
@@ -931,9 +949,11 @@ function ImageWidths({
 function HeadingLinks({
   sourceFolder,
   flaws,
+  isReadOnly,
 }: {
   sourceFolder: string;
   flaws: HeadingLinksFlaw[];
+  isReadOnly: boolean;
 }) {
   // XXX rewrite to a hook
   const [opening, setOpening] = React.useState<string | null>(null);
@@ -977,7 +997,7 @@ function HeadingLinks({
             <li key={key}>
               <b>{flaw.explanation}</b>{" "}
               {flaw.line && flaw.column ? (
-                CRUD_MODE_READONLY ? (
+                isReadOnly ? (
                   <>
                     line {flaw.line}:{flaw.column}
                   </>
diff --git a/client/src/document/toolbar/index.tsx b/client/src/document/toolbar/index.tsx
index 4219ed5164f6..9163b60b1ab4 100644
--- a/client/src/document/toolbar/index.tsx
+++ b/client/src/document/toolbar/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect } from "react";
-import { CRUD_MODE_READONLY } from "../../constants";
+import { CRUD_MODE_HOSTNAMES } from "../../constants";
 import { Doc } from "../types";
 import { EditActions } from "./edit-actions";
 import { ToggleDocumentFlaws } from "./flaws";
@@ -33,6 +33,8 @@ export default function Toolbar({
     localStorage.setItem(localStorageKey, JSON.stringify(visits.slice(0, 20)));
   }, [doc]);
 
+  const isReadOnly = !CRUD_MODE_HOSTNAMES.includes(window.location.hostname);
+
   return (
     <div className="toolbar">
       <div className="toolbar-first-row">
@@ -41,7 +43,7 @@ export default function Toolbar({
           filename={doc.source.filename}
         />
       </div>
-      {CRUD_MODE_READONLY && (
+      {isReadOnly && (
         <p>
           <i>
             You're in <b>read-only</b> mode.
diff --git a/client/src/sitemap/index.tsx b/client/src/sitemap/index.tsx
index 17a860575485..d9e9ab008ea2 100644
--- a/client/src/sitemap/index.tsx
+++ b/client/src/sitemap/index.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Link, useNavigate, useLocation } from "react-router-dom";
 import useSWR from "swr";
 
-import { CRUD_MODE, CRUD_MODE_READONLY } from "../constants";
+import { CRUD_MODE, CRUD_MODE_HOSTNAMES } from "../constants";
 import { useLocale } from "../hooks";
 import { PageContentContainer } from "../ui/atoms/page-content";
 
@@ -399,6 +399,8 @@ function Breadcrumb({
   const root = pathname.split("/").slice(0, 2);
   root.push("_sitemap");
 
+  const isReadOnly = !CRUD_MODE_HOSTNAMES.includes(window.location.hostname);
+
   return (
     <>
       <ul className="breadcrumb">
@@ -427,7 +429,7 @@ function Breadcrumb({
               <Link to={thisDoc.url}>
                 <em>{thisDoc.title}</em>
               </Link>{" "}
-              {CRUD_MODE && !CRUD_MODE_READONLY && (
+              {CRUD_MODE && !isReadOnly && (
                 <small>
                   (
                   <a
@@ -467,6 +469,7 @@ function ShowTree({
   openInYourEditor: (url: string) => void;
 }) {
   const locale = useLocale();
+  const isReadOnly = !CRUD_MODE_HOSTNAMES.includes(window.location.hostname);
   return (
     <div className="tree">
       <ul>
@@ -492,8 +495,8 @@ function ShowTree({
                 <Link to={doc.url} title={`Go to: ${doc.title}`}>
                   View
                 </Link>
-                {!CRUD_MODE_READONLY && " | "}
-                {!CRUD_MODE_READONLY && (
+                {!isReadOnly && " | "}
+                {!isReadOnly && (
                   <Link
                     to={doc.url}
                     title={`Edit: ${doc.title}`}
diff --git a/docs/envvars.md b/docs/envvars.md
index ed9e28f243bf..1067d9bfedb1 100644
--- a/docs/envvars.md
+++ b/docs/envvars.md
@@ -284,9 +284,19 @@ It defaults to `NODE_ENV==='development'` if not set which means that
 it's enable by default when doing development with the `localhost:3000`
 dev server.
 
-### `REACT_APP_CRUD_MODE_READONLY`
-
-**Default: `false`**
-
-Only applicable if `REACT_APP_CRUD_MODE` is truthy. This setting disables all
-options like "Fix fixable flaws" or "Quick-edit"
+### `REACT_APP_CRUD_MODE_HOSTNAMES`
+
+**Default: `localhost, localhost.org, 127.0.0.1`**
+
+Only applicable if `REACT_APP_CRUD_MODE` is truthy. Essentially you can disable
+certain CRUD mode features depending on the hostname you use. So if you built
+the static assets (the React code) with `REACT_APP_CRUD_MODE=true` it might
+disable certain features if you use a `window.location.hostname` that is _not_
+in this list.
+
+The use case for this is when you build the site in a pull request and want
+flaws to _appear_ but without the "Fix fixable flaws" link or the "Open in your editor"
+button. We use this for previewing PR builds on the content site. Those pages are
+built with flaw detection set to warn, but since you might be viewing the pages
+on a remote domain (e.g. `pr123.dev.content.mozit.cloud`) it doesn't make sense to
+present the "Fix fixable flaws" button for example.

From 984c8a3c1499f26e5b790a5a6170bd9346f33406 Mon Sep 17 00:00:00 2001
From: Ryan Johnson <rjohnson@mozilla.com>
Date: Fri, 2 Apr 2021 11:14:16 -0700
Subject: [PATCH 124/288] tweak preview urls title (#3424)

---
 deployer/README.md                       | 2 +-
 deployer/src/deployer/analyze_pr.py      | 2 +-
 deployer/src/deployer/test_analyze_pr.py | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployer/README.md b/deployer/README.md
index 49869a3e1b3f..7cedfde95fe2 100644
--- a/deployer/README.md
+++ b/deployer/README.md
@@ -197,7 +197,7 @@ The `prefix` is used to specify the proper Dev subdomain (`{prefix}.content.dev.
 if `--prefix experiment1` is specified, it will list:
 
 ```md
-## Preview deployment
+## Preview URLs
 
 - <https://experiment1.content.dev.mdn.mozit.cloud/en-US/docs/MDN/Kitchensink>
 ```
diff --git a/deployer/src/deployer/analyze_pr.py b/deployer/src/deployer/analyze_pr.py
index 7eee351fea27..4cc7643b7c36 100644
--- a/deployer/src/deployer/analyze_pr.py
+++ b/deployer/src/deployer/analyze_pr.py
@@ -69,7 +69,7 @@ def post_about_deployment(build_directory: Path, **config):
         url = mdn_url_to_dev_url(config["prefix"], doc["mdn_url"])
         links.append(f"- <{url}>")
 
-    heading = "## Preview deployment URLs\n\n"
+    heading = "## Preview URLs\n\n"
     if links:
         return heading + "\n".join(links)
 
diff --git a/deployer/src/deployer/test_analyze_pr.py b/deployer/src/deployer/test_analyze_pr.py
index 660a1f74719b..c235f9e86866 100644
--- a/deployer/src/deployer/test_analyze_pr.py
+++ b/deployer/src/deployer/test_analyze_pr.py
@@ -33,7 +33,7 @@ def test_analyze_pr_prefix():
     doc = {"doc": {"mdn_url": "/en-US/docs/Foo"}}
     with mock_build_directory(doc) as build_directory:
         comment = analyze_pr(build_directory, dict(DEFAULT_CONFIG, prefix="pr007"))
-        assert "## Preview deployment URLs" in comment
+        assert "## Preview URLs" in comment
         assert "- <https://pr007.content.dev.mdn.mozit.cloud/en-US/docs/Foo>" in comment
 
 
@@ -106,7 +106,7 @@ def test_analyze_pr_prefix_and_postcomment(mocked_github):
             build_directory,
             dict(DEFAULT_CONFIG, prefix="pr007", pr_number=123, github_token="abc123"),
         )
-        assert "## Preview deployment URLs" in comment
+        assert "## Preview URLs" in comment
         assert "- <https://pr007.content.dev.mdn.mozit.cloud/en-US/docs/Foo>" in comment
 
     mocked_github().get_repo().get_issue().create_comment.assert_called()

From 42105bb3145988d3ac1170f72b80fae1cb64f3b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 06:31:02 +0000
Subject: [PATCH 125/288] build(deps-dev): bump @storybook/addon-actions from
 6.2.1 to 6.2.2 (#3432)

---
 package.json |   2 +-
 yarn.lock    | 188 ++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 178 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 9c8adc035066..7ee6cca1d9c2 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "@mdn/dinocons": "^0.3.0",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.2.1",
-    "@storybook/addon-actions": "^6.2.1",
+    "@storybook/addon-actions": "^6.2.2",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.1",
     "@storybook/node-logger": "^6.2.1",
diff --git a/yarn.lock b/yarn.lock
index 70ed5b94948d..0dbdb9635066 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2133,17 +2133,17 @@
     util-deprecate "^1.0.2"
     uuid "^8.0.0"
 
-"@storybook/addon-actions@^6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.1.tgz#af5924969c691a4fe6ec9266ffefe02b95245063"
-  integrity sha512-pRzyJIcso+7FJ4Xv4lJZ/mppFgkdnJ3B/R6QPYl1Enwlxjk2CH2iDD+Hq85WFHGfg5cjtFm3fd9EbPXC09ReeA==
-  dependencies:
-    "@storybook/addons" "6.2.1"
-    "@storybook/api" "6.2.1"
-    "@storybook/client-api" "6.2.1"
-    "@storybook/components" "6.2.1"
-    "@storybook/core-events" "6.2.1"
-    "@storybook/theming" "6.2.1"
+"@storybook/addon-actions@^6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.2.tgz#4890a98b6263ddc8f7f91b4f90f991994ec0c02c"
+  integrity sha512-R8QlAMdbMxPNvz6RldIQP/1OPh3I9nUBcOqaw0i0pQb8HpcT2s2Lu/iO/pWjJBZ522AUOeVW5m+rrDifMMGZUQ==
+  dependencies:
+    "@storybook/addons" "6.2.2"
+    "@storybook/api" "6.2.2"
+    "@storybook/client-api" "6.2.2"
+    "@storybook/components" "6.2.2"
+    "@storybook/core-events" "6.2.2"
+    "@storybook/theming" "6.2.2"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
     global "^4.4.0"
@@ -2328,6 +2328,21 @@
     global "^4.4.0"
     regenerator-runtime "^0.13.7"
 
+"@storybook/addons@6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.2.tgz#d0ad3fa05e1569264511b8f8fb1fd08324e776a2"
+  integrity sha512-3FSnNl+0wzkeh3KVk+CB8bYb4FDRIEeFI0kU+UDj46PAXuqObQeIzPlpsU59D5Qq6zFXV+IhzLRknGrrMh1XzA==
+  dependencies:
+    "@storybook/api" "6.2.2"
+    "@storybook/channels" "6.2.2"
+    "@storybook/client-logger" "6.2.2"
+    "@storybook/core-events" "6.2.2"
+    "@storybook/router" "6.2.2"
+    "@storybook/theming" "6.2.2"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    regenerator-runtime "^0.13.7"
+
 "@storybook/api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.21.tgz#be753ca8d3602efe4a11783c81c689463bee0825"
@@ -2379,6 +2394,32 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.2.tgz#021a6d89bef42fb9ec49c3fca9293b8be47298fa"
+  integrity sha512-5BNspUVi5ZckYSWlmK55Ck2vNkZXW9klQtvxkLkf1fmuHdrjsDq5huVYJCNbHo8ngcrynR0Iynip7QZrQU0ylA==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/channels" "6.2.2"
+    "@storybook/client-logger" "6.2.2"
+    "@storybook/core-events" "6.2.2"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "6.2.2"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.2"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    store2 "^2.12.0"
+    telejson "^5.1.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.1.21.tgz#acce71833499dba4c4e686de09f5b281a3239842"
@@ -2405,6 +2446,19 @@
     qs "^6.10.0"
     telejson "^5.1.0"
 
+"@storybook/channel-postmessage@6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.2.tgz#e7dc119d7f8937ac26ef4b5591e8ce9a28f8c9ed"
+  integrity sha512-m8cLGKYw9t2d14ZkHTaQnnd0HVrXagzQ16AKbbj7m8ZM1Qv7XFZnRcfxN+1nZ0W0OIRhMMCh9Xf14U1bLb5CTw==
+  dependencies:
+    "@storybook/channels" "6.2.2"
+    "@storybook/client-logger" "6.2.2"
+    "@storybook/core-events" "6.2.2"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    qs "^6.10.0"
+    telejson "^5.1.0"
+
 "@storybook/channels@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.1.21.tgz#adbfae5f4767234c5b17d9578be983584dddead4"
@@ -2423,6 +2477,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/channels@6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.2.tgz#502d1fc083559f8ed39f499557523178572798c2"
+  integrity sha512-lev2jJE45QmH+q40M8zsQMF7h8OjoBA7/Ir2RIUVshftuHlzME3L5Y9w5o/7LWdlhvZYBmhqqXv+iYusFo9yTA==
+  dependencies:
+    core-js "^3.8.2"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.1.21.tgz#c9f72bbc9bf9d12cc931eb824f6912173c73b0b3"
@@ -2471,6 +2534,30 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.2.tgz#cc96c08c8ac1959d37225a6657adc14e6f58f790"
+  integrity sha512-HdWFmdMgOwR6JAbKGgxsJq0VmYkSCgpbeSmPkUMNCz8lufOekRGSyKELKvMsAVt/TSTP5vgQOrB1UC93HqCKGQ==
+  dependencies:
+    "@storybook/addons" "6.2.2"
+    "@storybook/channel-postmessage" "6.2.2"
+    "@storybook/channels" "6.2.2"
+    "@storybook/client-logger" "6.2.2"
+    "@storybook/core-events" "6.2.2"
+    "@storybook/csf" "0.0.1"
+    "@types/qs" "^6.9.5"
+    "@types/webpack-env" "^1.16.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    stable "^0.1.8"
+    store2 "^2.12.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.1.21.tgz#fe7d9e645ddb4eb9dc18fdacea24b4baf11bc6c9"
@@ -2487,6 +2574,14 @@
     core-js "^3.8.2"
     global "^4.4.0"
 
+"@storybook/client-logger@6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.2.tgz#953cc977dd428e484db7e1f09f46505fa6567155"
+  integrity sha512-tv8zKGBHCDg6mMOk4znCoiF9KUPtH02ksTrlJzJbTz5Jqc1OwBS8/O48TaeNtQcKcMfs92j9NK1aW6WFGU9o+w==
+  dependencies:
+    core-js "^3.8.2"
+    global "^4.4.0"
+
 "@storybook/components@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.21.tgz#7b9bfd51e73c179654a114275e5073f494d2a005"
@@ -2544,6 +2639,36 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/components@6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.2.tgz#e17a3723146e1f30d35ac6f9da7e70451a88c9c9"
+  integrity sha512-KfYKVHDRGUmQGA4+vSqy4Qc3imCTrGcZsXRgAMBtiFtXqtSruA6ZTFkqEjV2ab+9hksv06vpAHjxosMStFkX3g==
+  dependencies:
+    "@popperjs/core" "^2.6.0"
+    "@storybook/client-logger" "6.2.2"
+    "@storybook/csf" "0.0.1"
+    "@storybook/theming" "6.2.2"
+    "@types/color-convert" "^2.0.0"
+    "@types/overlayscrollbars" "^1.12.0"
+    "@types/react-syntax-highlighter" "11.0.5"
+    color-convert "^2.0.1"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    markdown-to-jsx "^7.1.0"
+    memoizerific "^1.11.3"
+    overlayscrollbars "^1.13.1"
+    polished "^4.0.5"
+    prop-types "^15.7.2"
+    react-colorful "^5.0.1"
+    react-popper-tooltip "^3.1.1"
+    react-syntax-highlighter "^13.5.3"
+    react-textarea-autosize "^8.3.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/core-events@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.1.21.tgz#11f537f78f8c73ba5e627b57b282a279793a3511"
@@ -2558,6 +2683,13 @@
   dependencies:
     core-js "^3.8.2"
 
+"@storybook/core-events@6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.2.tgz#9ecc42a645048ac386748ca659c196f2000146a7"
+  integrity sha512-29Xsu1cMwDXqtLQK+x2e4G//ppJCkEkPL0DISg2jD1ND04V7eaKubWq/kwsHtM8MKYJHxuxh4rSF7xb24EEPOA==
+  dependencies:
+    core-js "^3.8.2"
+
 "@storybook/core@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.1.21.tgz#e4c9f5ab361e0c4690f2827a71308757f9d46395"
@@ -2769,6 +2901,22 @@
     qs "^6.10.0"
     ts-dedent "^2.0.0"
 
+"@storybook/router@6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.2.tgz#8e0983b8c7c9f777ea3d3c5467910c6f7202f3cb"
+  integrity sha512-K9ScTklpmZtLNbDsNSW8WyVRy7XuqeWJgw89+A7CRIk3fSk7+FvW8OeS7ZMKFWK5j18Mm6U0XPBP+d1mSw7Vlg==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/client-logger" "6.2.2"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/semver@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
@@ -2830,6 +2978,24 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
+"@storybook/theming@6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.2.tgz#db44ab207f9109c697b8ea95dfab829279e2525a"
+  integrity sha512-oqZkv5OD6ViIRiAdrUfTVxny1zjhvZGNtQFtTBBad0u8UA5ndIPSzz1dEvj1adfRlbX+Qn3J4ELU7L09pO4PWQ==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@emotion/is-prop-valid" "^0.8.6"
+    "@emotion/styled" "^10.0.27"
+    "@storybook/client-logger" "6.2.2"
+    core-js "^3.8.2"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.27"
+    global "^4.4.0"
+    memoizerific "^1.11.3"
+    polished "^4.0.5"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/ui@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.1.21.tgz#bf7cac3ba9a6250f573fa1ba12d4592891d5ece2"

From 3070cea3992dbc51c1eb569da5cf4243f90a0368 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 06:33:21 +0000
Subject: [PATCH 126/288] build(deps): bump open from 8.0.4 to 8.0.5 (#3434)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7ee6cca1d9c2..be827c4301ff 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "loglevel": "^1.7.1",
     "lru-cache": "^6.0.0",
     "mdn-data": "2.0.17",
-    "open": "^8.0.4",
+    "open": "^8.0.5",
     "open-editor": "3.0.0",
     "prismjs": "1.23.0",
     "read-chunk": "3.2.0",
diff --git a/yarn.lock b/yarn.lock
index 0dbdb9635066..8a118c494eba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13551,10 +13551,10 @@ open@^7.0.2, open@^7.0.3, open@^7.3.0:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
 
-open@^8.0.4:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.0.4.tgz#2fb90debffcf20f4d7be537502ed3e3ee9e5dcbc"
-  integrity sha512-Txc9FOcvjrr5Kv+Zb3w89uKMKiP7wH8mLdYj1xJa+YnhhntEYhbB6cQHjS4O6P+jFwMEzEQVVcpfnu9WkKNuLQ==
+open@^8.0.5:
+  version "8.0.5"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.0.5.tgz#92ee3faafef4ddbe78006f7881572f3e81430b8f"
+  integrity sha512-hkPXCz7gijWp2GoWqsQ4O/5p7F6d5pIQ/+9NyeWG1nABJ4zvLi9kJRv1a44kVf5p13wK0WMoiRA+Xey68yOytA==
   dependencies:
     define-lazy-prop "^2.0.0"
     is-docker "^2.1.1"

From ab4a2f1ccb110e953bd2e5803799109c62efe9c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 06:36:26 +0000
Subject: [PATCH 127/288] build(deps-dev): bump html-validate from 4.8.0 to
 4.9.0 (#3436)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index be827c4301ff..958c274f5d65 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "fuzzyjs": "4.0.4",
     "fuzzysearch": "1.0.3",
     "history": "5.0.0",
-    "html-validate": "4.8.0",
+    "html-validate": "4.9.0",
     "husky": "4.3.8",
     "ignore-loader": "^0.1.2",
     "jest-environment-jsdom-sixteen": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index 8a118c494eba..aa5ead2f39ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9853,10 +9853,10 @@ html-tags@^3.1.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
   integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
 
-html-validate@4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.8.0.tgz#938d3b1eeaae21b0114173d79f822905652c9551"
-  integrity sha512-d7PTUw8fGupEw3/PozLTReKySwq2wtLQNJ8ZmWIqdW63zw7IprXzNJ2LmQwC9yETP+NJGcFCzysvzzi2A0sCWw==
+html-validate@4.9.0:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.9.0.tgz#117b5b96847ac6e6f82a65f2a8cd5e0c7be3da0b"
+  integrity sha512-f/K800iPkwUoylSLbBHwotSgfWGQ0oW1WXZQQ1O/PRHXfyaaycGMHg5yke6CywhYW/NIV4BcXhGdtTwrrWQ1sg==
   dependencies:
     "@babel/code-frame" "^7.10.0"
     "@html-validate/stylish" "^1.0.0"

From 37ffb9b523e97de953539eaad449484ec364c794 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 06:37:05 +0000
Subject: [PATCH 128/288] build(deps-dev): bump @storybook/addon-links from
 6.2.1 to 6.2.2 (#3437)

---
 package.json |  2 +-
 yarn.lock    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 958c274f5d65..cd119e576948 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "@storybook/addon-a11y": "^6.2.1",
     "@storybook/addon-actions": "^6.2.2",
     "@storybook/addon-essentials": "^6.1.21",
-    "@storybook/addon-links": "^6.2.1",
+    "@storybook/addon-links": "^6.2.2",
     "@storybook/node-logger": "^6.2.1",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index aa5ead2f39ff..46ab82398f89 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2252,16 +2252,16 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-links@^6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.1.tgz#64a9978b9eaec8a85de8b965d823cf5786c1a6ba"
-  integrity sha512-ZVAaNEVdQaL8+OLu6A7yfake0w8cn9YOZAnUcrIPalIVZ7MESy/vfxAE7lzYk17ngC9G+w5ELtzoD4WThTcCNg==
+"@storybook/addon-links@^6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.2.tgz#8677989ac54346282ada501a04c38c30ff172d45"
+  integrity sha512-+6BBsJ1rkmcAkhYqHAG1kMUnzaeIHGXRShev9dFhVh//q8wF+jrT93bcILdpFRueXciXb2cImbYTKN2hDdrzEA==
   dependencies:
-    "@storybook/addons" "6.2.1"
-    "@storybook/client-logger" "6.2.1"
-    "@storybook/core-events" "6.2.1"
+    "@storybook/addons" "6.2.2"
+    "@storybook/client-logger" "6.2.2"
+    "@storybook/core-events" "6.2.2"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.1"
+    "@storybook/router" "6.2.2"
     "@types/qs" "^6.9.5"
     core-js "^3.8.2"
     global "^4.4.0"

From e6c6ee6dd2d410356888fefdb148b62e5052e30e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 06:38:38 +0000
Subject: [PATCH 129/288] build(deps-dev): bump eslint-plugin-jest from 24.3.2
 to 24.3.4 (#3439)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index cd119e576948..9b2ef83f7070 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "downshift": "^6.1.2",
     "eslint": "^7.18.0",
     "eslint-gitignore": "^0.1.0",
-    "eslint-plugin-jest": "24.3.2",
+    "eslint-plugin-jest": "24.3.4",
     "eslint-plugin-node": "11.1.0",
     "extend": "^3.0.2",
     "flexsearch": "0.6.32",
diff --git a/yarn.lock b/yarn.lock
index 46ab82398f89..294724c26916 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7829,10 +7829,10 @@ eslint-plugin-import@^2.22.1:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-jest@24.3.2, eslint-plugin-jest@^24.1.0:
-  version "24.3.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.2.tgz#30a8b2dea6278d0da1d6fb9d6cd530aaf58050a1"
-  integrity sha512-cicWDr+RvTAOKS3Q/k03+Z3odt3VCiWamNUHWd6QWbVQWcYJyYgUTu8x0mx9GfeDEimawU5kQC+nQ3MFxIM6bw==
+eslint-plugin-jest@24.3.4, eslint-plugin-jest@^24.1.0:
+  version "24.3.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.4.tgz#6d90c3554de0302e879603dd6405474c98849f19"
+  integrity sha512-3n5oY1+fictanuFkTWPwSlehugBTAgwLnYLFsCllzE3Pl1BwywHl5fL0HFxmMjoQY8xhUDk8uAWc3S4JOHGh3A==
   dependencies:
     "@typescript-eslint/experimental-utils" "^4.0.1"
 

From 2dbc3ca6cacf3a6f915fcccc5ffd5bd3341f5c4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 06:40:31 +0000
Subject: [PATCH 130/288] build(deps-dev): bump @mdn/dinocons from 0.3.0 to
 0.3.1 (#3440)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9b2ef83f7070..1e5a31844b9d 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.13.14",
-    "@mdn/dinocons": "^0.3.0",
+    "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.2.1",
     "@storybook/addon-actions": "^6.2.2",
diff --git a/yarn.lock b/yarn.lock
index 294724c26916..6685cfc2664a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1893,10 +1893,10 @@
   dependencies:
     extend "3.0.2"
 
-"@mdn/dinocons@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@mdn/dinocons/-/dinocons-0.3.0.tgz#2162eb6c12b36dd9bfc69f344d9150b4b5a3c9ad"
-  integrity sha512-++oqKEzbWtc4DHELnS9R6HoGt+7AGRe2zlxTyk5YCSwouIIiI4DEGuoMCdtBCrZOoHtp2WHZ1mZ6BqEmQh8hLA==
+"@mdn/dinocons@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@mdn/dinocons/-/dinocons-0.3.1.tgz#c614d5ec2a42bf2ce55a71a0ca5272641a90bee3"
+  integrity sha512-K35LQ2fRgAwXptQ87+N/nnm5fADV6vfYsOhhubbJh1xPQGtnXxUlihrA+CeGq2a/gH6kdC6QuDz0hyra/0Bq2Q==
 
 "@mdn/minimalist@^0.8.0":
   version "0.8.0"

From e2ea7c871be2daf8c72903a840269ff2c7375979 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 06:59:01 +0000
Subject: [PATCH 131/288] build(deps): bump boto3 from 1.17.40 to 1.17.44 in
 /deployer (#3443)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index bed72e7b0d0b..f93fa8e921fb 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.40"
+version = "1.17.44"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.40,<1.21.0"
+botocore = ">=1.20.44,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.40"
+version = "1.20.44"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -533,7 +533,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "c52e4f2837c77adb59180d059fde29e1a5990efc2d2d43d7872ce2af909308b6"
+content-hash = "e65426353c455cf1bc05729c984ab944d497bc1495c1f1901a7989f2c9bdaf91"
 
 [metadata.files]
 appdirs = [
@@ -552,12 +552,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.40-py2.py3-none-any.whl", hash = "sha256:54380395ba52502a9877cd0c4c9c9834341ce74c96c9f1ecc6fd77bade1b201a"},
-    {file = "boto3-1.17.40.tar.gz", hash = "sha256:ee999b46b2c630e50e7b052d6dfe224203a348d83b00e168ca50009af0f276c1"},
+    {file = "boto3-1.17.44-py2.py3-none-any.whl", hash = "sha256:e74da1da74fbefbe2db7a9c53082018d862433f35e2ecd4c173632efc5742f40"},
+    {file = "boto3-1.17.44.tar.gz", hash = "sha256:ffb9b192b2b52ab88cde09e2af7d9fd6e541287e5719098be97ffd7144f47eb1"},
 ]
 botocore = [
-    {file = "botocore-1.20.40-py2.py3-none-any.whl", hash = "sha256:f2b68119050211139f21278166c9023d9251da84b500a4ccede4a4545d6a9514"},
-    {file = "botocore-1.20.40.tar.gz", hash = "sha256:6a35a9977cdbd7a839d948dd5f9e3d260c19b7dde74e0a844c97206884d3bba0"},
+    {file = "botocore-1.20.44-py2.py3-none-any.whl", hash = "sha256:8a7f85bf05ad62551b0e6dfeeec471147b330cb2b5c7f48795057e811e6a2e77"},
+    {file = "botocore-1.20.44.tar.gz", hash = "sha256:2958e3912939558fd789a64b23a10039d8b0c0c84a23b573f3f2e3154de357ad"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 6c797be0fa92..b6999e9a2a58 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.40"
+boto3 = "^1.17.44"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 89557885d852246b55e3801b43fa7cea04af3380 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 07:00:20 +0000
Subject: [PATCH 132/288] build(deps): bump pytest from 6.2.2 to 6.2.3 in
 /testing/integration (#3445)

---
 testing/integration/poetry.lock    | 8 ++++----
 testing/integration/pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testing/integration/poetry.lock b/testing/integration/poetry.lock
index ff9354416bfc..f46f913ae1f9 100644
--- a/testing/integration/poetry.lock
+++ b/testing/integration/poetry.lock
@@ -253,7 +253,7 @@ lxml = ">=2.1"
 
 [[package]]
 name = "pytest"
-version = "6.2.2"
+version = "6.2.3"
 description = "pytest: simple powerful testing with Python"
 category = "main"
 optional = false
@@ -382,7 +382,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "e2d74c3b25e579b95fe9d6b91d707062cbf3de2994d7553c8a1571b33712eb66"
+content-hash = "55a196aa28b8f873ea92e1be02308a39924ad41c7e192071bf7f6f1231decd7e"
 
 [metadata.files]
 appdirs = [
@@ -520,8 +520,8 @@ pyquery = [
     {file = "pyquery-1.4.3.tar.gz", hash = "sha256:a388eefb6bc4a55350de0316fbd97cda999ae669b6743ae5b99102ba54f5aa72"},
 ]
 pytest = [
-    {file = "pytest-6.2.2-py3-none-any.whl", hash = "sha256:b574b57423e818210672e07ca1fa90aaf194a4f63f3ab909a2c67ebb22913839"},
-    {file = "pytest-6.2.2.tar.gz", hash = "sha256:9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9"},
+    {file = "pytest-6.2.3-py3-none-any.whl", hash = "sha256:6ad9c7bdf517a808242b998ac20063c41532a570d088d77eec1ee12b0b5574bc"},
+    {file = "pytest-6.2.3.tar.gz", hash = "sha256:671238a46e4df0f3498d1c3270e5deb9b32d25134c99b7d75370a68cfbe9b634"},
 ]
 pytest-base-url = [
     {file = "pytest-base-url-1.4.2.tar.gz", hash = "sha256:7f1f32e08c2ee751e59e7f5880235b46e83496adc5cba5a01ca218c6fe81333d"},
diff --git a/testing/integration/pyproject.toml b/testing/integration/pyproject.toml
index 2308fe0d45c1..222034b2c76d 100644
--- a/testing/integration/pyproject.toml
+++ b/testing/integration/pyproject.toml
@@ -9,7 +9,7 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.7"
-pytest = "^6.2.2"
+pytest = "^6.2.3"
 pytest-base-url = "^1.4.2"
 pytest-rerunfailures = "^9.1.1"
 requests = "^2.25.1"

From 3300d0d055748f616ed91f4f2958679853c37a33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 10:04:32 +0000
Subject: [PATCH 133/288] build(deps-dev): bump pytest from 6.2.2 to 6.2.3 in
 /deployer (#3444)

---
 deployer/poetry.lock    | 8 ++++----
 deployer/pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index f93fa8e921fb..70fce4e4b628 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -379,7 +379,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "pytest"
-version = "6.2.2"
+version = "6.2.3"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
@@ -533,7 +533,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "e65426353c455cf1bc05729c984ab944d497bc1495c1f1901a7989f2c9bdaf91"
+content-hash = "6673738107558a14908fac344422bcddc69f9387f8d877da74ce1dc5af420550"
 
 [metadata.files]
 appdirs = [
@@ -713,8 +713,8 @@ pyparsing = [
     {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
 ]
 pytest = [
-    {file = "pytest-6.2.2-py3-none-any.whl", hash = "sha256:b574b57423e818210672e07ca1fa90aaf194a4f63f3ab909a2c67ebb22913839"},
-    {file = "pytest-6.2.2.tar.gz", hash = "sha256:9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9"},
+    {file = "pytest-6.2.3-py3-none-any.whl", hash = "sha256:6ad9c7bdf517a808242b998ac20063c41532a570d088d77eec1ee12b0b5574bc"},
+    {file = "pytest-6.2.3.tar.gz", hash = "sha256:671238a46e4df0f3498d1c3270e5deb9b32d25134c99b7d75370a68cfbe9b634"},
 ]
 python-dateutil = [
     {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index b6999e9a2a58..1a6b276b7800 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -20,7 +20,7 @@ PyGithub = "^1.54.1"
 [tool.poetry.dev-dependencies]
 black = "^20.8b1"
 flake8 = "^3.9.0"
-pytest = "^6.2.2"
+pytest = "^6.2.3"
 
 [tool.poetry.scripts]
 deployer = "deployer.main:cli"

From 59a2b3e5359748b55434bd025ee6cd351ae88929 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 10:05:01 +0000
Subject: [PATCH 134/288] build(deps-dev): bump @storybook/addon-a11y from
 6.2.1 to 6.2.2 (#3438)

---
 package.json |   2 +-
 yarn.lock    | 192 ++++-----------------------------------------------
 2 files changed, 14 insertions(+), 180 deletions(-)

diff --git a/package.json b/package.json
index 1e5a31844b9d..d04978f36707 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "@babel/core": "^7.13.14",
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
-    "@storybook/addon-a11y": "^6.2.1",
+    "@storybook/addon-a11y": "^6.2.2",
     "@storybook/addon-actions": "^6.2.2",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.2",
diff --git a/yarn.lock b/yarn.lock
index 6685cfc2664a..734dac89772b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2088,19 +2088,19 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@storybook/addon-a11y@^6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.1.tgz#e55867b3e55d79aaeea87cc54faa0bdff44ff95f"
-  integrity sha512-NBBwtiJOgGEgwCYx9H+peREB1mjJGv3WnLTNewsQQCZ8pRSrhpXPFUYhd0vXq0SXQEjX6xWciAp5lEDzmvzl8Q==
-  dependencies:
-    "@storybook/addons" "6.2.1"
-    "@storybook/api" "6.2.1"
-    "@storybook/channels" "6.2.1"
-    "@storybook/client-api" "6.2.1"
-    "@storybook/client-logger" "6.2.1"
-    "@storybook/components" "6.2.1"
-    "@storybook/core-events" "6.2.1"
-    "@storybook/theming" "6.2.1"
+"@storybook/addon-a11y@^6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.2.tgz#76f7a5f402ffce8c9516f8176f9d84780aebfd27"
+  integrity sha512-9oAv40wCbP7H+2e2wbR1ElM5dvlIvaRuJ8NIuEkf5nqKujIoveams1ZF11DHYiIJy3kNNkLGpGG8fyoRJ37law==
+  dependencies:
+    "@storybook/addons" "6.2.2"
+    "@storybook/api" "6.2.2"
+    "@storybook/channels" "6.2.2"
+    "@storybook/client-api" "6.2.2"
+    "@storybook/client-logger" "6.2.2"
+    "@storybook/components" "6.2.2"
+    "@storybook/core-events" "6.2.2"
+    "@storybook/theming" "6.2.2"
     axe-core "^4.1.1"
     core-js "^3.8.2"
     global "^4.4.0"
@@ -2313,21 +2313,6 @@
     global "^4.3.2"
     regenerator-runtime "^0.13.7"
 
-"@storybook/addons@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.1.tgz#7f1c7042912b82023e4dfc08f31c4149d90800bd"
-  integrity sha512-HqrpqF+XMnqAJHhN6Te7YYR3Gjcj7Js9bO59jd5AQQ96PBoQ6k5I/tCmripvWVxdak4UfI2p4zn6x7Kkw5bHxA==
-  dependencies:
-    "@storybook/api" "6.2.1"
-    "@storybook/channels" "6.2.1"
-    "@storybook/client-logger" "6.2.1"
-    "@storybook/core-events" "6.2.1"
-    "@storybook/router" "6.2.1"
-    "@storybook/theming" "6.2.1"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    regenerator-runtime "^0.13.7"
-
 "@storybook/addons@6.2.2":
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.2.tgz#d0ad3fa05e1569264511b8f8fb1fd08324e776a2"
@@ -2368,32 +2353,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/api@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.1.tgz#e76b6c31578089f0df06fd67486d9bc7d2eca4c1"
-  integrity sha512-W5H5FExLExCbj67OAQYRopeTdADuHOUgQiMoeoYSckdyWQl5DJb2l85yDlr0auZNYbjFHzJqEOs0Loch/NNlYA==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/channels" "6.2.1"
-    "@storybook/client-logger" "6.2.1"
-    "@storybook/core-events" "6.2.1"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.1"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.1"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.12.0"
-    telejson "^5.1.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@6.2.2":
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.2.tgz#021a6d89bef42fb9ec49c3fca9293b8be47298fa"
@@ -2433,19 +2392,6 @@
     qs "^6.6.0"
     telejson "^5.0.2"
 
-"@storybook/channel-postmessage@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.1.tgz#9bb22ef776c315ad09caf1a149fbe16496593821"
-  integrity sha512-6AXxq8QvUzO7OI4qENux2zFiK+n9pVDDRdazZPesWYaD11jrnh7IGMYwa9a3mbVWJchVwc6b74uWUOmvMhG0cQ==
-  dependencies:
-    "@storybook/channels" "6.2.1"
-    "@storybook/client-logger" "6.2.1"
-    "@storybook/core-events" "6.2.1"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    qs "^6.10.0"
-    telejson "^5.1.0"
-
 "@storybook/channel-postmessage@6.2.2":
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.2.tgz#e7dc119d7f8937ac26ef4b5591e8ce9a28f8c9ed"
@@ -2468,15 +2414,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channels@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.1.tgz#3b9f4164dddbb5a2b1628adfaeb0e7c1321d2a1b"
-  integrity sha512-p0QopD9JFIAYkDuVqqmpObcE4apnIZUG9bccRX2yNYCaNrRl3zalV4zDY/2TiwgoFOV2ydKPKdK2ZJcDY5JItg==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/channels@6.2.2":
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.2.tgz#502d1fc083559f8ed39f499557523178572798c2"
@@ -2510,30 +2447,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-api@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.1.tgz#21433c9b9baa019bd0bcdcf7f9f96e7e7058bfdf"
-  integrity sha512-ABl83n8F1F5fsjlxcpqWMYP9HDT7stkLKCIkN4zIC0uHWMHtWOYyJzJl166nv+nLjHiQdw+kimgA2jiKQfoF3Q==
-  dependencies:
-    "@storybook/addons" "6.2.1"
-    "@storybook/channel-postmessage" "6.2.1"
-    "@storybook/channels" "6.2.1"
-    "@storybook/client-logger" "6.2.1"
-    "@storybook/core-events" "6.2.1"
-    "@storybook/csf" "0.0.1"
-    "@types/qs" "^6.9.5"
-    "@types/webpack-env" "^1.16.0"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    stable "^0.1.8"
-    store2 "^2.12.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-api@6.2.2":
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.2.tgz#cc96c08c8ac1959d37225a6657adc14e6f58f790"
@@ -2566,14 +2479,6 @@
     core-js "^3.0.1"
     global "^4.3.2"
 
-"@storybook/client-logger@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.1.tgz#6fb8b39309cdaf6fd431bfe0fe11e4454afc910e"
-  integrity sha512-VDdSaM9MRiiFQF545GFgNJNb6hMC+JHjiV0cfJ3adrs021JE/J3d6Nc8Kn/XcpcX2cFrQsbffrOGaCAWAIllNg==
-  dependencies:
-    core-js "^3.8.2"
-    global "^4.4.0"
-
 "@storybook/client-logger@6.2.2":
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.2.tgz#953cc977dd428e484db7e1f09f46505fa6567155"
@@ -2609,36 +2514,6 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/components@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.1.tgz#da664c075844be49637c8d0b153f5a30cad68f20"
-  integrity sha512-pptXdgifINkc8K0yp55lOlqQywAyAwkuQVXAhbSGZriLn2kT6ei0GElJaEftcGlciOAUvi9H0rvcIvCAlxiPRQ==
-  dependencies:
-    "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.2.1"
-    "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.2.1"
-    "@types/color-convert" "^2.0.0"
-    "@types/overlayscrollbars" "^1.12.0"
-    "@types/react-syntax-highlighter" "11.0.5"
-    color-convert "^2.0.1"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    markdown-to-jsx "^7.1.0"
-    memoizerific "^1.11.3"
-    overlayscrollbars "^1.13.1"
-    polished "^4.0.5"
-    prop-types "^15.7.2"
-    react-colorful "^5.0.1"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.3"
-    react-textarea-autosize "^8.3.0"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/components@6.2.2":
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.2.tgz#e17a3723146e1f30d35ac6f9da7e70451a88c9c9"
@@ -2676,13 +2551,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.1.tgz#54e41fde06e07d4518e18857bc0ecf0f8d9c79c2"
-  integrity sha512-zZyVkCOQX52n0++/2ui3os6G7CSS0APqG+AlOhu8vF1O+NOknkYSTDPVncFcoWCHnWsS9ANcMwkRRGCocFKD6g==
-  dependencies:
-    core-js "^3.8.2"
-
 "@storybook/core-events@6.2.2":
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.2.tgz#9ecc42a645048ac386748ca659c196f2000146a7"
@@ -2885,22 +2753,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/router@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.1.tgz#45a40a13c0cbae54ac4034e3d461d0e9a3f80bcb"
-  integrity sha512-gG4c7NB/z/8zaJjkMFPA4jzENFPg+eywzHK6deuja3iXiEHLd/O0nqwQh1jzxOXLNMWjrCrGm/TTOrz8LbO5Lw==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/client-logger" "6.2.1"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/router@6.2.2":
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.2.tgz#8e0983b8c7c9f777ea3d3c5467910c6f7202f3cb"
@@ -2960,24 +2812,6 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/theming@6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.1.tgz#ad0ebc0a22560b775eca691b5e72c9db235eaf07"
-  integrity sha512-4sX3Qy6mgYlWpJcJx3AmMfzXhj/o/lVpux9MdhNDRFkDU958k7NhoSdny3ahg59C9t7yQ4chakZynKLgnVkFTA==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.2.1"
-    core-js "^3.8.2"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.27"
-    global "^4.4.0"
-    memoizerific "^1.11.3"
-    polished "^4.0.5"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/theming@6.2.2":
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.2.tgz#db44ab207f9109c697b8ea95dfab829279e2525a"

From 0e767b5d4899fec3da2ad6be3c5f3385ea572e32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 10:10:08 +0000
Subject: [PATCH 135/288] build(deps-dev): bump @storybook/node-logger from
 6.2.1 to 6.2.2 (#3442)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d04978f36707..f66d505db85a 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@storybook/addon-actions": "^6.2.2",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.2",
-    "@storybook/node-logger": "^6.2.1",
+    "@storybook/node-logger": "^6.2.2",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
     "@testing-library/react": "^11.2.6",
diff --git a/yarn.lock b/yarn.lock
index 734dac89772b..f25b1e57cf99 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2683,10 +2683,10 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/node-logger@^6.2.1":
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.1.tgz#80afe89a3f85e2329c46d530f4690a13d30c7c29"
-  integrity sha512-PuyLORwbvs6uB6dzbY+Uvs/LUW94yD5sbarNGIg866lIzhNT6nZOCRkiEgo7+RD1/mcMz0Lho0kh5Hob2Y5mqQ==
+"@storybook/node-logger@^6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.2.tgz#248350f593bcf3bd0cf4835b3f30a33cfb0b0086"
+  integrity sha512-TRS1ncau78k0oNUZyf8ozLgpNsXvz6K65hptswrW8PYbE+nsxOHQSb9+Rr9lq8xjV9KGO8qeODolZwreaB/1Sw==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^4.1.0"

From b6646bf6b9f9ede57d735bbc114141de4814f3c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Apr 2021 05:54:01 +0000
Subject: [PATCH 136/288] build(deps-dev): bump @storybook/node-logger from
 6.2.2 to 6.2.3 (#3449)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f66d505db85a..9da77d7078c9 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@storybook/addon-actions": "^6.2.2",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.2",
-    "@storybook/node-logger": "^6.2.2",
+    "@storybook/node-logger": "^6.2.3",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
     "@testing-library/react": "^11.2.6",
diff --git a/yarn.lock b/yarn.lock
index f25b1e57cf99..16ab8d4955e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2683,10 +2683,10 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/node-logger@^6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.2.tgz#248350f593bcf3bd0cf4835b3f30a33cfb0b0086"
-  integrity sha512-TRS1ncau78k0oNUZyf8ozLgpNsXvz6K65hptswrW8PYbE+nsxOHQSb9+Rr9lq8xjV9KGO8qeODolZwreaB/1Sw==
+"@storybook/node-logger@^6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.3.tgz#3f169747a1e871cd048da79c02d4f1bdc27ff485"
+  integrity sha512-NwKVqfRyscoElY3vKF2KRVXng4NMmPIJF11ddpWJfZ2+ojGHHaFKUKZy0iZrUkTZpv/0o5VtR3K/vU+2ZVWTKw==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^4.1.0"

From 44685670667e16e3bbeac9e3b4197ff6fe75387c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Apr 2021 05:57:49 +0000
Subject: [PATCH 137/288] build(deps-dev): bump @storybook/addon-a11y from
 6.2.2 to 6.2.3 (#3452)

---
 package.json |   2 +-
 yarn.lock    | 192 +++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 180 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 9da77d7078c9..657ac5d81db6 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "@babel/core": "^7.13.14",
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
-    "@storybook/addon-a11y": "^6.2.2",
+    "@storybook/addon-a11y": "^6.2.3",
     "@storybook/addon-actions": "^6.2.2",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.2",
diff --git a/yarn.lock b/yarn.lock
index 16ab8d4955e4..bbbf573d4b44 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2088,19 +2088,19 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@storybook/addon-a11y@^6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.2.tgz#76f7a5f402ffce8c9516f8176f9d84780aebfd27"
-  integrity sha512-9oAv40wCbP7H+2e2wbR1ElM5dvlIvaRuJ8NIuEkf5nqKujIoveams1ZF11DHYiIJy3kNNkLGpGG8fyoRJ37law==
-  dependencies:
-    "@storybook/addons" "6.2.2"
-    "@storybook/api" "6.2.2"
-    "@storybook/channels" "6.2.2"
-    "@storybook/client-api" "6.2.2"
-    "@storybook/client-logger" "6.2.2"
-    "@storybook/components" "6.2.2"
-    "@storybook/core-events" "6.2.2"
-    "@storybook/theming" "6.2.2"
+"@storybook/addon-a11y@^6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.3.tgz#c725557e1d78955f363858c67f958e0cdf3d1a7f"
+  integrity sha512-PF8N+xFg7rCENwT8h9DTWFBZGiS3FcVz+OyUVnrklpkndu9DCUYU8JNYKQgXB8217Fk10/o9tVWVmBeHUr6psQ==
+  dependencies:
+    "@storybook/addons" "6.2.3"
+    "@storybook/api" "6.2.3"
+    "@storybook/channels" "6.2.3"
+    "@storybook/client-api" "6.2.3"
+    "@storybook/client-logger" "6.2.3"
+    "@storybook/components" "6.2.3"
+    "@storybook/core-events" "6.2.3"
+    "@storybook/theming" "6.2.3"
     axe-core "^4.1.1"
     core-js "^3.8.2"
     global "^4.4.0"
@@ -2328,6 +2328,21 @@
     global "^4.4.0"
     regenerator-runtime "^0.13.7"
 
+"@storybook/addons@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.3.tgz#070ae8717fb2b8f9d25adb7ea3a6fe69ce77dee3"
+  integrity sha512-IQ4JUalGm53KJ3DtbpsmFsTRNdEHY3AhyVF1xXu6PeO8IDAPQ+yD7hBBR23ZwkBiqmPoq272Y0e/MK64H4fTaA==
+  dependencies:
+    "@storybook/api" "6.2.3"
+    "@storybook/channels" "6.2.3"
+    "@storybook/client-logger" "6.2.3"
+    "@storybook/core-events" "6.2.3"
+    "@storybook/router" "6.2.3"
+    "@storybook/theming" "6.2.3"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    regenerator-runtime "^0.13.7"
+
 "@storybook/api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.21.tgz#be753ca8d3602efe4a11783c81c689463bee0825"
@@ -2379,6 +2394,32 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.3.tgz#87121c2c144bad3924a2a28b6272c228440a693f"
+  integrity sha512-DZwttOQ2AqiR32y/oVy45QcGgY4WlK/vH/NgvwPEJk1VfvlOrLCGa7rFjcZxXrgXM5jPRbgDXThnHPG/em/DPg==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/channels" "6.2.3"
+    "@storybook/client-logger" "6.2.3"
+    "@storybook/core-events" "6.2.3"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "6.2.3"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.3"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    store2 "^2.12.0"
+    telejson "^5.1.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.1.21.tgz#acce71833499dba4c4e686de09f5b281a3239842"
@@ -2405,6 +2446,19 @@
     qs "^6.10.0"
     telejson "^5.1.0"
 
+"@storybook/channel-postmessage@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.3.tgz#77872d69a3833e792d7c539ba10fa19ac52554aa"
+  integrity sha512-h7E1OrKKoKNkC0NINr0vbFHPSh1jDfYm5c2WTwKLyGo/zM1wrYzx1Hkj2lPrgKNBt0xQfzmrnY1tfV5Tr1TMIQ==
+  dependencies:
+    "@storybook/channels" "6.2.3"
+    "@storybook/client-logger" "6.2.3"
+    "@storybook/core-events" "6.2.3"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    qs "^6.10.0"
+    telejson "^5.1.0"
+
 "@storybook/channels@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.1.21.tgz#adbfae5f4767234c5b17d9578be983584dddead4"
@@ -2423,6 +2477,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/channels@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.3.tgz#b4a55a9de8ab8a8153a4a4e09ff1f127ad85b88f"
+  integrity sha512-TTzq5VqZK4/sOKDsq7ZoqpSLQsp16HDTP5ovVXFWxyAlk66E57tWiYnjQy/uXwZDEwzfQEGUsCED3/rFxbvwqg==
+  dependencies:
+    core-js "^3.8.2"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.1.21.tgz#c9f72bbc9bf9d12cc931eb824f6912173c73b0b3"
@@ -2471,6 +2534,30 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.3.tgz#f35f6ff53b1d810f8a86d900898d8648a747ad10"
+  integrity sha512-Gcd1ydpXH7+S8B0GAkiwIfo1bgr00hs2pGzpwDO/5LGIXHwUojpX20nLBVOZ6uBZs/IwCT/FVWK2jakdPl9ISg==
+  dependencies:
+    "@storybook/addons" "6.2.3"
+    "@storybook/channel-postmessage" "6.2.3"
+    "@storybook/channels" "6.2.3"
+    "@storybook/client-logger" "6.2.3"
+    "@storybook/core-events" "6.2.3"
+    "@storybook/csf" "0.0.1"
+    "@types/qs" "^6.9.5"
+    "@types/webpack-env" "^1.16.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    stable "^0.1.8"
+    store2 "^2.12.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.1.21.tgz#fe7d9e645ddb4eb9dc18fdacea24b4baf11bc6c9"
@@ -2487,6 +2574,14 @@
     core-js "^3.8.2"
     global "^4.4.0"
 
+"@storybook/client-logger@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.3.tgz#eab4ec32ee39f2eb915dc4c480c28ebcdf5f18fb"
+  integrity sha512-i4oB9EuKCj9V6l6sRSQ33RP4g3GBtSfRCho9AU+A10U4Yfn7emUllEchCz9s5QOhnSTtJXZ8Xk4tUmp/3YWkGQ==
+  dependencies:
+    core-js "^3.8.2"
+    global "^4.4.0"
+
 "@storybook/components@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.21.tgz#7b9bfd51e73c179654a114275e5073f494d2a005"
@@ -2544,6 +2639,36 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/components@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.3.tgz#2b3fbdc09152a5a47882a5cf9fbccd8557ae31e4"
+  integrity sha512-8STtn4oggc/JsIrRT3HbYwcRUC/6GcSd3Mk+tHYfor8IQ6Iu9bFIUcH7PJrk6d4Ah2aX8Fc0P31y2mlY/4tclw==
+  dependencies:
+    "@popperjs/core" "^2.6.0"
+    "@storybook/client-logger" "6.2.3"
+    "@storybook/csf" "0.0.1"
+    "@storybook/theming" "6.2.3"
+    "@types/color-convert" "^2.0.0"
+    "@types/overlayscrollbars" "^1.12.0"
+    "@types/react-syntax-highlighter" "11.0.5"
+    color-convert "^2.0.1"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    markdown-to-jsx "^7.1.0"
+    memoizerific "^1.11.3"
+    overlayscrollbars "^1.13.1"
+    polished "^4.0.5"
+    prop-types "^15.7.2"
+    react-colorful "^5.0.1"
+    react-popper-tooltip "^3.1.1"
+    react-syntax-highlighter "^13.5.3"
+    react-textarea-autosize "^8.3.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/core-events@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.1.21.tgz#11f537f78f8c73ba5e627b57b282a279793a3511"
@@ -2558,6 +2683,13 @@
   dependencies:
     core-js "^3.8.2"
 
+"@storybook/core-events@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.3.tgz#1420b80aa5f308c451899d24f9f8fa3c18271a72"
+  integrity sha512-mu8lmkCEghO4wKgm6OgmRGCf7KQ6PecOeMYFyM28RC/DNYIj+vs4dOfTz+7J1VWg/ATs8iTwo363V1Vrnnk85g==
+  dependencies:
+    core-js "^3.8.2"
+
 "@storybook/core@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.1.21.tgz#e4c9f5ab361e0c4690f2827a71308757f9d46395"
@@ -2769,6 +2901,22 @@
     qs "^6.10.0"
     ts-dedent "^2.0.0"
 
+"@storybook/router@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.3.tgz#14832c98b026df4bc0edf71fe9d4bb712f064877"
+  integrity sha512-npc8jODlVLLghPuU/2eFupuTb9mxW1PlaXa45J0HDZRoNRLBHpn/QzQhLdW/1iyfPRw6BRwtuL/vXQQ2OPvjeQ==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/client-logger" "6.2.3"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/semver@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
@@ -2830,6 +2978,24 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
+"@storybook/theming@6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.3.tgz#d2234d9b237d17e6349b40aebe83a3e75ee105be"
+  integrity sha512-vXzdZtpVqIB1HdeqPjdkYcLigAEtbojEZ5/P0qjvUpI6nNygy7xvtohxn9NWBTeamdXop9xXs0fi/VTiUAlr9Q==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@emotion/is-prop-valid" "^0.8.6"
+    "@emotion/styled" "^10.0.27"
+    "@storybook/client-logger" "6.2.3"
+    core-js "^3.8.2"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.27"
+    global "^4.4.0"
+    memoizerific "^1.11.3"
+    polished "^4.0.5"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/ui@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.1.21.tgz#bf7cac3ba9a6250f573fa1ba12d4592891d5ece2"

From 3d5eb1c8ec53a25870ec2129f5791dc935c515cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Apr 2021 08:32:20 +0000
Subject: [PATCH 138/288] build(deps-dev): bump @storybook/addon-actions from
 6.2.2 to 6.2.3 (#3450)

---
 package.json |  2 +-
 yarn.lock    | 87 ++++++----------------------------------------------
 2 files changed, 11 insertions(+), 78 deletions(-)

diff --git a/package.json b/package.json
index 657ac5d81db6..b97d607ac26b 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.2.3",
-    "@storybook/addon-actions": "^6.2.2",
+    "@storybook/addon-actions": "^6.2.3",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.2",
     "@storybook/node-logger": "^6.2.3",
diff --git a/yarn.lock b/yarn.lock
index bbbf573d4b44..71bee7ceaef3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2133,17 +2133,17 @@
     util-deprecate "^1.0.2"
     uuid "^8.0.0"
 
-"@storybook/addon-actions@^6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.2.tgz#4890a98b6263ddc8f7f91b4f90f991994ec0c02c"
-  integrity sha512-R8QlAMdbMxPNvz6RldIQP/1OPh3I9nUBcOqaw0i0pQb8HpcT2s2Lu/iO/pWjJBZ522AUOeVW5m+rrDifMMGZUQ==
+"@storybook/addon-actions@^6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.3.tgz#9d31843c4eb0f24c8d1dc891f5bebe577d117296"
+  integrity sha512-RXjTNH+YUYxnOzvfJ0NllJ3+jvb9R8kNq74bS9gDRvg5WY0SFIeN+Eh11wW3PJvmx15xO1+ALJjpCGRjcKzWiQ==
   dependencies:
-    "@storybook/addons" "6.2.2"
-    "@storybook/api" "6.2.2"
-    "@storybook/client-api" "6.2.2"
-    "@storybook/components" "6.2.2"
-    "@storybook/core-events" "6.2.2"
-    "@storybook/theming" "6.2.2"
+    "@storybook/addons" "6.2.3"
+    "@storybook/api" "6.2.3"
+    "@storybook/client-api" "6.2.3"
+    "@storybook/components" "6.2.3"
+    "@storybook/core-events" "6.2.3"
+    "@storybook/theming" "6.2.3"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
     global "^4.4.0"
@@ -2433,19 +2433,6 @@
     qs "^6.6.0"
     telejson "^5.0.2"
 
-"@storybook/channel-postmessage@6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.2.tgz#e7dc119d7f8937ac26ef4b5591e8ce9a28f8c9ed"
-  integrity sha512-m8cLGKYw9t2d14ZkHTaQnnd0HVrXagzQ16AKbbj7m8ZM1Qv7XFZnRcfxN+1nZ0W0OIRhMMCh9Xf14U1bLb5CTw==
-  dependencies:
-    "@storybook/channels" "6.2.2"
-    "@storybook/client-logger" "6.2.2"
-    "@storybook/core-events" "6.2.2"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    qs "^6.10.0"
-    telejson "^5.1.0"
-
 "@storybook/channel-postmessage@6.2.3":
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.3.tgz#77872d69a3833e792d7c539ba10fa19ac52554aa"
@@ -2510,30 +2497,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-api@6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.2.tgz#cc96c08c8ac1959d37225a6657adc14e6f58f790"
-  integrity sha512-HdWFmdMgOwR6JAbKGgxsJq0VmYkSCgpbeSmPkUMNCz8lufOekRGSyKELKvMsAVt/TSTP5vgQOrB1UC93HqCKGQ==
-  dependencies:
-    "@storybook/addons" "6.2.2"
-    "@storybook/channel-postmessage" "6.2.2"
-    "@storybook/channels" "6.2.2"
-    "@storybook/client-logger" "6.2.2"
-    "@storybook/core-events" "6.2.2"
-    "@storybook/csf" "0.0.1"
-    "@types/qs" "^6.9.5"
-    "@types/webpack-env" "^1.16.0"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    stable "^0.1.8"
-    store2 "^2.12.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-api@6.2.3":
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.3.tgz#f35f6ff53b1d810f8a86d900898d8648a747ad10"
@@ -2609,36 +2572,6 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/components@6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.2.tgz#e17a3723146e1f30d35ac6f9da7e70451a88c9c9"
-  integrity sha512-KfYKVHDRGUmQGA4+vSqy4Qc3imCTrGcZsXRgAMBtiFtXqtSruA6ZTFkqEjV2ab+9hksv06vpAHjxosMStFkX3g==
-  dependencies:
-    "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.2.2"
-    "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.2.2"
-    "@types/color-convert" "^2.0.0"
-    "@types/overlayscrollbars" "^1.12.0"
-    "@types/react-syntax-highlighter" "11.0.5"
-    color-convert "^2.0.1"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    markdown-to-jsx "^7.1.0"
-    memoizerific "^1.11.3"
-    overlayscrollbars "^1.13.1"
-    polished "^4.0.5"
-    prop-types "^15.7.2"
-    react-colorful "^5.0.1"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.3"
-    react-textarea-autosize "^8.3.0"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/components@6.2.3":
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.3.tgz#2b3fbdc09152a5a47882a5cf9fbccd8557ae31e4"

From 81efaa088954fed8f95a6f42aba9502566852627 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Apr 2021 08:42:31 +0000
Subject: [PATCH 139/288] build(deps-dev): bump @storybook/addon-links from
 6.2.2 to 6.2.3 (#3451)

---
 package.json |   2 +-
 yarn.lock    | 115 ++++-----------------------------------------------
 2 files changed, 9 insertions(+), 108 deletions(-)

diff --git a/package.json b/package.json
index b97d607ac26b..8d6db191d74b 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "@storybook/addon-a11y": "^6.2.3",
     "@storybook/addon-actions": "^6.2.3",
     "@storybook/addon-essentials": "^6.1.21",
-    "@storybook/addon-links": "^6.2.2",
+    "@storybook/addon-links": "^6.2.3",
     "@storybook/node-logger": "^6.2.3",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index 71bee7ceaef3..9b391f71fd40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2252,16 +2252,16 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-links@^6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.2.tgz#8677989ac54346282ada501a04c38c30ff172d45"
-  integrity sha512-+6BBsJ1rkmcAkhYqHAG1kMUnzaeIHGXRShev9dFhVh//q8wF+jrT93bcILdpFRueXciXb2cImbYTKN2hDdrzEA==
+"@storybook/addon-links@^6.2.3":
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.3.tgz#a94c38afef54f57402d2d936f41bcad12f6d5c36"
+  integrity sha512-V7Bxa/eQnbIqtJtu3vKsLJ4yXL3j8GutEVsKZVVUUs12ZDLWwkIZkNuHPqs946+CG3gDu1USLte/xCcsMr+7Wg==
   dependencies:
-    "@storybook/addons" "6.2.2"
-    "@storybook/client-logger" "6.2.2"
-    "@storybook/core-events" "6.2.2"
+    "@storybook/addons" "6.2.3"
+    "@storybook/client-logger" "6.2.3"
+    "@storybook/core-events" "6.2.3"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.2"
+    "@storybook/router" "6.2.3"
     "@types/qs" "^6.9.5"
     core-js "^3.8.2"
     global "^4.4.0"
@@ -2313,21 +2313,6 @@
     global "^4.3.2"
     regenerator-runtime "^0.13.7"
 
-"@storybook/addons@6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.2.tgz#d0ad3fa05e1569264511b8f8fb1fd08324e776a2"
-  integrity sha512-3FSnNl+0wzkeh3KVk+CB8bYb4FDRIEeFI0kU+UDj46PAXuqObQeIzPlpsU59D5Qq6zFXV+IhzLRknGrrMh1XzA==
-  dependencies:
-    "@storybook/api" "6.2.2"
-    "@storybook/channels" "6.2.2"
-    "@storybook/client-logger" "6.2.2"
-    "@storybook/core-events" "6.2.2"
-    "@storybook/router" "6.2.2"
-    "@storybook/theming" "6.2.2"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    regenerator-runtime "^0.13.7"
-
 "@storybook/addons@6.2.3":
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.3.tgz#070ae8717fb2b8f9d25adb7ea3a6fe69ce77dee3"
@@ -2368,32 +2353,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/api@6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.2.tgz#021a6d89bef42fb9ec49c3fca9293b8be47298fa"
-  integrity sha512-5BNspUVi5ZckYSWlmK55Ck2vNkZXW9klQtvxkLkf1fmuHdrjsDq5huVYJCNbHo8ngcrynR0Iynip7QZrQU0ylA==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/channels" "6.2.2"
-    "@storybook/client-logger" "6.2.2"
-    "@storybook/core-events" "6.2.2"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.2"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.2"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.12.0"
-    telejson "^5.1.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@6.2.3":
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.3.tgz#87121c2c144bad3924a2a28b6272c228440a693f"
@@ -2455,15 +2414,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channels@6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.2.tgz#502d1fc083559f8ed39f499557523178572798c2"
-  integrity sha512-lev2jJE45QmH+q40M8zsQMF7h8OjoBA7/Ir2RIUVshftuHlzME3L5Y9w5o/7LWdlhvZYBmhqqXv+iYusFo9yTA==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/channels@6.2.3":
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.3.tgz#b4a55a9de8ab8a8153a4a4e09ff1f127ad85b88f"
@@ -2529,14 +2479,6 @@
     core-js "^3.0.1"
     global "^4.3.2"
 
-"@storybook/client-logger@6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.2.tgz#953cc977dd428e484db7e1f09f46505fa6567155"
-  integrity sha512-tv8zKGBHCDg6mMOk4znCoiF9KUPtH02ksTrlJzJbTz5Jqc1OwBS8/O48TaeNtQcKcMfs92j9NK1aW6WFGU9o+w==
-  dependencies:
-    core-js "^3.8.2"
-    global "^4.4.0"
-
 "@storybook/client-logger@6.2.3":
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.3.tgz#eab4ec32ee39f2eb915dc4c480c28ebcdf5f18fb"
@@ -2609,13 +2551,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.2.tgz#9ecc42a645048ac386748ca659c196f2000146a7"
-  integrity sha512-29Xsu1cMwDXqtLQK+x2e4G//ppJCkEkPL0DISg2jD1ND04V7eaKubWq/kwsHtM8MKYJHxuxh4rSF7xb24EEPOA==
-  dependencies:
-    core-js "^3.8.2"
-
 "@storybook/core-events@6.2.3":
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.3.tgz#1420b80aa5f308c451899d24f9f8fa3c18271a72"
@@ -2818,22 +2753,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/router@6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.2.tgz#8e0983b8c7c9f777ea3d3c5467910c6f7202f3cb"
-  integrity sha512-K9ScTklpmZtLNbDsNSW8WyVRy7XuqeWJgw89+A7CRIk3fSk7+FvW8OeS7ZMKFWK5j18Mm6U0XPBP+d1mSw7Vlg==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/client-logger" "6.2.2"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/router@6.2.3":
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.3.tgz#14832c98b026df4bc0edf71fe9d4bb712f064877"
@@ -2893,24 +2812,6 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/theming@6.2.2":
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.2.tgz#db44ab207f9109c697b8ea95dfab829279e2525a"
-  integrity sha512-oqZkv5OD6ViIRiAdrUfTVxny1zjhvZGNtQFtTBBad0u8UA5ndIPSzz1dEvj1adfRlbX+Qn3J4ELU7L09pO4PWQ==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.2.2"
-    core-js "^3.8.2"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.27"
-    global "^4.4.0"
-    memoizerific "^1.11.3"
-    polished "^4.0.5"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/theming@6.2.3":
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.3.tgz#d2234d9b237d17e6349b40aebe83a3e75ee105be"

From 1afe9887eb0d329d8e75a971e94fadfc45114334 Mon Sep 17 00:00:00 2001
From: Hamish Willee <hamishwillee@gmail.com>
Date: Tue, 6 Apr 2021 18:58:53 +1000
Subject: [PATCH 140/288] GroupData.json - Add overview page link for
 Presentation API (#3448)

---
 kumascript/macros/GroupData.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kumascript/macros/GroupData.json b/kumascript/macros/GroupData.json
index 05d06b94a618..513e2064c7a1 100644
--- a/kumascript/macros/GroupData.json
+++ b/kumascript/macros/GroupData.json
@@ -1148,6 +1148,7 @@
       "events": ["Document: pointerlockchange", "Document: pointerlockerror"]
     },
     "Presentation API": {
+      "overview": ["Presentation API"],
       "interfaces": [
         "Presentation",
         "PresentationAvailability",

From 70c59b7fa04d3cab2a74edd707a0a2763fa63b91 Mon Sep 17 00:00:00 2001
From: Rachel Andrew <rachel.andrew@edgeofmyseat.com>
Date: Tue, 6 Apr 2021 17:26:49 +0100
Subject: [PATCH 141/288] Add the Badging API (#3455)

---
 kumascript/macros/SpecData.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kumascript/macros/SpecData.json b/kumascript/macros/SpecData.json
index 5e7903e5d520..ad3e4a2f3e46 100644
--- a/kumascript/macros/SpecData.json
+++ b/kumascript/macros/SpecData.json
@@ -69,6 +69,11 @@
     "url": "https://www.w3.org/TR/requestidlecallback/",
     "status": "PR"
   },
+  "Badging API": {
+    "name": "Badging API",
+    "url": "https://w3c.github.io/badging/",
+    "status": "Draft"
+  },
   "Barcode Detection API": {
     "name": "Accelerated Shape Detection in Images",
     "url": "https://wicg.github.io/shape-detection-api/",

From b36a3d0165e6a6b2876953391f441019fec1271e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Apr 2021 05:56:04 +0000
Subject: [PATCH 142/288] build(deps-dev): bump @storybook/node-logger from
 6.2.3 to 6.2.4 (#3458)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8d6db191d74b..4056ade7dd8b 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@storybook/addon-actions": "^6.2.3",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.3",
-    "@storybook/node-logger": "^6.2.3",
+    "@storybook/node-logger": "^6.2.4",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
     "@testing-library/react": "^11.2.6",
diff --git a/yarn.lock b/yarn.lock
index 9b391f71fd40..7c1bf2ddad29 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2683,10 +2683,10 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/node-logger@^6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.3.tgz#3f169747a1e871cd048da79c02d4f1bdc27ff485"
-  integrity sha512-NwKVqfRyscoElY3vKF2KRVXng4NMmPIJF11ddpWJfZ2+ojGHHaFKUKZy0iZrUkTZpv/0o5VtR3K/vU+2ZVWTKw==
+"@storybook/node-logger@^6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.4.tgz#d2058395b85977954af3c86bc26da7e03b8c2ffb"
+  integrity sha512-LyJuEAZlnouAUPqWEVngWUZzTbEE0rwZO+6YP8qRm3fT/S/0N4+FXscm8Zj1tQ9EhQurr6kvKLx55DhyvlUt0g==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^4.1.0"

From 47e0d2f6d6d28e69ac809a530225de96ed43f768 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Apr 2021 05:57:31 +0000
Subject: [PATCH 143/288] build(deps-dev): bump @storybook/addon-a11y from
 6.2.3 to 6.2.4 (#3460)

---
 package.json |   2 +-
 yarn.lock    | 192 +++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 180 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 4056ade7dd8b..d95ef175b037 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "@babel/core": "^7.13.14",
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
-    "@storybook/addon-a11y": "^6.2.3",
+    "@storybook/addon-a11y": "^6.2.4",
     "@storybook/addon-actions": "^6.2.3",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.3",
diff --git a/yarn.lock b/yarn.lock
index 7c1bf2ddad29..bf4fbae0f761 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2088,19 +2088,19 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@storybook/addon-a11y@^6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.3.tgz#c725557e1d78955f363858c67f958e0cdf3d1a7f"
-  integrity sha512-PF8N+xFg7rCENwT8h9DTWFBZGiS3FcVz+OyUVnrklpkndu9DCUYU8JNYKQgXB8217Fk10/o9tVWVmBeHUr6psQ==
-  dependencies:
-    "@storybook/addons" "6.2.3"
-    "@storybook/api" "6.2.3"
-    "@storybook/channels" "6.2.3"
-    "@storybook/client-api" "6.2.3"
-    "@storybook/client-logger" "6.2.3"
-    "@storybook/components" "6.2.3"
-    "@storybook/core-events" "6.2.3"
-    "@storybook/theming" "6.2.3"
+"@storybook/addon-a11y@^6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.4.tgz#2f9904ba92ac0e904c4d6404948d6c18e27c7f62"
+  integrity sha512-eQ28U7a6efnK7mtJT+NJs+zi3/F+feu0PdOjCqsaSu0SPfr9P6CdXokWSSnSH8Gx2G0iiJa9eYEajAiZd5v7wg==
+  dependencies:
+    "@storybook/addons" "6.2.4"
+    "@storybook/api" "6.2.4"
+    "@storybook/channels" "6.2.4"
+    "@storybook/client-api" "6.2.4"
+    "@storybook/client-logger" "6.2.4"
+    "@storybook/components" "6.2.4"
+    "@storybook/core-events" "6.2.4"
+    "@storybook/theming" "6.2.4"
     axe-core "^4.1.1"
     core-js "^3.8.2"
     global "^4.4.0"
@@ -2328,6 +2328,21 @@
     global "^4.4.0"
     regenerator-runtime "^0.13.7"
 
+"@storybook/addons@6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.4.tgz#187745f0dce9e322d8f6199329a5d1b9ead285fe"
+  integrity sha512-z1XwXfmRpFa8MDKQVGoBaBLtxo2v/5L8TFuJro6jK0UPmRBuo4RtDPwgCSizNAVieJx1qu5tjRylZPA3Xz8bBA==
+  dependencies:
+    "@storybook/api" "6.2.4"
+    "@storybook/channels" "6.2.4"
+    "@storybook/client-logger" "6.2.4"
+    "@storybook/core-events" "6.2.4"
+    "@storybook/router" "6.2.4"
+    "@storybook/theming" "6.2.4"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    regenerator-runtime "^0.13.7"
+
 "@storybook/api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.21.tgz#be753ca8d3602efe4a11783c81c689463bee0825"
@@ -2379,6 +2394,32 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.4.tgz#7e230c8e4c66834e43b13f08ea858865a2493888"
+  integrity sha512-7xA9bcfQHf+jw/tGPqoK3RZ8csySHiyvnHo4WvDF5Ar9rQNw1kIZdHa4VB82vhsNp9nQIA3AVIhRGZj0V0Zntw==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/channels" "6.2.4"
+    "@storybook/client-logger" "6.2.4"
+    "@storybook/core-events" "6.2.4"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "6.2.4"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.4"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    store2 "^2.12.0"
+    telejson "^5.1.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.1.21.tgz#acce71833499dba4c4e686de09f5b281a3239842"
@@ -2405,6 +2446,19 @@
     qs "^6.10.0"
     telejson "^5.1.0"
 
+"@storybook/channel-postmessage@6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.4.tgz#2ce6ba304b5f696eec2eb7ff8a32e44f0440d889"
+  integrity sha512-UC3+TPsjnP0b6VArJaKT7zgfmSZCO0v4lrGSiQoXM372mzDJAFSKLNYAIDL5er+xfO30i7TA1CyI95l+EG3cgQ==
+  dependencies:
+    "@storybook/channels" "6.2.4"
+    "@storybook/client-logger" "6.2.4"
+    "@storybook/core-events" "6.2.4"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    qs "^6.10.0"
+    telejson "^5.1.0"
+
 "@storybook/channels@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.1.21.tgz#adbfae5f4767234c5b17d9578be983584dddead4"
@@ -2423,6 +2477,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/channels@6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.4.tgz#8206610941a5b44beec921d1c900bd2ff13b46c6"
+  integrity sha512-8WuiSz0zbqEOKg2uMV34TnSDMmEvU/LpdiCyjh9IpxuL5+CP+xTp3ATZNbJdy2YND7GIkwopoRvsO/Kq1V1SnQ==
+  dependencies:
+    core-js "^3.8.2"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.1.21.tgz#c9f72bbc9bf9d12cc931eb824f6912173c73b0b3"
@@ -2471,6 +2534,30 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.4.tgz#47b83155d7ab0eb47f9260221f426127e21d7651"
+  integrity sha512-7ZSuzOyGOwqV9HVODEyQ6wwdzk9Nz6l99erj3m2Kb4BTi1SKZM/rqOtpOo8NJIIPRJn8pITc2AvvwsC7YquSVw==
+  dependencies:
+    "@storybook/addons" "6.2.4"
+    "@storybook/channel-postmessage" "6.2.4"
+    "@storybook/channels" "6.2.4"
+    "@storybook/client-logger" "6.2.4"
+    "@storybook/core-events" "6.2.4"
+    "@storybook/csf" "0.0.1"
+    "@types/qs" "^6.9.5"
+    "@types/webpack-env" "^1.16.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    stable "^0.1.8"
+    store2 "^2.12.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.1.21.tgz#fe7d9e645ddb4eb9dc18fdacea24b4baf11bc6c9"
@@ -2487,6 +2574,14 @@
     core-js "^3.8.2"
     global "^4.4.0"
 
+"@storybook/client-logger@6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.4.tgz#d64ead905518fadfd30dbb322a982aac8ef5b5f9"
+  integrity sha512-1ECiM+XOys4eIH/spslc2scmuhrpEa9xypr4lqVHnltN+Jlai6BJRgXalgity4ml0RHIn7rSB+SN7BgrRmGuxg==
+  dependencies:
+    core-js "^3.8.2"
+    global "^4.4.0"
+
 "@storybook/components@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.21.tgz#7b9bfd51e73c179654a114275e5073f494d2a005"
@@ -2544,6 +2639,36 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/components@6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.4.tgz#3c0d71dc05bca98d37de09c5b8989653cdbdfa14"
+  integrity sha512-M1sRzlvFdrAqEoKAFn7Ekk2Sp7NIbYIksCD9o/cAqCWRQHw3uCVTvM8tWzpspn/6pz0i1E2BnXOYv8HePBMrtQ==
+  dependencies:
+    "@popperjs/core" "^2.6.0"
+    "@storybook/client-logger" "6.2.4"
+    "@storybook/csf" "0.0.1"
+    "@storybook/theming" "6.2.4"
+    "@types/color-convert" "^2.0.0"
+    "@types/overlayscrollbars" "^1.12.0"
+    "@types/react-syntax-highlighter" "11.0.5"
+    color-convert "^2.0.1"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    markdown-to-jsx "^7.1.0"
+    memoizerific "^1.11.3"
+    overlayscrollbars "^1.13.1"
+    polished "^4.0.5"
+    prop-types "^15.7.2"
+    react-colorful "^5.0.1"
+    react-popper-tooltip "^3.1.1"
+    react-syntax-highlighter "^13.5.3"
+    react-textarea-autosize "^8.3.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/core-events@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.1.21.tgz#11f537f78f8c73ba5e627b57b282a279793a3511"
@@ -2558,6 +2683,13 @@
   dependencies:
     core-js "^3.8.2"
 
+"@storybook/core-events@6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.4.tgz#739638777c3625e4ab4e48346546aebb43d8e12a"
+  integrity sha512-g71IzuvmIPNZ/V4JYbfJO0vvKDgi1YM1Oud7UnZ7fHoyJi8DvmZoa97vEppYPumF2zdw7KI/1NIOYHOSjnwwvw==
+  dependencies:
+    core-js "^3.8.2"
+
 "@storybook/core@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.1.21.tgz#e4c9f5ab361e0c4690f2827a71308757f9d46395"
@@ -2769,6 +2901,22 @@
     qs "^6.10.0"
     ts-dedent "^2.0.0"
 
+"@storybook/router@6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.4.tgz#a5b8480432b7e77b61e5f4347d28093f5621fab8"
+  integrity sha512-Idt0uaj2vcKa68nQotwazG6GmL6x+zhWxTIM7IZrLVFHxzjAo5Ou0SkU09C4FwqEByxPclRFMYzLu91TM6tmFQ==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/client-logger" "6.2.4"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/semver@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
@@ -2830,6 +2978,24 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
+"@storybook/theming@6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.4.tgz#9c4f252fa338726e3a7e88660432b5739d6ce94f"
+  integrity sha512-2KmHMhK9HOrDt5kbItclB9+X0tXgpNMGzs6hMz5syq96zZRQdkoqZG6eA+sDhsscuvzjRn0FH7vfUbNX4IqAKw==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@emotion/is-prop-valid" "^0.8.6"
+    "@emotion/styled" "^10.0.27"
+    "@storybook/client-logger" "6.2.4"
+    core-js "^3.8.2"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.27"
+    global "^4.4.0"
+    memoizerific "^1.11.3"
+    polished "^4.0.5"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/ui@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.1.21.tgz#bf7cac3ba9a6250f573fa1ba12d4592891d5ece2"

From 69f20dc081a258ee5a82b814e436c0442d5468ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Apr 2021 08:27:30 +0000
Subject: [PATCH 144/288] build(deps-dev): bump @storybook/addon-links from
 6.2.3 to 6.2.4 (#3461)

---
 package.json |  2 +-
 yarn.lock    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index d95ef175b037..f0b6732e455b 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "@storybook/addon-a11y": "^6.2.4",
     "@storybook/addon-actions": "^6.2.3",
     "@storybook/addon-essentials": "^6.1.21",
-    "@storybook/addon-links": "^6.2.3",
+    "@storybook/addon-links": "^6.2.4",
     "@storybook/node-logger": "^6.2.4",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index bf4fbae0f761..b71e36bffa6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2252,16 +2252,16 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-links@^6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.3.tgz#a94c38afef54f57402d2d936f41bcad12f6d5c36"
-  integrity sha512-V7Bxa/eQnbIqtJtu3vKsLJ4yXL3j8GutEVsKZVVUUs12ZDLWwkIZkNuHPqs946+CG3gDu1USLte/xCcsMr+7Wg==
+"@storybook/addon-links@^6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.4.tgz#a704c0d02a598a02e3c32a7076cd39c9e097efe6"
+  integrity sha512-nsYdqmckWNOtY1EDS4bY7T6pDw8/83pkMeOcB330XKvyUlWGlTCIvt+6iX+zbZGGVu+Fp0yMbNI9g7yf18jvhQ==
   dependencies:
-    "@storybook/addons" "6.2.3"
-    "@storybook/client-logger" "6.2.3"
-    "@storybook/core-events" "6.2.3"
+    "@storybook/addons" "6.2.4"
+    "@storybook/client-logger" "6.2.4"
+    "@storybook/core-events" "6.2.4"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.3"
+    "@storybook/router" "6.2.4"
     "@types/qs" "^6.9.5"
     core-js "^3.8.2"
     global "^4.4.0"

From ed4290303a837f2974d86f7c6c98e89a8134e895 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Apr 2021 08:36:30 +0000
Subject: [PATCH 145/288] build(deps-dev): bump @storybook/addon-actions from
 6.2.3 to 6.2.4 (#3459)

---
 package.json |   2 +-
 yarn.lock    | 188 +++------------------------------------------------
 2 files changed, 12 insertions(+), 178 deletions(-)

diff --git a/package.json b/package.json
index f0b6732e455b..09bd79a5aaf0 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.2.4",
-    "@storybook/addon-actions": "^6.2.3",
+    "@storybook/addon-actions": "^6.2.4",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.4",
     "@storybook/node-logger": "^6.2.4",
diff --git a/yarn.lock b/yarn.lock
index b71e36bffa6f..ec24dc1247e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2133,17 +2133,17 @@
     util-deprecate "^1.0.2"
     uuid "^8.0.0"
 
-"@storybook/addon-actions@^6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.3.tgz#9d31843c4eb0f24c8d1dc891f5bebe577d117296"
-  integrity sha512-RXjTNH+YUYxnOzvfJ0NllJ3+jvb9R8kNq74bS9gDRvg5WY0SFIeN+Eh11wW3PJvmx15xO1+ALJjpCGRjcKzWiQ==
-  dependencies:
-    "@storybook/addons" "6.2.3"
-    "@storybook/api" "6.2.3"
-    "@storybook/client-api" "6.2.3"
-    "@storybook/components" "6.2.3"
-    "@storybook/core-events" "6.2.3"
-    "@storybook/theming" "6.2.3"
+"@storybook/addon-actions@^6.2.4":
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.4.tgz#dfd4027449c8e9c2d0606c905f6237590870d054"
+  integrity sha512-RAGqZwJ2wXTQ0uZ4R4j/S6Aur7JjdS8oZoQNVzSR2N6QmRVL2L2vySRoJhS964D6NJnJp0FOXTiXw9SkYKiyUg==
+  dependencies:
+    "@storybook/addons" "6.2.4"
+    "@storybook/api" "6.2.4"
+    "@storybook/client-api" "6.2.4"
+    "@storybook/components" "6.2.4"
+    "@storybook/core-events" "6.2.4"
+    "@storybook/theming" "6.2.4"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
     global "^4.4.0"
@@ -2313,21 +2313,6 @@
     global "^4.3.2"
     regenerator-runtime "^0.13.7"
 
-"@storybook/addons@6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.3.tgz#070ae8717fb2b8f9d25adb7ea3a6fe69ce77dee3"
-  integrity sha512-IQ4JUalGm53KJ3DtbpsmFsTRNdEHY3AhyVF1xXu6PeO8IDAPQ+yD7hBBR23ZwkBiqmPoq272Y0e/MK64H4fTaA==
-  dependencies:
-    "@storybook/api" "6.2.3"
-    "@storybook/channels" "6.2.3"
-    "@storybook/client-logger" "6.2.3"
-    "@storybook/core-events" "6.2.3"
-    "@storybook/router" "6.2.3"
-    "@storybook/theming" "6.2.3"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    regenerator-runtime "^0.13.7"
-
 "@storybook/addons@6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.4.tgz#187745f0dce9e322d8f6199329a5d1b9ead285fe"
@@ -2368,32 +2353,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/api@6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.3.tgz#87121c2c144bad3924a2a28b6272c228440a693f"
-  integrity sha512-DZwttOQ2AqiR32y/oVy45QcGgY4WlK/vH/NgvwPEJk1VfvlOrLCGa7rFjcZxXrgXM5jPRbgDXThnHPG/em/DPg==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/channels" "6.2.3"
-    "@storybook/client-logger" "6.2.3"
-    "@storybook/core-events" "6.2.3"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.3"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.3"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.12.0"
-    telejson "^5.1.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.4.tgz#7e230c8e4c66834e43b13f08ea858865a2493888"
@@ -2433,19 +2392,6 @@
     qs "^6.6.0"
     telejson "^5.0.2"
 
-"@storybook/channel-postmessage@6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.3.tgz#77872d69a3833e792d7c539ba10fa19ac52554aa"
-  integrity sha512-h7E1OrKKoKNkC0NINr0vbFHPSh1jDfYm5c2WTwKLyGo/zM1wrYzx1Hkj2lPrgKNBt0xQfzmrnY1tfV5Tr1TMIQ==
-  dependencies:
-    "@storybook/channels" "6.2.3"
-    "@storybook/client-logger" "6.2.3"
-    "@storybook/core-events" "6.2.3"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    qs "^6.10.0"
-    telejson "^5.1.0"
-
 "@storybook/channel-postmessage@6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.4.tgz#2ce6ba304b5f696eec2eb7ff8a32e44f0440d889"
@@ -2468,15 +2414,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channels@6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.3.tgz#b4a55a9de8ab8a8153a4a4e09ff1f127ad85b88f"
-  integrity sha512-TTzq5VqZK4/sOKDsq7ZoqpSLQsp16HDTP5ovVXFWxyAlk66E57tWiYnjQy/uXwZDEwzfQEGUsCED3/rFxbvwqg==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/channels@6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.4.tgz#8206610941a5b44beec921d1c900bd2ff13b46c6"
@@ -2510,30 +2447,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-api@6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.3.tgz#f35f6ff53b1d810f8a86d900898d8648a747ad10"
-  integrity sha512-Gcd1ydpXH7+S8B0GAkiwIfo1bgr00hs2pGzpwDO/5LGIXHwUojpX20nLBVOZ6uBZs/IwCT/FVWK2jakdPl9ISg==
-  dependencies:
-    "@storybook/addons" "6.2.3"
-    "@storybook/channel-postmessage" "6.2.3"
-    "@storybook/channels" "6.2.3"
-    "@storybook/client-logger" "6.2.3"
-    "@storybook/core-events" "6.2.3"
-    "@storybook/csf" "0.0.1"
-    "@types/qs" "^6.9.5"
-    "@types/webpack-env" "^1.16.0"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    stable "^0.1.8"
-    store2 "^2.12.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-api@6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.4.tgz#47b83155d7ab0eb47f9260221f426127e21d7651"
@@ -2566,14 +2479,6 @@
     core-js "^3.0.1"
     global "^4.3.2"
 
-"@storybook/client-logger@6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.3.tgz#eab4ec32ee39f2eb915dc4c480c28ebcdf5f18fb"
-  integrity sha512-i4oB9EuKCj9V6l6sRSQ33RP4g3GBtSfRCho9AU+A10U4Yfn7emUllEchCz9s5QOhnSTtJXZ8Xk4tUmp/3YWkGQ==
-  dependencies:
-    core-js "^3.8.2"
-    global "^4.4.0"
-
 "@storybook/client-logger@6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.4.tgz#d64ead905518fadfd30dbb322a982aac8ef5b5f9"
@@ -2609,36 +2514,6 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/components@6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.3.tgz#2b3fbdc09152a5a47882a5cf9fbccd8557ae31e4"
-  integrity sha512-8STtn4oggc/JsIrRT3HbYwcRUC/6GcSd3Mk+tHYfor8IQ6Iu9bFIUcH7PJrk6d4Ah2aX8Fc0P31y2mlY/4tclw==
-  dependencies:
-    "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.2.3"
-    "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.2.3"
-    "@types/color-convert" "^2.0.0"
-    "@types/overlayscrollbars" "^1.12.0"
-    "@types/react-syntax-highlighter" "11.0.5"
-    color-convert "^2.0.1"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    markdown-to-jsx "^7.1.0"
-    memoizerific "^1.11.3"
-    overlayscrollbars "^1.13.1"
-    polished "^4.0.5"
-    prop-types "^15.7.2"
-    react-colorful "^5.0.1"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.3"
-    react-textarea-autosize "^8.3.0"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/components@6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.4.tgz#3c0d71dc05bca98d37de09c5b8989653cdbdfa14"
@@ -2676,13 +2551,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.3.tgz#1420b80aa5f308c451899d24f9f8fa3c18271a72"
-  integrity sha512-mu8lmkCEghO4wKgm6OgmRGCf7KQ6PecOeMYFyM28RC/DNYIj+vs4dOfTz+7J1VWg/ATs8iTwo363V1Vrnnk85g==
-  dependencies:
-    core-js "^3.8.2"
-
 "@storybook/core-events@6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.4.tgz#739638777c3625e4ab4e48346546aebb43d8e12a"
@@ -2885,22 +2753,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/router@6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.3.tgz#14832c98b026df4bc0edf71fe9d4bb712f064877"
-  integrity sha512-npc8jODlVLLghPuU/2eFupuTb9mxW1PlaXa45J0HDZRoNRLBHpn/QzQhLdW/1iyfPRw6BRwtuL/vXQQ2OPvjeQ==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/client-logger" "6.2.3"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/router@6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.4.tgz#a5b8480432b7e77b61e5f4347d28093f5621fab8"
@@ -2960,24 +2812,6 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/theming@6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.3.tgz#d2234d9b237d17e6349b40aebe83a3e75ee105be"
-  integrity sha512-vXzdZtpVqIB1HdeqPjdkYcLigAEtbojEZ5/P0qjvUpI6nNygy7xvtohxn9NWBTeamdXop9xXs0fi/VTiUAlr9Q==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.2.3"
-    core-js "^3.8.2"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.27"
-    global "^4.4.0"
-    memoizerific "^1.11.3"
-    polished "^4.0.5"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/theming@6.2.4":
   version "6.2.4"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.4.tgz#9c4f252fa338726e3a7e88660432b5739d6ce94f"

From 34989fcb9f0d7930e45b40a78e4557f4a832401d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 05:57:53 +0000
Subject: [PATCH 146/288] build(deps-dev): bump @storybook/addon-links from
 6.2.4 to 6.2.5 (#3470)

---
 package.json |   2 +-
 yarn.lock    | 115 +++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 108 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 09bd79a5aaf0..cf6a2dd2271b 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "@storybook/addon-a11y": "^6.2.4",
     "@storybook/addon-actions": "^6.2.4",
     "@storybook/addon-essentials": "^6.1.21",
-    "@storybook/addon-links": "^6.2.4",
+    "@storybook/addon-links": "^6.2.5",
     "@storybook/node-logger": "^6.2.4",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index ec24dc1247e7..6610dd6d82fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2252,16 +2252,16 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-links@^6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.4.tgz#a704c0d02a598a02e3c32a7076cd39c9e097efe6"
-  integrity sha512-nsYdqmckWNOtY1EDS4bY7T6pDw8/83pkMeOcB330XKvyUlWGlTCIvt+6iX+zbZGGVu+Fp0yMbNI9g7yf18jvhQ==
+"@storybook/addon-links@^6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.5.tgz#8149862dbb391df49161a1eb9973bc4ce99bc0e4"
+  integrity sha512-kRehv1VnuzSeeIzuvSbWqmZE1fkL8I/tvvscEYeku1Xwhq7Pbp31K3ZWMPPFj28z1zTWYyWn+6HTscYPpdREQw==
   dependencies:
-    "@storybook/addons" "6.2.4"
-    "@storybook/client-logger" "6.2.4"
-    "@storybook/core-events" "6.2.4"
+    "@storybook/addons" "6.2.5"
+    "@storybook/client-logger" "6.2.5"
+    "@storybook/core-events" "6.2.5"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.4"
+    "@storybook/router" "6.2.5"
     "@types/qs" "^6.9.5"
     core-js "^3.8.2"
     global "^4.4.0"
@@ -2328,6 +2328,21 @@
     global "^4.4.0"
     regenerator-runtime "^0.13.7"
 
+"@storybook/addons@6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.5.tgz#28370a547b8d2f69a34c29520aa841961bac6b27"
+  integrity sha512-tRZYTxJ6FlOCoWG7mVJAzH4BIBPWyvryGprawdkWHUaVYQRMH58pU3ma7gxdYdgvV80eZe2BfEOLzvZJeV/GgA==
+  dependencies:
+    "@storybook/api" "6.2.5"
+    "@storybook/channels" "6.2.5"
+    "@storybook/client-logger" "6.2.5"
+    "@storybook/core-events" "6.2.5"
+    "@storybook/router" "6.2.5"
+    "@storybook/theming" "6.2.5"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    regenerator-runtime "^0.13.7"
+
 "@storybook/api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.21.tgz#be753ca8d3602efe4a11783c81c689463bee0825"
@@ -2379,6 +2394,32 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.5.tgz#fb22363c87c5e9dfb779d01513b8013bbdf2f560"
+  integrity sha512-iVRCPZ+QRAQs6ukBTiBEvEHhAQJJ3lxRz096grTZ5LZpY+89GcKlwaS1kAJ903+rFOxLDezJpHhS1cwSW2Kc8g==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/channels" "6.2.5"
+    "@storybook/client-logger" "6.2.5"
+    "@storybook/core-events" "6.2.5"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "6.2.5"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.5"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    store2 "^2.12.0"
+    telejson "^5.1.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.1.21.tgz#acce71833499dba4c4e686de09f5b281a3239842"
@@ -2423,6 +2464,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/channels@6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.5.tgz#08814f20e6027afc091d3187c2984ae790bff17c"
+  integrity sha512-vjWALSurfPtc56Vc2E4N0mKniMA6axU0gH8LYEgUBmmicrzzwYX9fCPfEe0NT2GNW83HpU1h2UH/ojuty/NtMg==
+  dependencies:
+    core-js "^3.8.2"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.1.21.tgz#c9f72bbc9bf9d12cc931eb824f6912173c73b0b3"
@@ -2487,6 +2537,14 @@
     core-js "^3.8.2"
     global "^4.4.0"
 
+"@storybook/client-logger@6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.5.tgz#1cedc94dafce95c0388c0e643ab0743bf22160df"
+  integrity sha512-3sM2nCpa9ZYTLhOOpcWA2LfpV37TLJQG1XnJW+63IyBPJWn05thnJ3PVeazlit7JnY9o+i2VzjoHoPPk6TKpKQ==
+  dependencies:
+    core-js "^3.8.2"
+    global "^4.4.0"
+
 "@storybook/components@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.21.tgz#7b9bfd51e73c179654a114275e5073f494d2a005"
@@ -2558,6 +2616,13 @@
   dependencies:
     core-js "^3.8.2"
 
+"@storybook/core-events@6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.5.tgz#67a30feff3893efb78ef5ecf7bee242a3252d348"
+  integrity sha512-cEFUrhnd9fgsfqwFHS+eXL6AQQ7Z9ZCa2r79QFJf0cEmQ53BY8ay0x8TzHpF9REGzX/TlqAhEAVo2iQn7ngFiw==
+  dependencies:
+    core-js "^3.8.2"
+
 "@storybook/core@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.1.21.tgz#e4c9f5ab361e0c4690f2827a71308757f9d46395"
@@ -2769,6 +2834,22 @@
     qs "^6.10.0"
     ts-dedent "^2.0.0"
 
+"@storybook/router@6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.5.tgz#51b2f8786d7b08c77e1453998605082a1b7d4437"
+  integrity sha512-Cs6t3eSZ1Pqbld+cKx8K7YFVyrXvJtOcqG9NMCmx9NZjWRfMlorstWSDdTnk4uTHenXH99Y/uUNZCHRgf+Jt/A==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/client-logger" "6.2.5"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/semver@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
@@ -2830,6 +2911,24 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
+"@storybook/theming@6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.5.tgz#c72ea11e307440e49b4b8ff86916bac8998e0c88"
+  integrity sha512-DXLYggY6XUYD3cuFFas+7JZZP54a3MkKgQbxm3hYzS0D1mbG2gbjukuXtuN9WMoBEXgdRtYfySHX45NF29ZxzA==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@emotion/is-prop-valid" "^0.8.6"
+    "@emotion/styled" "^10.0.27"
+    "@storybook/client-logger" "6.2.5"
+    core-js "^3.8.2"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.27"
+    global "^4.4.0"
+    memoizerific "^1.11.3"
+    polished "^4.0.5"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/ui@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.1.21.tgz#bf7cac3ba9a6250f573fa1ba12d4592891d5ece2"

From 936002eab9a08022d41fdb144ea95a3b6f3b131a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 05:59:18 +0000
Subject: [PATCH 147/288] build(deps-dev): bump typescript from 4.2.3 to 4.2.4
 (#3471)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index cf6a2dd2271b..38fa5a799d38 100644
--- a/package.json
+++ b/package.json
@@ -160,7 +160,7 @@
     "stylelint-scss": "^3.19.0",
     "swr": "^0.5.5",
     "ts-loader": "^8.1.0",
-    "typescript": "^4.2.3",
+    "typescript": "^4.2.4",
     "use-debounce": "^5.2.1",
     "webpack": "^4.44.2",
     "webpack-cli": "^4.6.0",
diff --git a/yarn.lock b/yarn.lock
index 6610dd6d82fd..b5292ed82de5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18312,10 +18312,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
-  integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
+typescript@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
+  integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
 
 unbzip2-stream@^1.0.9:
   version "1.4.3"

From 7aaf8ec33ca3844ce00e3a0127ec33c703f3d682 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 08:40:09 +0000
Subject: [PATCH 148/288] build(deps-dev): bump @storybook/addon-actions from
 6.2.4 to 6.2.5 (#3473)

---
 package.json |  2 +-
 yarn.lock    | 87 ++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 38fa5a799d38..9998882e3ab9 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.2.4",
-    "@storybook/addon-actions": "^6.2.4",
+    "@storybook/addon-actions": "^6.2.5",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.5",
     "@storybook/node-logger": "^6.2.4",
diff --git a/yarn.lock b/yarn.lock
index b5292ed82de5..f80f829b1c7d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2133,17 +2133,17 @@
     util-deprecate "^1.0.2"
     uuid "^8.0.0"
 
-"@storybook/addon-actions@^6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.4.tgz#dfd4027449c8e9c2d0606c905f6237590870d054"
-  integrity sha512-RAGqZwJ2wXTQ0uZ4R4j/S6Aur7JjdS8oZoQNVzSR2N6QmRVL2L2vySRoJhS964D6NJnJp0FOXTiXw9SkYKiyUg==
+"@storybook/addon-actions@^6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.5.tgz#3f8be42446f5fa4eea177ec729052e672873c0c6"
+  integrity sha512-b5yml5XnKvoPIlmz8pdjm0SjkSoChuK3oqqs4XCzLm2tmaqBHuVOhWqQqOJzLsYHqY5o+OBM21aoIxL4izosjw==
   dependencies:
-    "@storybook/addons" "6.2.4"
-    "@storybook/api" "6.2.4"
-    "@storybook/client-api" "6.2.4"
-    "@storybook/components" "6.2.4"
-    "@storybook/core-events" "6.2.4"
-    "@storybook/theming" "6.2.4"
+    "@storybook/addons" "6.2.5"
+    "@storybook/api" "6.2.5"
+    "@storybook/client-api" "6.2.5"
+    "@storybook/components" "6.2.5"
+    "@storybook/core-events" "6.2.5"
+    "@storybook/theming" "6.2.5"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
     global "^4.4.0"
@@ -2446,6 +2446,19 @@
     qs "^6.10.0"
     telejson "^5.1.0"
 
+"@storybook/channel-postmessage@6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.5.tgz#22b7069fe8961c23d4dbdb2a25d627f619ab90df"
+  integrity sha512-OK9xTWc13p9VwyA7t/fW8mJ2nhSpA08STFoe3aFH34v/r6LF+inLd+8Wg08S0XLaxd6lMjVoUapA24xUtGK9jw==
+  dependencies:
+    "@storybook/channels" "6.2.5"
+    "@storybook/client-logger" "6.2.5"
+    "@storybook/core-events" "6.2.5"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    qs "^6.10.0"
+    telejson "^5.1.0"
+
 "@storybook/channels@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.1.21.tgz#adbfae5f4767234c5b17d9578be983584dddead4"
@@ -2521,6 +2534,30 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.5.tgz#886f5cf2be59a7fcdbd49df5d9ead9b6ae4c22cb"
+  integrity sha512-p2T+WwiiNmn1xQDSha2fnDDDoOqvjKRUanyrozy9B9LhJefMFlJgpgm/N/0FYN/nsyKfDbJAXYqc0zY8DSDfxQ==
+  dependencies:
+    "@storybook/addons" "6.2.5"
+    "@storybook/channel-postmessage" "6.2.5"
+    "@storybook/channels" "6.2.5"
+    "@storybook/client-logger" "6.2.5"
+    "@storybook/core-events" "6.2.5"
+    "@storybook/csf" "0.0.1"
+    "@types/qs" "^6.9.5"
+    "@types/webpack-env" "^1.16.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    stable "^0.1.8"
+    store2 "^2.12.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.1.21.tgz#fe7d9e645ddb4eb9dc18fdacea24b4baf11bc6c9"
@@ -2602,6 +2639,36 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/components@6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.5.tgz#e495a1095a99f81b94da7ee3a4cd73255f7216fa"
+  integrity sha512-wL5cUAkYAHXJ+mhfQUl1FTZYsu0iaRT6uvawiainGsp/ccFw42l49fUuSOtRIdU77IwNU+WfK8l3Vu4MJOVJLA==
+  dependencies:
+    "@popperjs/core" "^2.6.0"
+    "@storybook/client-logger" "6.2.5"
+    "@storybook/csf" "0.0.1"
+    "@storybook/theming" "6.2.5"
+    "@types/color-convert" "^2.0.0"
+    "@types/overlayscrollbars" "^1.12.0"
+    "@types/react-syntax-highlighter" "11.0.5"
+    color-convert "^2.0.1"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    markdown-to-jsx "^7.1.0"
+    memoizerific "^1.11.3"
+    overlayscrollbars "^1.13.1"
+    polished "^4.0.5"
+    prop-types "^15.7.2"
+    react-colorful "^5.0.1"
+    react-popper-tooltip "^3.1.1"
+    react-syntax-highlighter "^13.5.3"
+    react-textarea-autosize "^8.3.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/core-events@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.1.21.tgz#11f537f78f8c73ba5e627b57b282a279793a3511"

From bb32fe398fd74a27b2ff564b2446d0dc454f6746 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 08:49:59 +0000
Subject: [PATCH 149/288] build(deps-dev): bump @storybook/node-logger from
 6.2.4 to 6.2.5 (#3469)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9998882e3ab9..6706a4bd281c 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@storybook/addon-actions": "^6.2.5",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.5",
-    "@storybook/node-logger": "^6.2.4",
+    "@storybook/node-logger": "^6.2.5",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
     "@testing-library/react": "^11.2.6",
diff --git a/yarn.lock b/yarn.lock
index f80f829b1c7d..26616710ad72 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2815,10 +2815,10 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/node-logger@^6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.4.tgz#d2058395b85977954af3c86bc26da7e03b8c2ffb"
-  integrity sha512-LyJuEAZlnouAUPqWEVngWUZzTbEE0rwZO+6YP8qRm3fT/S/0N4+FXscm8Zj1tQ9EhQurr6kvKLx55DhyvlUt0g==
+"@storybook/node-logger@^6.2.5":
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.5.tgz#a1488dc75b0e359fd32937d9d27132c7f6a73874"
+  integrity sha512-vActH+XxtxUn0E/uxZbFgiFZ6fjnfkw9imLPrIhBzLuFU+HZP8INkP/SAIqPf5SzJ7k24fkZFaEq6QakB8mI2A==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^4.1.0"

From ad3490e94914609b844d7ab64d85501f90b60462 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 8 Apr 2021 10:17:28 -0400
Subject: [PATCH 150/288] remove 'Wiki' GA event code (#3422)

Fixes #3299
---
 client/src/ui/molecules/main-menu/index.tsx | 47 +++------------------
 1 file changed, 7 insertions(+), 40 deletions(-)

diff --git a/client/src/ui/molecules/main-menu/index.tsx b/client/src/ui/molecules/main-menu/index.tsx
index 71bd31807294..63bf4bb16384 100644
--- a/client/src/ui/molecules/main-menu/index.tsx
+++ b/client/src/ui/molecules/main-menu/index.tsx
@@ -1,7 +1,6 @@
 import * as React from "react";
 import { useEffect, useRef, useState } from "react";
 
-import { useGA } from "../../../ga-context";
 import { useLocale } from "../../../hooks";
 
 import "./index.scss";
@@ -22,34 +21,6 @@ export default function MainMenu({
   const [submenuCollapsedOnBlurId, setSubmenuCollapsedOnBlurId] = useState<
     string | null
   >(null);
-  const ga = useGA();
-
-  /**
-   * Send a signal to GA when there is an interaction on one
-   * of the main menu items.
-   * @param {Object} event - The event object that was triggered
-   */
-  function sendMenuItemInteraction(
-    event:
-      | React.FocusEvent<HTMLButtonElement>
-      | React.MouseEvent<HTMLAnchorElement>
-  ) {
-    if (!(event.target instanceof HTMLElement)) {
-      return;
-    }
-    const label =
-      event.target instanceof HTMLAnchorElement
-        ? event.target.href
-        : event.target.textContent;
-
-    ga("send", {
-      hitType: "event",
-      eventCategory: "Wiki",
-      eventAction: "MainNav",
-      eventLabel: label,
-    });
-  }
-
   function hideSubMenuIfVisible() {
     if (visibleSubMenuId) {
       setVisibleSubMenuId(null);
@@ -69,16 +40,14 @@ export default function MainMenu({
     previousActiveElement.current = document.activeElement as HTMLButtonElement;
 
     setVisibleSubMenuId(visibleSubMenuId === id ? null : id);
-    sendMenuItemInteraction(event);
 
     if (expandedState) {
       setFocusedSubmenuItemIndex(0);
     }
   }
 
-  function onMenuButtonFocus(event: React.FocusEvent<HTMLButtonElement>) {
+  function onMenuButtonFocus() {
     setFocusedSubmenuItemIndex(-1);
-    sendMenuItemInteraction(event);
   }
 
   /**
@@ -323,11 +292,10 @@ export default function MainMenu({
                       rel="noopener noreferrer"
                       href={item.url}
                       onClick={(event) => {
-                        item.onClick
-                          ? item.onClick(event)
-                          : sendMenuItemInteraction(event);
+                        if (item.onClick) {
+                          item.onClick(event);
+                        }
                       }}
-                      onContextMenu={sendMenuItemInteraction}
                       role="menuitem"
                     >
                       {item.label} &#x1f310;
@@ -337,11 +305,10 @@ export default function MainMenu({
                       tabIndex={index === focusedSubmenuItemIndex ? 0 : -1}
                       href={item.url}
                       onClick={(event) => {
-                        item.onClick
-                          ? item.onClick(event)
-                          : sendMenuItemInteraction(event);
+                        if (item.onClick) {
+                          item.onClick(event);
+                        }
                       }}
-                      onContextMenu={sendMenuItemInteraction}
                       role="menuitem"
                     >
                       {item.label}

From 07207df5d68aaa58c994c84607ea6fa60fc48ddd Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 8 Apr 2021 10:22:27 -0400
Subject: [PATCH 151/288] remove 'MozMenu' event collection (#3423)

Fixes #3300
---
 client/src/document/organisms/toc/index.tsx | 26 +++------------------
 client/src/ui/molecules/dropdown/index.tsx  | 14 ++---------
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/client/src/document/organisms/toc/index.tsx b/client/src/document/organisms/toc/index.tsx
index 273bee092f1e..334aa1a138b5 100644
--- a/client/src/document/organisms/toc/index.tsx
+++ b/client/src/document/organisms/toc/index.tsx
@@ -1,35 +1,15 @@
-import React, { useState } from "react";
-import { useGA } from "../../../ga-context";
+import React from "react";
 
 import { Toc } from "../../types";
 
 import "./index.scss";
 
 export function TOC({ toc }: { toc: Toc[] }) {
-  const ga = useGA();
-  const [showTOC, setShowTOC] = useState(false);
-
-  /**
-   * Send a signal to GA when the user clicks on one of links
-   * in the table of contents
-   */
-  function sendTOCClicks(event: React.MouseEvent) {
-    if (event.target instanceof HTMLAnchorElement) {
-      const action = event.target.textContent;
-      const label = new URL(event.target.href).hash;
-      ga("send", {
-        hitType: "event",
-        eventCategory: "MozMenu",
-        eventAction: action,
-        eventLabel: label,
-      });
-    }
-  }
+  const [showTOC, setShowTOC] = React.useState(false);
 
   return (
     <aside className="document-toc-container">
-      {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions */}
-      <section className="document-toc" onClick={sendTOCClicks}>
+      <section className="document-toc">
         <header>
           <h2>Table of contents</h2>
           <button
diff --git a/client/src/ui/molecules/dropdown/index.tsx b/client/src/ui/molecules/dropdown/index.tsx
index 522bcbba96c4..e0ab12888afe 100644
--- a/client/src/ui/molecules/dropdown/index.tsx
+++ b/client/src/ui/molecules/dropdown/index.tsx
@@ -1,6 +1,4 @@
 import * as React from "react";
-import { useEffect, useState } from "react";
-import { useGA } from "../../../ga-context";
 
 import "./index.scss";
 
@@ -35,8 +33,7 @@ type DropdownProps = {
 };
 
 export default function Dropdown(props: DropdownProps) {
-  const ga = useGA();
-  const [showDropdownMenu, setShowDropdownMenu] = useState(false);
+  const [showDropdownMenu, setShowDropdownMenu] = React.useState(false);
 
   function hideDropdownMenuIfVisible() {
     if (showDropdownMenu) {
@@ -44,7 +41,7 @@ export default function Dropdown(props: DropdownProps) {
     }
   }
 
-  useEffect(() => {
+  React.useEffect(() => {
     document.addEventListener("keyup", (event: KeyboardEvent) => {
       if (event.key === "Escape") {
         hideDropdownMenuIfVisible();
@@ -68,13 +65,6 @@ export default function Dropdown(props: DropdownProps) {
         onClick={() => {
           setShowDropdownMenu(!showDropdownMenu);
         }}
-        onFocus={function (event) {
-          ga("send", {
-            hitType: "event",
-            eventCategory: "MozMenu",
-            eventAction: event.target.id,
-          });
-        }}
       >
         {props.label}
         {!props.hideArrow && (

From ba9f7b8e21e1f2979cea16d051a9f3ec33c62fb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 05:57:07 +0000
Subject: [PATCH 152/288] build(deps-dev): bump @babel/core from 7.13.14 to
 7.13.15 (#3477)

---
 package.json |  2 +-
 yarn.lock    | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 6706a4bd281c..d9e52ec4a1ea 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "unist-util-visit": "2.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.14",
+    "@babel/core": "^7.13.15",
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.2.4",
diff --git a/yarn.lock b/yarn.lock
index 26616710ad72..69ad296fd694 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -70,19 +70,19 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.1", "@babel/core@^7.12.3", "@babel/core@^7.13.14", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.14.tgz#8e46ebbaca460a63497c797e574038ab04ae6d06"
-  integrity sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA==
+"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.1", "@babel/core@^7.12.3", "@babel/core@^7.13.15", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.15.tgz#a6d40917df027487b54312202a06812c4f7792d0"
+  integrity sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ==
   dependencies:
     "@babel/code-frame" "^7.12.13"
     "@babel/generator" "^7.13.9"
     "@babel/helper-compilation-targets" "^7.13.13"
     "@babel/helper-module-transforms" "^7.13.14"
     "@babel/helpers" "^7.13.10"
-    "@babel/parser" "^7.13.13"
+    "@babel/parser" "^7.13.15"
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.13"
+    "@babel/traverse" "^7.13.15"
     "@babel/types" "^7.13.14"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
@@ -448,10 +448,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.11.5", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.13.13", "@babel/parser@^7.7.0":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df"
-  integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==
+"@babel/parser@^7.1.0", "@babel/parser@^7.11.5", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.13.15", "@babel/parser@^7.7.0":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.15.tgz#8e66775fb523599acb6a289e12929fa5ab0954d8"
+  integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==
 
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.1"
@@ -1383,21 +1383,21 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.7.0":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.13.tgz#39aa9c21aab69f74d948a486dd28a2dbdbf5114d"
-  integrity sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.7.0":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.15.tgz#c38bf7679334ddd4028e8e1f7b3aa5019f0dada7"
+  integrity sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ==
   dependencies:
     "@babel/code-frame" "^7.12.13"
     "@babel/generator" "^7.13.9"
     "@babel/helper-function-name" "^7.12.13"
     "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.13"
-    "@babel/types" "^7.13.13"
+    "@babel/parser" "^7.13.15"
+    "@babel/types" "^7.13.14"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.13", "@babel/types@^7.13.14", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.13.14"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
   integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==

From dd7dc3df049f3a3bd22b2f5e606128132a354e0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 05:58:05 +0000
Subject: [PATCH 153/288] build(deps-dev): bump @storybook/addon-actions from
 6.2.5 to 6.2.7 (#3478)

---
 package.json |   2 +-
 yarn.lock    | 165 ++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 133 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index d9e52ec4a1ea..29033cfd9a74 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.2.4",
-    "@storybook/addon-actions": "^6.2.5",
+    "@storybook/addon-actions": "^6.2.7",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.5",
     "@storybook/node-logger": "^6.2.5",
diff --git a/yarn.lock b/yarn.lock
index 69ad296fd694..1d8b05b2eeff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2133,17 +2133,17 @@
     util-deprecate "^1.0.2"
     uuid "^8.0.0"
 
-"@storybook/addon-actions@^6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.5.tgz#3f8be42446f5fa4eea177ec729052e672873c0c6"
-  integrity sha512-b5yml5XnKvoPIlmz8pdjm0SjkSoChuK3oqqs4XCzLm2tmaqBHuVOhWqQqOJzLsYHqY5o+OBM21aoIxL4izosjw==
-  dependencies:
-    "@storybook/addons" "6.2.5"
-    "@storybook/api" "6.2.5"
-    "@storybook/client-api" "6.2.5"
-    "@storybook/components" "6.2.5"
-    "@storybook/core-events" "6.2.5"
-    "@storybook/theming" "6.2.5"
+"@storybook/addon-actions@^6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.7.tgz#ca0500f5eb7017d3e2b4f6ee570c3650e495c7d9"
+  integrity sha512-v0zgJfrgTY5di7pCUZnA5CLSu8LNcq2rwLuQ2I3qiLYszZ9Gdst5kdekMPgiz7Dk8c6GOpml/IMISnEUKBskVQ==
+  dependencies:
+    "@storybook/addons" "6.2.7"
+    "@storybook/api" "6.2.7"
+    "@storybook/client-api" "6.2.7"
+    "@storybook/components" "6.2.7"
+    "@storybook/core-events" "6.2.7"
+    "@storybook/theming" "6.2.7"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
     global "^4.4.0"
@@ -2343,6 +2343,21 @@
     global "^4.4.0"
     regenerator-runtime "^0.13.7"
 
+"@storybook/addons@6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.7.tgz#f31343654e564dd91f1ec103f130fa23e996745b"
+  integrity sha512-OHVGzkS2al/jirChr2otampV3oBvODbisUpHMhgUJQ+fcjKdBOXualJFBHhAI2TNwTODfjld+TsKQlBtiMDNDw==
+  dependencies:
+    "@storybook/api" "6.2.7"
+    "@storybook/channels" "6.2.7"
+    "@storybook/client-logger" "6.2.7"
+    "@storybook/core-events" "6.2.7"
+    "@storybook/router" "6.2.7"
+    "@storybook/theming" "6.2.7"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    regenerator-runtime "^0.13.7"
+
 "@storybook/api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.21.tgz#be753ca8d3602efe4a11783c81c689463bee0825"
@@ -2420,6 +2435,32 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.7.tgz#5417dfe0c5a7a49a4e47f5a4c2be7a1bbdb7d5b3"
+  integrity sha512-GKD9b6OkQi7eDlaPmpjSz7MJsPIY+q7eGvBAWkovLXzvfEY6sE6VqUt9aWn3i6IkzqjYF7c+wgQzpA0JBTzH1Q==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/channels" "6.2.7"
+    "@storybook/client-logger" "6.2.7"
+    "@storybook/core-events" "6.2.7"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "6.2.7"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.7"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    store2 "^2.12.0"
+    telejson "^5.1.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.1.21.tgz#acce71833499dba4c4e686de09f5b281a3239842"
@@ -2446,14 +2487,14 @@
     qs "^6.10.0"
     telejson "^5.1.0"
 
-"@storybook/channel-postmessage@6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.5.tgz#22b7069fe8961c23d4dbdb2a25d627f619ab90df"
-  integrity sha512-OK9xTWc13p9VwyA7t/fW8mJ2nhSpA08STFoe3aFH34v/r6LF+inLd+8Wg08S0XLaxd6lMjVoUapA24xUtGK9jw==
+"@storybook/channel-postmessage@6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.7.tgz#4025d3746fac9b1c2264001606c7a361d1144417"
+  integrity sha512-l+62q/oZrDeuU3xhqVKnyk7FoUZKwr+4ZG6fXc/uXKCryoACiHT1RvStoX4AZqua9xIxMPpQr36UpHUElNHtyg==
   dependencies:
-    "@storybook/channels" "6.2.5"
-    "@storybook/client-logger" "6.2.5"
-    "@storybook/core-events" "6.2.5"
+    "@storybook/channels" "6.2.7"
+    "@storybook/client-logger" "6.2.7"
+    "@storybook/core-events" "6.2.7"
     core-js "^3.8.2"
     global "^4.4.0"
     qs "^6.10.0"
@@ -2486,6 +2527,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/channels@6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.7.tgz#b6b64e9f7318afe3a005042395356fd0a878001c"
+  integrity sha512-s79ghVFrbhj4hEt/HPNz7VgOqKQx8S8JozndHQuiE/KSNxfcgGihUXWxIVr7RGAzQcMT3HsAZ0nDbKdusV9jAg==
+  dependencies:
+    core-js "^3.8.2"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.1.21.tgz#c9f72bbc9bf9d12cc931eb824f6912173c73b0b3"
@@ -2534,16 +2584,16 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-api@6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.5.tgz#886f5cf2be59a7fcdbd49df5d9ead9b6ae4c22cb"
-  integrity sha512-p2T+WwiiNmn1xQDSha2fnDDDoOqvjKRUanyrozy9B9LhJefMFlJgpgm/N/0FYN/nsyKfDbJAXYqc0zY8DSDfxQ==
+"@storybook/client-api@6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.7.tgz#7e788314582b9fc09fbd150ef95d0714d5d22b9c"
+  integrity sha512-ZeKNkI1lXW55RnREDYt/wmHi34iMYdRNpybE9QqPBEcFLyvpB7m1bifXxFSgqyMbK+eSTYOfPB1NGQJi77P/iQ==
   dependencies:
-    "@storybook/addons" "6.2.5"
-    "@storybook/channel-postmessage" "6.2.5"
-    "@storybook/channels" "6.2.5"
-    "@storybook/client-logger" "6.2.5"
-    "@storybook/core-events" "6.2.5"
+    "@storybook/addons" "6.2.7"
+    "@storybook/channel-postmessage" "6.2.7"
+    "@storybook/channels" "6.2.7"
+    "@storybook/client-logger" "6.2.7"
+    "@storybook/core-events" "6.2.7"
     "@storybook/csf" "0.0.1"
     "@types/qs" "^6.9.5"
     "@types/webpack-env" "^1.16.0"
@@ -2582,6 +2632,14 @@
     core-js "^3.8.2"
     global "^4.4.0"
 
+"@storybook/client-logger@6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.7.tgz#deca6d5b157d6ea22ec8f271399e9d10bb293a2c"
+  integrity sha512-IhTaZ3NPrV2g7vnoSuq5yb6QLuXQgD5+iuwzOAXlP8vU5X/Tm3zNr5PtqNjrKg1A3ls6A0pCBa5QctWdN/tnuQ==
+  dependencies:
+    core-js "^3.8.2"
+    global "^4.4.0"
+
 "@storybook/components@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.21.tgz#7b9bfd51e73c179654a114275e5073f494d2a005"
@@ -2639,15 +2697,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/components@6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.5.tgz#e495a1095a99f81b94da7ee3a4cd73255f7216fa"
-  integrity sha512-wL5cUAkYAHXJ+mhfQUl1FTZYsu0iaRT6uvawiainGsp/ccFw42l49fUuSOtRIdU77IwNU+WfK8l3Vu4MJOVJLA==
+"@storybook/components@6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.7.tgz#03ee5e22c48631fe17829299d2da61bb4e0598ce"
+  integrity sha512-ccKOwGIkuhEHFLzjZvaZG11GIbMvk56bNdCAG8iINKYUjJE3l0PsO5xPhNsyTlwpDScZGwEBKB48Vn54UjiS8g==
   dependencies:
     "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.2.5"
+    "@storybook/client-logger" "6.2.7"
     "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.2.5"
+    "@storybook/theming" "6.2.7"
     "@types/color-convert" "^2.0.0"
     "@types/overlayscrollbars" "^1.12.0"
     "@types/react-syntax-highlighter" "11.0.5"
@@ -2690,6 +2748,13 @@
   dependencies:
     core-js "^3.8.2"
 
+"@storybook/core-events@6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.7.tgz#47f9bbbf7f5959eab9ffcf6e2893f09014297608"
+  integrity sha512-CwMftGVwWDqFva48rs5TlTSkimO7Q42dAuKKmUVHaN2tPacs8NdxhjqHmj+ls+5cxZuDnJy1x3JAo1PyHGyWiw==
+  dependencies:
+    core-js "^3.8.2"
+
 "@storybook/core@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.1.21.tgz#e4c9f5ab361e0c4690f2827a71308757f9d46395"
@@ -2917,6 +2982,22 @@
     qs "^6.10.0"
     ts-dedent "^2.0.0"
 
+"@storybook/router@6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.7.tgz#b6bfedc237f0b3834f8fa9eb724d91bd3eaff832"
+  integrity sha512-ZHz5T/IvpsXq0O/frdZN6kNltzy7QiL1TgekwY5evjtRWFAX6vRBQXfQH9opGQ3dThZIhMUi7kA9h9utrHp8HA==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/client-logger" "6.2.7"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/semver@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
@@ -2996,6 +3077,24 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
+"@storybook/theming@6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.7.tgz#7dbbcde537099b1fe65ec63a517fd54a3dd587f5"
+  integrity sha512-0zTw1DhPWuNsk/fSg7rqLa/99+dxUfwjDnCYu4WJAUjfBWP/++0VWtQJVtt8ogyHKsY2dUzm5mhUg8EtqnGePg==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@emotion/is-prop-valid" "^0.8.6"
+    "@emotion/styled" "^10.0.27"
+    "@storybook/client-logger" "6.2.7"
+    core-js "^3.8.2"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.27"
+    global "^4.4.0"
+    memoizerific "^1.11.3"
+    polished "^4.0.5"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/ui@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.1.21.tgz#bf7cac3ba9a6250f573fa1ba12d4592891d5ece2"

From 199496437e501bf61dad311de367d08ccdd5fca0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 08:17:53 +0000
Subject: [PATCH 154/288] build(deps): bump @mdn/browser-compat-data from 3.2.3
 to 3.2.4 (#3483)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 29033cfd9a74..772d824839f3 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
   "dependencies": {
     "@caporal/core": "2.0.2",
     "@fast-csv/parse": "4.3.6",
-    "@mdn/browser-compat-data": "3.2.3",
+    "@mdn/browser-compat-data": "3.2.4",
     "accept-language-parser": "1.5.0",
     "chalk": "4.1.0",
     "cheerio": "1.0.0-rc.5",
diff --git a/yarn.lock b/yarn.lock
index 1d8b05b2eeff..d6ff3669c294 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1886,10 +1886,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@mdn/browser-compat-data@3.2.3":
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.2.3.tgz#0fb51d3363b531fd74ae68b00fe5c0f3025087a6"
-  integrity sha512-1vlKnnYAgIF5WbWpwBWSsT991ppuJrP6gdpu2RHjG24Vntx1w5c8yXpvtHuHW6RbnKVgwdGz33kpjAU0pDzIxw==
+"@mdn/browser-compat-data@3.2.4":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.2.4.tgz#9b015c608eaed5cc47c35bb3d63f6502e5bd88c7"
+  integrity sha512-jEUurwoeiHOB7SceVnsg3ULxNlf9XxqMfcKNM+eJduPgCcoCnbLi/6og+e764fTAZCcBkqGcWUMhLQXwcqpbJQ==
   dependencies:
     extend "3.0.2"
 

From ae108690e1f0a2e3db98684a3fc74b6d2ba4d54a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 08:43:53 +0000
Subject: [PATCH 155/288] build(deps-dev): bump @storybook/addon-links from
 6.2.5 to 6.2.7 (#3481)

---
 package.json |   2 +-
 yarn.lock    | 115 ++++-----------------------------------------------
 2 files changed, 9 insertions(+), 108 deletions(-)

diff --git a/package.json b/package.json
index 772d824839f3..f235e5bd7971 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "@storybook/addon-a11y": "^6.2.4",
     "@storybook/addon-actions": "^6.2.7",
     "@storybook/addon-essentials": "^6.1.21",
-    "@storybook/addon-links": "^6.2.5",
+    "@storybook/addon-links": "^6.2.7",
     "@storybook/node-logger": "^6.2.5",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index d6ff3669c294..3c0f97ef2ae3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2252,16 +2252,16 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-links@^6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.5.tgz#8149862dbb391df49161a1eb9973bc4ce99bc0e4"
-  integrity sha512-kRehv1VnuzSeeIzuvSbWqmZE1fkL8I/tvvscEYeku1Xwhq7Pbp31K3ZWMPPFj28z1zTWYyWn+6HTscYPpdREQw==
+"@storybook/addon-links@^6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.7.tgz#02d4636bd1ca26d243f346086d5b280fb70a730b"
+  integrity sha512-pGP3gtZSP9xDbS+KgP0fiTLrhcD8eauOsP0JgzyKVCgKYzG4Yx9xuZBcDCvG25DeczDvTx7kuR6U1TavSYn12w==
   dependencies:
-    "@storybook/addons" "6.2.5"
-    "@storybook/client-logger" "6.2.5"
-    "@storybook/core-events" "6.2.5"
+    "@storybook/addons" "6.2.7"
+    "@storybook/client-logger" "6.2.7"
+    "@storybook/core-events" "6.2.7"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.5"
+    "@storybook/router" "6.2.7"
     "@types/qs" "^6.9.5"
     core-js "^3.8.2"
     global "^4.4.0"
@@ -2328,21 +2328,6 @@
     global "^4.4.0"
     regenerator-runtime "^0.13.7"
 
-"@storybook/addons@6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.5.tgz#28370a547b8d2f69a34c29520aa841961bac6b27"
-  integrity sha512-tRZYTxJ6FlOCoWG7mVJAzH4BIBPWyvryGprawdkWHUaVYQRMH58pU3ma7gxdYdgvV80eZe2BfEOLzvZJeV/GgA==
-  dependencies:
-    "@storybook/api" "6.2.5"
-    "@storybook/channels" "6.2.5"
-    "@storybook/client-logger" "6.2.5"
-    "@storybook/core-events" "6.2.5"
-    "@storybook/router" "6.2.5"
-    "@storybook/theming" "6.2.5"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    regenerator-runtime "^0.13.7"
-
 "@storybook/addons@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.7.tgz#f31343654e564dd91f1ec103f130fa23e996745b"
@@ -2409,32 +2394,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/api@6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.5.tgz#fb22363c87c5e9dfb779d01513b8013bbdf2f560"
-  integrity sha512-iVRCPZ+QRAQs6ukBTiBEvEHhAQJJ3lxRz096grTZ5LZpY+89GcKlwaS1kAJ903+rFOxLDezJpHhS1cwSW2Kc8g==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/channels" "6.2.5"
-    "@storybook/client-logger" "6.2.5"
-    "@storybook/core-events" "6.2.5"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.5"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.5"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.12.0"
-    telejson "^5.1.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.7.tgz#5417dfe0c5a7a49a4e47f5a4c2be7a1bbdb7d5b3"
@@ -2518,15 +2477,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channels@6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.5.tgz#08814f20e6027afc091d3187c2984ae790bff17c"
-  integrity sha512-vjWALSurfPtc56Vc2E4N0mKniMA6axU0gH8LYEgUBmmicrzzwYX9fCPfEe0NT2GNW83HpU1h2UH/ojuty/NtMg==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/channels@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.7.tgz#b6b64e9f7318afe3a005042395356fd0a878001c"
@@ -2624,14 +2574,6 @@
     core-js "^3.8.2"
     global "^4.4.0"
 
-"@storybook/client-logger@6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.5.tgz#1cedc94dafce95c0388c0e643ab0743bf22160df"
-  integrity sha512-3sM2nCpa9ZYTLhOOpcWA2LfpV37TLJQG1XnJW+63IyBPJWn05thnJ3PVeazlit7JnY9o+i2VzjoHoPPk6TKpKQ==
-  dependencies:
-    core-js "^3.8.2"
-    global "^4.4.0"
-
 "@storybook/client-logger@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.7.tgz#deca6d5b157d6ea22ec8f271399e9d10bb293a2c"
@@ -2741,13 +2683,6 @@
   dependencies:
     core-js "^3.8.2"
 
-"@storybook/core-events@6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.5.tgz#67a30feff3893efb78ef5ecf7bee242a3252d348"
-  integrity sha512-cEFUrhnd9fgsfqwFHS+eXL6AQQ7Z9ZCa2r79QFJf0cEmQ53BY8ay0x8TzHpF9REGzX/TlqAhEAVo2iQn7ngFiw==
-  dependencies:
-    core-js "^3.8.2"
-
 "@storybook/core-events@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.7.tgz#47f9bbbf7f5959eab9ffcf6e2893f09014297608"
@@ -2966,22 +2901,6 @@
     qs "^6.10.0"
     ts-dedent "^2.0.0"
 
-"@storybook/router@6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.5.tgz#51b2f8786d7b08c77e1453998605082a1b7d4437"
-  integrity sha512-Cs6t3eSZ1Pqbld+cKx8K7YFVyrXvJtOcqG9NMCmx9NZjWRfMlorstWSDdTnk4uTHenXH99Y/uUNZCHRgf+Jt/A==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/client-logger" "6.2.5"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/router@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.7.tgz#b6bfedc237f0b3834f8fa9eb724d91bd3eaff832"
@@ -3059,24 +2978,6 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/theming@6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.5.tgz#c72ea11e307440e49b4b8ff86916bac8998e0c88"
-  integrity sha512-DXLYggY6XUYD3cuFFas+7JZZP54a3MkKgQbxm3hYzS0D1mbG2gbjukuXtuN9WMoBEXgdRtYfySHX45NF29ZxzA==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.2.5"
-    core-js "^3.8.2"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.27"
-    global "^4.4.0"
-    memoizerific "^1.11.3"
-    polished "^4.0.5"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/theming@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.7.tgz#7dbbcde537099b1fe65ec63a517fd54a3dd587f5"

From b03c46cde1ca91cadd3e3d33a1ea412cd2b1488f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 08:47:50 +0000
Subject: [PATCH 156/288] build(deps): bump cheerio from 1.0.0-rc.5 to
 1.0.0-rc.6 (#3484)

---
 package.json |   2 +-
 yarn.lock    | 112 +++++++++++++++++++++++++++++++--------------------
 2 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/package.json b/package.json
index f235e5bd7971..a664778e0a44 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@mdn/browser-compat-data": "3.2.4",
     "accept-language-parser": "1.5.0",
     "chalk": "4.1.0",
-    "cheerio": "1.0.0-rc.5",
+    "cheerio": "1.0.0-rc.6",
     "cli-progress": "^3.9.0",
     "compression": "1.7.4",
     "cookie": "0.4.1",
diff --git a/yarn.lock b/yarn.lock
index 3c0f97ef2ae3..7599ce2ebee4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5677,29 +5677,28 @@ check-types@^11.1.1:
   resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.1.2.tgz#86a7c12bf5539f6324eb0e70ca8896c0e38f3e2f"
   integrity sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ==
 
-cheerio-select-tmp@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select-tmp/-/cheerio-select-tmp-0.1.0.tgz#cfa11dd0a8e2f2b74a5cb6adeaac7f8fd95c0c42"
-  integrity sha512-kx/pq9hxLo6FhjiYqUheSOV0Eb729ZwkXXPrPTeK6kl/VMgaUlsYoAOv3nOJZcHk++V9pI17YNNngtbLVPTB9A==
-  dependencies:
-    css-select "^3.1.2"
-    css-what "^4.0.0"
-    domelementtype "^2.1.0"
-    domhandler "^4.0.0"
-    domutils "^2.4.4"
-
-cheerio@1.0.0-rc.5:
-  version "1.0.0-rc.5"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.5.tgz#88907e1828674e8f9fee375188b27dadd4f0fa2f"
-  integrity sha512-yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw==
-  dependencies:
-    cheerio-select-tmp "^0.1.0"
-    dom-serializer "~1.2.0"
-    domhandler "^4.0.0"
-    entities "~2.1.0"
-    htmlparser2 "^6.0.0"
-    parse5 "^6.0.0"
-    parse5-htmlparser2-tree-adapter "^6.0.0"
+cheerio-select@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.3.0.tgz#26a50968260b7e4281238c1e7da7ed2766652f3b"
+  integrity sha512-mLgqdHxVOQyhOIkG5QnRkDg7h817Dkf0dAvlCio2TJMmR72cJKH0bF28SHXvLkVrGcGOiub0/Bs/CMnPeQO7qw==
+  dependencies:
+    css-select "^4.0.0"
+    css-what "^5.0.0"
+    domelementtype "^2.2.0"
+    domhandler "^4.1.0"
+    domutils "^2.5.2"
+
+cheerio@1.0.0-rc.6:
+  version "1.0.0-rc.6"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.6.tgz#a5ae81ab483aeefa1280c325543c601145506240"
+  integrity sha512-hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw==
+  dependencies:
+    cheerio-select "^1.3.0"
+    dom-serializer "^1.3.1"
+    domhandler "^4.1.0"
+    htmlparser2 "^6.1.0"
+    parse5 "^6.0.1"
+    parse5-htmlparser2-tree-adapter "^6.0.1"
 
 "chokidar@>=2.0.0 <4.0.0", chokidar@^3.2.2, chokidar@^3.4.1:
   version "3.5.1"
@@ -6551,6 +6550,17 @@ css-select@^3.1.2:
     domutils "^2.4.3"
     nth-check "^2.0.0"
 
+css-select@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.0.0.tgz#9b7b53bd82e4b348a6e0924ce37645e5db43af8e"
+  integrity sha512-I7favumBlDP/nuHBKLfL5RqvlvRdn/W29evvWJ+TaoGPm7QD+xSIN5eY2dyGjtkUmemh02TZrqJb4B8DWo6PoQ==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^5.0.0"
+    domhandler "^4.1.0"
+    domutils "^2.5.1"
+    nth-check "^2.0.0"
+
 css-tree@1.0.0-alpha.37:
   version "1.0.0-alpha.37"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
@@ -6590,6 +6600,11 @@ css-what@^4.0.0:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-4.0.0.tgz#35e73761cab2eeb3d3661126b23d7aa0e8432233"
   integrity sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==
 
+css-what@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.0.tgz#f0bf4f8bac07582722346ab243f6a35b512cfc47"
+  integrity sha512-qxyKHQvgKwzwDWC/rGbT821eJalfupxYW2qbSJSAtdSTimsr/MlaGONoNLllaUPZWf8QnbcKM/kPVYUQuEKAFA==
+
 css@^2.0.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
@@ -7201,10 +7216,10 @@ dom-serializer@0:
     domelementtype "^2.0.1"
     entities "^2.0.0"
 
-dom-serializer@^1.0.1, dom-serializer@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1"
-  integrity sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==
+dom-serializer@^1.0.1, dom-serializer@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.1.tgz#d845a1565d7c041a95e5dab62184ab41e3a519be"
+  integrity sha512-Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q==
   dependencies:
     domelementtype "^2.0.1"
     domhandler "^4.0.0"
@@ -7230,10 +7245,10 @@ domelementtype@^2.0.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
   integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
 
-domelementtype@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
-  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
+domelementtype@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
 
 domexception@^2.0.1:
   version "2.0.1"
@@ -7249,12 +7264,12 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domhandler@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz#01ea7821de996d85f69029e81fa873c21833098e"
-  integrity sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==
+domhandler@^4.0.0, domhandler@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.1.0.tgz#c1d8d494d5ec6db22de99e46a149c2a4d23ddd43"
+  integrity sha512-/6/kmsGlMY4Tup/nGVutdrK9yQi4YjWVcVeoQmixpzjOUK1U7pQkvAPHBJeUxOgxF0J8f8lwCJSlCfD0V4CMGQ==
   dependencies:
-    domelementtype "^2.1.0"
+    domelementtype "^2.2.0"
 
 domutils@1.5.1:
   version "1.5.1"
@@ -7272,7 +7287,7 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^2.4.3, domutils@^2.4.4:
+domutils@^2.4.3:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.4.tgz#282739c4b150d022d34699797369aad8d19bbbd3"
   integrity sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==
@@ -7281,6 +7296,15 @@ domutils@^2.4.3, domutils@^2.4.4:
     domelementtype "^2.0.1"
     domhandler "^4.0.0"
 
+domutils@^2.5.1, domutils@^2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.5.2.tgz#37ef8ba087dff1a17175e7092e8a042e4b050e6c"
+  integrity sha512-MHTthCb1zj8f1GVfRpeZUbohQf/HdBos0oX5gZcQFepOZPLLRyj6Wn7XS7EMnY7CVpwv8863u2vyE83Hfu28HQ==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.1.0"
+
 dot-case@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
@@ -7545,7 +7569,7 @@ entities@^1.1.1, entities@^1.1.2:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-entities@^2.0.0, entities@~2.1.0:
+entities@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
   integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
@@ -9909,14 +9933,14 @@ htmlparser2@^3.10.0, htmlparser2@^3.3.0:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
-htmlparser2@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.0.0.tgz#c2da005030390908ca4c91e5629e418e0665ac01"
-  integrity sha512-numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw==
+htmlparser2@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
   dependencies:
     domelementtype "^2.0.1"
     domhandler "^4.0.0"
-    domutils "^2.4.4"
+    domutils "^2.5.2"
     entities "^2.0.0"
 
 http-cache-semantics@3.8.1:
@@ -13943,7 +13967,7 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
-parse5-htmlparser2-tree-adapter@^6.0.0:
+parse5-htmlparser2-tree-adapter@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
   integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==

From ec2f0deaaf4ad50cacbc4402ea5eedb50bfaab92 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 08:54:25 +0000
Subject: [PATCH 157/288] build(deps-dev): bump @storybook/node-logger from
 6.2.5 to 6.2.7 (#3480)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a664778e0a44..31bb247d6db0 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@storybook/addon-actions": "^6.2.7",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.7",
-    "@storybook/node-logger": "^6.2.5",
+    "@storybook/node-logger": "^6.2.7",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
     "@testing-library/react": "^11.2.6",
diff --git a/yarn.lock b/yarn.lock
index 7599ce2ebee4..130ff295db60 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2815,10 +2815,10 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/node-logger@^6.2.5":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.5.tgz#a1488dc75b0e359fd32937d9d27132c7f6a73874"
-  integrity sha512-vActH+XxtxUn0E/uxZbFgiFZ6fjnfkw9imLPrIhBzLuFU+HZP8INkP/SAIqPf5SzJ7k24fkZFaEq6QakB8mI2A==
+"@storybook/node-logger@^6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.7.tgz#2329042e44eba1efcc6bb0689c8566a555d5b0ee"
+  integrity sha512-dzsFKn/3as6Nf21/9whh4HHfKOFfKlZaG5FxuhRlB3g3j61sAlE5LI4DXHgc0NoyfV5Ymbj3BPbtlCsNOy2i5A==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^4.1.0"

From 2f44c12993a7c8d4420e69c9373c910b9d9aa439 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 08:57:13 +0000
Subject: [PATCH 158/288] build(deps-dev): bump @storybook/addon-a11y from
 6.2.4 to 6.2.7 (#3479)

---
 package.json |   2 +-
 yarn.lock    | 192 ++++-----------------------------------------------
 2 files changed, 14 insertions(+), 180 deletions(-)

diff --git a/package.json b/package.json
index 31bb247d6db0..f892c864f9bb 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "@babel/core": "^7.13.15",
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
-    "@storybook/addon-a11y": "^6.2.4",
+    "@storybook/addon-a11y": "^6.2.7",
     "@storybook/addon-actions": "^6.2.7",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.7",
diff --git a/yarn.lock b/yarn.lock
index 130ff295db60..6f3cd1a06348 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2088,19 +2088,19 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@storybook/addon-a11y@^6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.4.tgz#2f9904ba92ac0e904c4d6404948d6c18e27c7f62"
-  integrity sha512-eQ28U7a6efnK7mtJT+NJs+zi3/F+feu0PdOjCqsaSu0SPfr9P6CdXokWSSnSH8Gx2G0iiJa9eYEajAiZd5v7wg==
-  dependencies:
-    "@storybook/addons" "6.2.4"
-    "@storybook/api" "6.2.4"
-    "@storybook/channels" "6.2.4"
-    "@storybook/client-api" "6.2.4"
-    "@storybook/client-logger" "6.2.4"
-    "@storybook/components" "6.2.4"
-    "@storybook/core-events" "6.2.4"
-    "@storybook/theming" "6.2.4"
+"@storybook/addon-a11y@^6.2.7":
+  version "6.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.7.tgz#4e0c4777ed085f81a572724f79576400c42487cf"
+  integrity sha512-pILLWLl3CGLsORDeD76pRphX+nT0C/GpjUOwWZZDqV9aVXY20zUo48EdpyPzgXF1vXzOVIm/6UxnrqorvXnEPg==
+  dependencies:
+    "@storybook/addons" "6.2.7"
+    "@storybook/api" "6.2.7"
+    "@storybook/channels" "6.2.7"
+    "@storybook/client-api" "6.2.7"
+    "@storybook/client-logger" "6.2.7"
+    "@storybook/components" "6.2.7"
+    "@storybook/core-events" "6.2.7"
+    "@storybook/theming" "6.2.7"
     axe-core "^4.1.1"
     core-js "^3.8.2"
     global "^4.4.0"
@@ -2313,21 +2313,6 @@
     global "^4.3.2"
     regenerator-runtime "^0.13.7"
 
-"@storybook/addons@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.4.tgz#187745f0dce9e322d8f6199329a5d1b9ead285fe"
-  integrity sha512-z1XwXfmRpFa8MDKQVGoBaBLtxo2v/5L8TFuJro6jK0UPmRBuo4RtDPwgCSizNAVieJx1qu5tjRylZPA3Xz8bBA==
-  dependencies:
-    "@storybook/api" "6.2.4"
-    "@storybook/channels" "6.2.4"
-    "@storybook/client-logger" "6.2.4"
-    "@storybook/core-events" "6.2.4"
-    "@storybook/router" "6.2.4"
-    "@storybook/theming" "6.2.4"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    regenerator-runtime "^0.13.7"
-
 "@storybook/addons@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.7.tgz#f31343654e564dd91f1ec103f130fa23e996745b"
@@ -2368,32 +2353,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/api@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.4.tgz#7e230c8e4c66834e43b13f08ea858865a2493888"
-  integrity sha512-7xA9bcfQHf+jw/tGPqoK3RZ8csySHiyvnHo4WvDF5Ar9rQNw1kIZdHa4VB82vhsNp9nQIA3AVIhRGZj0V0Zntw==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/channels" "6.2.4"
-    "@storybook/client-logger" "6.2.4"
-    "@storybook/core-events" "6.2.4"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.4"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.4"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.12.0"
-    telejson "^5.1.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.7.tgz#5417dfe0c5a7a49a4e47f5a4c2be7a1bbdb7d5b3"
@@ -2433,19 +2392,6 @@
     qs "^6.6.0"
     telejson "^5.0.2"
 
-"@storybook/channel-postmessage@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.4.tgz#2ce6ba304b5f696eec2eb7ff8a32e44f0440d889"
-  integrity sha512-UC3+TPsjnP0b6VArJaKT7zgfmSZCO0v4lrGSiQoXM372mzDJAFSKLNYAIDL5er+xfO30i7TA1CyI95l+EG3cgQ==
-  dependencies:
-    "@storybook/channels" "6.2.4"
-    "@storybook/client-logger" "6.2.4"
-    "@storybook/core-events" "6.2.4"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    qs "^6.10.0"
-    telejson "^5.1.0"
-
 "@storybook/channel-postmessage@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.7.tgz#4025d3746fac9b1c2264001606c7a361d1144417"
@@ -2468,15 +2414,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channels@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.4.tgz#8206610941a5b44beec921d1c900bd2ff13b46c6"
-  integrity sha512-8WuiSz0zbqEOKg2uMV34TnSDMmEvU/LpdiCyjh9IpxuL5+CP+xTp3ATZNbJdy2YND7GIkwopoRvsO/Kq1V1SnQ==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/channels@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.7.tgz#b6b64e9f7318afe3a005042395356fd0a878001c"
@@ -2510,30 +2447,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-api@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.4.tgz#47b83155d7ab0eb47f9260221f426127e21d7651"
-  integrity sha512-7ZSuzOyGOwqV9HVODEyQ6wwdzk9Nz6l99erj3m2Kb4BTi1SKZM/rqOtpOo8NJIIPRJn8pITc2AvvwsC7YquSVw==
-  dependencies:
-    "@storybook/addons" "6.2.4"
-    "@storybook/channel-postmessage" "6.2.4"
-    "@storybook/channels" "6.2.4"
-    "@storybook/client-logger" "6.2.4"
-    "@storybook/core-events" "6.2.4"
-    "@storybook/csf" "0.0.1"
-    "@types/qs" "^6.9.5"
-    "@types/webpack-env" "^1.16.0"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    stable "^0.1.8"
-    store2 "^2.12.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-api@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.7.tgz#7e788314582b9fc09fbd150ef95d0714d5d22b9c"
@@ -2566,14 +2479,6 @@
     core-js "^3.0.1"
     global "^4.3.2"
 
-"@storybook/client-logger@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.4.tgz#d64ead905518fadfd30dbb322a982aac8ef5b5f9"
-  integrity sha512-1ECiM+XOys4eIH/spslc2scmuhrpEa9xypr4lqVHnltN+Jlai6BJRgXalgity4ml0RHIn7rSB+SN7BgrRmGuxg==
-  dependencies:
-    core-js "^3.8.2"
-    global "^4.4.0"
-
 "@storybook/client-logger@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.7.tgz#deca6d5b157d6ea22ec8f271399e9d10bb293a2c"
@@ -2609,36 +2514,6 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/components@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.4.tgz#3c0d71dc05bca98d37de09c5b8989653cdbdfa14"
-  integrity sha512-M1sRzlvFdrAqEoKAFn7Ekk2Sp7NIbYIksCD9o/cAqCWRQHw3uCVTvM8tWzpspn/6pz0i1E2BnXOYv8HePBMrtQ==
-  dependencies:
-    "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.2.4"
-    "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.2.4"
-    "@types/color-convert" "^2.0.0"
-    "@types/overlayscrollbars" "^1.12.0"
-    "@types/react-syntax-highlighter" "11.0.5"
-    color-convert "^2.0.1"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    markdown-to-jsx "^7.1.0"
-    memoizerific "^1.11.3"
-    overlayscrollbars "^1.13.1"
-    polished "^4.0.5"
-    prop-types "^15.7.2"
-    react-colorful "^5.0.1"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.3"
-    react-textarea-autosize "^8.3.0"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/components@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.7.tgz#03ee5e22c48631fe17829299d2da61bb4e0598ce"
@@ -2676,13 +2551,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.4.tgz#739638777c3625e4ab4e48346546aebb43d8e12a"
-  integrity sha512-g71IzuvmIPNZ/V4JYbfJO0vvKDgi1YM1Oud7UnZ7fHoyJi8DvmZoa97vEppYPumF2zdw7KI/1NIOYHOSjnwwvw==
-  dependencies:
-    core-js "^3.8.2"
-
 "@storybook/core-events@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.7.tgz#47f9bbbf7f5959eab9ffcf6e2893f09014297608"
@@ -2885,22 +2753,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/router@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.4.tgz#a5b8480432b7e77b61e5f4347d28093f5621fab8"
-  integrity sha512-Idt0uaj2vcKa68nQotwazG6GmL6x+zhWxTIM7IZrLVFHxzjAo5Ou0SkU09C4FwqEByxPclRFMYzLu91TM6tmFQ==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/client-logger" "6.2.4"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/router@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.7.tgz#b6bfedc237f0b3834f8fa9eb724d91bd3eaff832"
@@ -2960,24 +2812,6 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/theming@6.2.4":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.4.tgz#9c4f252fa338726e3a7e88660432b5739d6ce94f"
-  integrity sha512-2KmHMhK9HOrDt5kbItclB9+X0tXgpNMGzs6hMz5syq96zZRQdkoqZG6eA+sDhsscuvzjRn0FH7vfUbNX4IqAKw==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.2.4"
-    core-js "^3.8.2"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.27"
-    global "^4.4.0"
-    memoizerific "^1.11.3"
-    polished "^4.0.5"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/theming@6.2.7":
   version "6.2.7"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.7.tgz#7dbbcde537099b1fe65ec63a517fd54a3dd587f5"

From b2f937a5979e6903d7e4dbba51289c17f4630df5 Mon Sep 17 00:00:00 2001
From: Chris Mills <cmills@mozilla.com>
Date: Fri, 9 Apr 2021 15:50:04 +0100
Subject: [PATCH 159/288] adding angular docs to the learning area sidebar
 (#3485)

---
 kumascript/macros/LearnSidebar.ejs | 48 ++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/kumascript/macros/LearnSidebar.ejs b/kumascript/macros/LearnSidebar.ejs
index 66ea827e786c..f58295b28deb 100644
--- a/kumascript/macros/LearnSidebar.ejs
+++ b/kumascript/macros/LearnSidebar.ejs
@@ -223,6 +223,13 @@ var text = mdn.localStringMap({
         'Working_with_Svelte_stores': 'Working with Svelte stores',
         'TypeScript_support_in_Svelte': 'TypeScript support in Svelte',
         'Deployment_and_next_steps': 'Deployment and next steps',
+      'Angular': 'Angular',
+        'Getting_started_with_Angular': 'Getting started with Angular',
+        'Beginning_our_Angular_todo_list_app': 'Beginning our Angular todo list app',
+        'Styling_our_Angular_app': 'Styling our Angular app',
+        'Creating_an_item_component': 'Creating an item component',
+        'Filtering_our_to-do_items': 'Filtering our to-do items',
+        'Building_Angular_applications_and_further_resources': 'Building Angular applications and further resources',
     'Server-side_website_programming' : 'Server-side website programming',
       'First_steps' : 'First steps',
         'First_steps_overview' : 'First steps overview',
@@ -969,6 +976,13 @@ var text = mdn.localStringMap({
         'Working_with_Svelte_stores': 'Working with Svelte stores',
         'TypeScript_support_in_Svelte': 'TypeScript support in Svelte',
         'Deployment_and_next_steps': 'Deployment and next steps',
+      'Angular': 'Angular',
+        'Getting_started_with_Angular': 'Getting started with Angular',
+        'Beginning_our_Angular_todo_list_app': 'Beginning our Angular todo list app',
+        'Styling_our_Angular_app': 'Styling our Angular app',
+        'Creating_an_item_component': 'Creating an item component',
+        'Filtering_our_to-do_items': 'Filtering our to-do items',
+        'Building_Angular_applications_and_further_resources': 'Building Angular applications and further resources',
     'Server-side_website_programming' : 'Программирование серверной части сайта',
       'First_steps' : 'Первые шаги',
         'First_steps_overview' : 'Первые шаги',
@@ -1211,6 +1225,13 @@ var text = mdn.localStringMap({
         'Working_with_Svelte_stores': 'Working with Svelte stores',
         'TypeScript_support_in_Svelte': 'TypeScript support in Svelte',
         'Deployment_and_next_steps': 'Deployment and next steps',
+      'Angular': 'Angular',
+        'Getting_started_with_Angular': 'Getting started with Angular',
+        'Beginning_our_Angular_todo_list_app': 'Beginning our Angular todo list app',
+        'Styling_our_Angular_app': 'Styling our Angular app',
+        'Creating_an_item_component': 'Creating an item component',
+        'Filtering_our_to-do_items': 'Filtering our to-do items',
+        'Building_Angular_applications_and_further_resources': 'Building Angular applications and further resources',
     'Server-side_website_programming' : '服务端网页编程',
       'First_steps' : '第一步',
         'First_steps_overview' : '第一步概述',
@@ -1448,6 +1469,13 @@ var text = mdn.localStringMap({
         'Working_with_Svelte_stores': 'Working with Svelte stores',
         'TypeScript_support_in_Svelte': 'TypeScript support in Svelte',
         'Deployment_and_next_steps': 'Deployment and next steps',
+      'Angular': 'Angular',
+        'Getting_started_with_Angular': 'Getting started with Angular',
+        'Beginning_our_Angular_todo_list_app': 'Beginning our Angular todo list app',
+        'Styling_our_Angular_app': 'Styling our Angular app',
+        'Creating_an_item_component': 'Creating an item component',
+        'Filtering_our_to-do_items': 'Filtering our to-do items',
+        'Building_Angular_applications_and_further_resources': 'Building Angular applications and further resources',
     'Server-side_website_programming' : '伺服端網站程式設計',
       'First_steps' : '第一步',
         'First_steps_overview' : '第一步概述',
@@ -1716,6 +1744,13 @@ var text = mdn.localStringMap({
         'Working_with_Svelte_stores': 'Working with Svelte stores',
         'TypeScript_support_in_Svelte': 'TypeScript support in Svelte',
         'Deployment_and_next_steps': 'Deployment and next steps',
+      'Angular': 'Angular',
+        'Getting_started_with_Angular': 'Getting started with Angular',
+        'Beginning_our_Angular_todo_list_app': 'Beginning our Angular todo list app',
+        'Styling_our_Angular_app': 'Styling our Angular app',
+        'Creating_an_item_component': 'Creating an item component',
+        'Filtering_our_to-do_items': 'Filtering our to-do items',
+        'Building_Angular_applications_and_further_resources': 'Building Angular applications and further resources',
     'Server-side_website_programming' : 'Server-side website programming',
       'First_steps' : 'First steps',
         'First_steps_overview' : 'First steps overview',
@@ -2102,6 +2137,19 @@ var text = mdn.localStringMap({
         </ol>
     </details>
   </li>
+  <li class="toggle">
+    <details <%=currentPageIsUnder('Tools_and_testing/Client-side_JavaScript_frameworks')%>>
+        <summary><%=text['Angular']%></summary>
+        <ol>
+          <li><a href="<%=baseURL%>Tools_and_testing/Client-side_JavaScript_frameworks/Angular_getting_started"><%=text['Getting_started_with_Angular']%></a></li>
+          <li><a href="<%=baseURL%>Tools_and_testing/Client-side_JavaScript_frameworks/Angular_todo_list_beginning"><%=text['Beginning_our_Angular_todo_list_app']%></a></li>
+          <li><a href="<%=baseURL%>Tools_and_testing/Client-side_JavaScript_frameworks/Angular_styling"><%=text['Styling_our_Angular_app']%></a></li>
+          <li><a href="<%=baseURL%>Tools_and_testing/Client-side_JavaScript_frameworks/Angular_item_component"><%=text['Creating_an_item_component']%></a></li>
+          <li><a href="<%=baseURL%>Tools_and_testing/Client-side_JavaScript_frameworks/Angular_filtering"><%=text['Filtering_our_to-do_items']%></a></li>
+          <li><a href="<%=baseURL%>Tools_and_testing/Client-side_JavaScript_frameworks/Angular_building"><%=text['Building_Angular_applications_and_further_resources']%></a></li>
+        </ol>
+    </details>
+  </li>
   <li class="toggle">
     <details <%=currentPageIsUnder('Tools_and_testing/GitHub')%>>
         <summary><%=text['Git_and_GitHub']%></summary>

From 32f1f53ee8e37528ddc87eeb8594138cef16f9bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 06:40:12 +0000
Subject: [PATCH 160/288] build(deps-dev): bump jsdom from 16.5.2 to 16.5.3
 (#3490)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f892c864f9bb..57bdbfe63128 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
     "jest-environment-jsdom-sixteen": "^1.0.3",
     "jest-junit-reporter": "^1.1.0",
     "jest-puppeteer": "4.4.0",
-    "jsdom": "^16.5.2",
+    "jsdom": "^16.5.3",
     "jsesc": "^3.0.2",
     "nodemon": "2.0.7",
     "pegjs": "^0.10.0",
diff --git a/yarn.lock b/yarn.lock
index 6f3cd1a06348..6419c8b29253 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11544,10 +11544,10 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdom@^16.2.1, jsdom@^16.4.0, jsdom@^16.5.2:
-  version "16.5.2"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.2.tgz#583fac89a0aea31dbf6237e7e4bedccd9beab472"
-  integrity sha512-JxNtPt9C1ut85boCbJmffaQ06NBnzkQY/MWO3YxPW8IWS38A26z+B1oBvA9LwKrytewdfymnhi4UNH3/RAgZrg==
+jsdom@^16.2.1, jsdom@^16.4.0, jsdom@^16.5.3:
+  version "16.5.3"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136"
+  integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA==
   dependencies:
     abab "^2.0.5"
     acorn "^8.1.0"

From 8267f0090b0ddb6b6344092c112229ab94e57b5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 06:40:30 +0000
Subject: [PATCH 161/288] build(deps): bump http-proxy-middleware from 1.1.0 to
 1.1.1 (#3491)

---
 package.json | 2 +-
 yarn.lock    | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 57bdbfe63128..036b4128452d 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "hast-util-is-element": "^1.1.0",
     "hast-util-to-html": "^7.1.2",
     "hast-util-to-text": "^2.0.1",
-    "http-proxy-middleware": "1.1.0",
+    "http-proxy-middleware": "1.1.1",
     "image-size": "0.9.7",
     "image-type": "4.1.0",
     "imagemin": "7.0.1",
diff --git a/yarn.lock b/yarn.lock
index 6419c8b29253..0b7de64fcdcf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9839,13 +9839,12 @@ http-proxy-middleware@0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
-http-proxy-middleware@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.1.0.tgz#b896b2cc6836019af4a4f2d5f7b21b99c77ea13f"
-  integrity sha512-OnjU5vyVgcZVe2AjLJyMrk8YLNOC2lspCHirB5ldM+B/dwEfZ5bgVTrFyzE9R7xRWAP/i/FXtvIqKjTNEZBhBg==
+http-proxy-middleware@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.1.1.tgz#48900a68cd9d388c735d1dd97302c919b7e94a13"
+  integrity sha512-FIDg9zPvOwMhQ3XKB2+vdxK6WWbVAH7s5QpqQCif7a1TNL76GNAATWA1sy6q2gSfss8UJ/Nwza3N6QnFkKclpA==
   dependencies:
     "@types/http-proxy" "^1.17.5"
-    camelcase "^6.2.0"
     http-proxy "^1.18.1"
     is-glob "^4.0.1"
     is-plain-obj "^3.0.0"

From 5a004fceef024f43494de787334f275c7f6ab83f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 06:41:44 +0000
Subject: [PATCH 162/288] build(deps-dev): bump eslint-plugin-jest from 24.3.4
 to 24.3.5 (#3492)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 036b4128452d..07d95a536696 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "downshift": "^6.1.2",
     "eslint": "^7.18.0",
     "eslint-gitignore": "^0.1.0",
-    "eslint-plugin-jest": "24.3.4",
+    "eslint-plugin-jest": "24.3.5",
     "eslint-plugin-node": "11.1.0",
     "extend": "^3.0.2",
     "flexsearch": "0.6.32",
diff --git a/yarn.lock b/yarn.lock
index 0b7de64fcdcf..cc68893c0699 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7687,10 +7687,10 @@ eslint-plugin-import@^2.22.1:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-jest@24.3.4, eslint-plugin-jest@^24.1.0:
-  version "24.3.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.4.tgz#6d90c3554de0302e879603dd6405474c98849f19"
-  integrity sha512-3n5oY1+fictanuFkTWPwSlehugBTAgwLnYLFsCllzE3Pl1BwywHl5fL0HFxmMjoQY8xhUDk8uAWc3S4JOHGh3A==
+eslint-plugin-jest@24.3.5, eslint-plugin-jest@^24.1.0:
+  version "24.3.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.5.tgz#71f0b580f87915695c286c3f0eb88cf23664d044"
+  integrity sha512-XG4rtxYDuJykuqhsOqokYIR84/C8pRihRtEpVskYLbIIKGwPNW2ySxdctuVzETZE+MbF/e7wmsnbNVpzM0rDug==
   dependencies:
     "@typescript-eslint/experimental-utils" "^4.0.1"
 

From fb54e9591df6a0566d6cf94555a47fc1da8d5e0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 07:04:44 +0000
Subject: [PATCH 163/288] build(deps): bump boto3 from 1.17.44 to 1.17.49 in
 /deployer (#3493)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 70fce4e4b628..088871939401 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.44"
+version = "1.17.49"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.44,<1.21.0"
+botocore = ">=1.20.49,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.44"
+version = "1.20.49"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -533,7 +533,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "6673738107558a14908fac344422bcddc69f9387f8d877da74ce1dc5af420550"
+content-hash = "27fb79f47555bbf65374719f40c56bc72f2509e094f230d54b8a7f25f2c813b4"
 
 [metadata.files]
 appdirs = [
@@ -552,12 +552,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.44-py2.py3-none-any.whl", hash = "sha256:e74da1da74fbefbe2db7a9c53082018d862433f35e2ecd4c173632efc5742f40"},
-    {file = "boto3-1.17.44.tar.gz", hash = "sha256:ffb9b192b2b52ab88cde09e2af7d9fd6e541287e5719098be97ffd7144f47eb1"},
+    {file = "boto3-1.17.49-py2.py3-none-any.whl", hash = "sha256:d5ef160442925f5944e4cde88589f0f195f6c284f05613114fc6bbc35e342fa7"},
+    {file = "boto3-1.17.49.tar.gz", hash = "sha256:a482135c30fa07eaf4370314dd0fb49117222a266d0423b2075aed3835ed1f04"},
 ]
 botocore = [
-    {file = "botocore-1.20.44-py2.py3-none-any.whl", hash = "sha256:8a7f85bf05ad62551b0e6dfeeec471147b330cb2b5c7f48795057e811e6a2e77"},
-    {file = "botocore-1.20.44.tar.gz", hash = "sha256:2958e3912939558fd789a64b23a10039d8b0c0c84a23b573f3f2e3154de357ad"},
+    {file = "botocore-1.20.49-py2.py3-none-any.whl", hash = "sha256:6a672ba41dd00e5c1c1824ca8143d180d88de8736d78c0b1f96b8d3cb0466561"},
+    {file = "botocore-1.20.49.tar.gz", hash = "sha256:f7f103fa0651c69dd360c7d0ecd874854303de5cc0869e0cbc2818a52baacc69"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 1a6b276b7800..05364804b7a2 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.44"
+boto3 = "^1.17.49"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 80c0e56d002d6b577b3dd0ef4f1cc7e1a405dc43 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 12 Apr 2021 11:34:29 -0400
Subject: [PATCH 164/288] Ref macro injects unsafe_html HTML (#3496)

Fixes #3495
---
 kumascript/macros/ref.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kumascript/macros/ref.ejs b/kumascript/macros/ref.ejs
index ee2298a6de70..848c12712421 100644
--- a/kumascript/macros/ref.ejs
+++ b/kumascript/macros/ref.ejs
@@ -1 +1 @@
-<sup id=('ref_' + <%- $0 %>) class="reference plainlinksneverexpand"><%- web.link(page.uri + '#endnote_' + $0, '[' + $0 + ']') %></sup>
+<sup id="ref_<%- $0 %>" class="reference plainlinksneverexpand"><%- web.link(page.uri + '#endnote_' + $0, '[' + $0 + ']') %></sup>

From 157a86a1075fd76b682a96cd09d61ba14fcae8e5 Mon Sep 17 00:00:00 2001
From: Joel Bradshaw <cincodenada@gmail.com>
Date: Mon, 12 Apr 2021 12:43:25 -0700
Subject: [PATCH 165/288] Add release date for support statements with multiple
 versions (#2995)

* Add release date for support statements with multiple versions

The code that added in the release date did not account for support
statements that involve multiple releases (for example, a version with
flags and then a version with full support), so these entries did not
have a release date tooltip in the compatibility table.

This commit extends the release date addition to annotate the release
date for all versions in a support statement.

* Standardize the data, don't deal with two forms

Just ensure we always are dealing with an array
---
 build/document-extractor.js | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/build/document-extractor.js b/build/document-extractor.js
index ec94e6b07bc6..91f8a1e477ca 100644
--- a/build/document-extractor.js
+++ b/build/document-extractor.js
@@ -311,13 +311,26 @@ function _addSingleSectionBCD($) {
       block = compat.__compat;
     }
     if (block) {
-      for (const [browser, info] of Object.entries(block.support)) {
-        const added = info.version_added;
-        if (browserReleaseData.has(browser)) {
-          if (browserReleaseData.get(browser).has(added)) {
-            info.release_date = browserReleaseData
-              .get(browser)
-              .get(added).release_date;
+      for (let [browser, info] of Object.entries(block.support)) {
+        // `info` here will be one of the following:
+        //  - a single simple_support_statement:
+        //    { version_added: 42 }
+        //  - an array of simple_support_statements:
+        //    [ { version_added: 42 }, { prefix: '-moz', version_added: 35 } ]
+        //
+        // Standardize the first version to an array of one, so we don't have
+        // to deal with two different forms below
+        if (!Array.isArray(info)) {
+          info = [info];
+        }
+        for (const infoEntry of info) {
+          const added = infoEntry.version_added;
+          if (browserReleaseData.has(browser)) {
+            if (browserReleaseData.get(browser).has(added)) {
+              infoEntry.release_date = browserReleaseData
+                .get(browser)
+                .get(added).release_date;
+            }
           }
         }
       }

From 8842e6266fb64841f9f28d4005dcb602a71fc5c3 Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Tue, 13 Apr 2021 06:58:49 +0900
Subject: [PATCH 166/288] =?UTF-8?q?Fix=20SVG=20<text>=20=E2=80=9CPermitted?=
 =?UTF-8?q?=20content=E2=80=9D=20(#3456)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per https://svgwg.org/svg2-draft/text.html#elementdef-text the permitted
content for the SVG <text> element includes “text content child
elements” — not “text content elements” (which is something different).

Fixes https://github.com/mdn/content/issues/3882

This change also makes a change to the svginfo macro to cause it to use
all-lowercase for the link anchors it generates (rather than initial cap).
---
 kumascript/macros/L10n-SVG.json | 3 +++
 kumascript/macros/SVGData.json  | 2 +-
 kumascript/macros/svginfo.ejs   | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kumascript/macros/L10n-SVG.json b/kumascript/macros/L10n-SVG.json
index 6e5a73faf97f..9327467aa78d 100644
--- a/kumascript/macros/L10n-SVG.json
+++ b/kumascript/macros/L10n-SVG.json
@@ -288,6 +288,9 @@
     "zh-CN": "结构化元素",
     "ru": "Структурные элементы"
   },
+  "textContentChildElements": {
+    "en-US": "Text content child elements"
+  },
   "textContentElements": {
     "en-US": "Text content elements",
     "de": "Textinhaltselemente",
diff --git a/kumascript/macros/SVGData.json b/kumascript/macros/SVGData.json
index 2aef95abd3f8..710b91adaa7a 100644
--- a/kumascript/macros/SVGData.json
+++ b/kumascript/macros/SVGData.json
@@ -1768,7 +1768,7 @@
         "elements": [
           "animationElements",
           "descriptiveElements",
-          "textContentElements",
+          "textContentChildElements",
           "&lt;a&gt;"
         ]
       },
diff --git a/kumascript/macros/svginfo.ejs b/kumascript/macros/svginfo.ejs
index f7cf39e696b1..cd6380436962 100644
--- a/kumascript/macros/svginfo.ejs
+++ b/kumascript/macros/svginfo.ejs
@@ -49,8 +49,6 @@ if (name === "preview-wiki-content") {
             } else {
                 var anchor = element.replace(/[A-Z]/g, function(match) {
                         return "_" + match.toLowerCase();
-                    }).replace(/^./, function(match) {
-                        return match.toUpperCase();
                     });
                 elementGroups.push("<a href=\"/" + env.locale +
                     "/docs/Web/SVG/Element#" + anchor + "\">" +

From b9f58b567534722c8b05f6c3b8a83ead85afecc0 Mon Sep 17 00:00:00 2001
From: Ryan Johnson <rjohnson@mozilla.com>
Date: Mon, 12 Apr 2021 15:02:05 -0700
Subject: [PATCH 167/288] fix kumascript test svginfo.test.js (#3504)

---
 kumascript/tests/macros/svginfo.test.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/kumascript/tests/macros/svginfo.test.js b/kumascript/tests/macros/svginfo.test.js
index c3798c22af6c..0550d26b24aa 100644
--- a/kumascript/tests/macros/svginfo.test.js
+++ b/kumascript/tests/macros/svginfo.test.js
@@ -47,12 +47,8 @@ function joinPathsForUrl(...chunks) {
 // @param str     <string>  The string to transform
 // @param upFirst <boolean> Indicate is the first letter must be upper cased (true by default)
 // @return <string>
-function camelToSnake(str, upFirst = true) {
-  str = str.replace(/[A-Z]/g, (match) => `_${match.toLowerCase()}`);
-
-  if (upFirst) str = str.replace(/^./, (match) => match.toUpperCase());
-
-  return str;
+function camelToSnake(str) {
+  return str.replace(/[A-Z]/g, (match) => `_${match.toLowerCase()}`);
 }
 
 // Test utilities

From 9d22439008c67dc9aaca2de3111f989ec5ea008f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Apr 2021 05:46:06 +0000
Subject: [PATCH 168/288] build(deps): bump actions/cache from v2.1.4 to v2.1.5
 (#3505)

---
 .github/workflows/content-origin-request.yml   | 2 +-
 .github/workflows/dev-build.yml                | 2 +-
 .github/workflows/developing.yml               | 2 +-
 .github/workflows/npm-publish.yml              | 2 +-
 .github/workflows/npm-published-simulation.yml | 2 +-
 .github/workflows/performance.yml              | 2 +-
 .github/workflows/pr-deployer.yml              | 2 +-
 .github/workflows/pr-kumascript.yml            | 2 +-
 .github/workflows/prod-build.yml               | 2 +-
 .github/workflows/stage-build.yml              | 2 +-
 .github/workflows/testing.yml                  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/content-origin-request.yml b/.github/workflows/content-origin-request.yml
index d5637420608b..3c823f8771ea 100644
--- a/.github/workflows/content-origin-request.yml
+++ b/.github/workflows/content-origin-request.yml
@@ -24,7 +24,7 @@ jobs:
           node-version: "12"
 
       - name: Cache node_modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         id: cached-node_modules
         with:
           path: |
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index 6e826fec02d2..cd6ad3863af2 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -72,7 +72,7 @@ jobs:
           node-version: "12"
 
       - name: Cache node_modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         id: cached-node_modules
         with:
           path: |
diff --git a/.github/workflows/developing.yml b/.github/workflows/developing.yml
index d3ffdfb494e5..1a75352c72e1 100644
--- a/.github/workflows/developing.yml
+++ b/.github/workflows/developing.yml
@@ -21,7 +21,7 @@ jobs:
           node-version: "12"
 
       - name: Cache node_modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         id: cached-node_modules
         with:
           path: |
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
index 68570660e866..9e9e97e1eb9a 100644
--- a/.github/workflows/npm-publish.yml
+++ b/.github/workflows/npm-publish.yml
@@ -26,7 +26,7 @@ jobs:
           node-version: "12"
 
       - name: Cache node_modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         id: cached-node_modules
         with:
           path: |
diff --git a/.github/workflows/npm-published-simulation.yml b/.github/workflows/npm-published-simulation.yml
index ca13f0914828..2e5463a13992 100644
--- a/.github/workflows/npm-published-simulation.yml
+++ b/.github/workflows/npm-published-simulation.yml
@@ -26,7 +26,7 @@ jobs:
           node-version: "12"
 
       - name: Cache node_modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         id: cached-node_modules
         with:
           path: |
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 6614649667ea..5d1e4d53683d 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -30,7 +30,7 @@ jobs:
           node-version: "12"
 
       - name: Cache node_modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         id: cached-node_modules
         with:
           path: |
diff --git a/.github/workflows/pr-deployer.yml b/.github/workflows/pr-deployer.yml
index fe8543e52715..d723cd3f907b 100644
--- a/.github/workflows/pr-deployer.yml
+++ b/.github/workflows/pr-deployer.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         with:
           path: deployer/.venv
           key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
diff --git a/.github/workflows/pr-kumascript.yml b/.github/workflows/pr-kumascript.yml
index abd5f076fc76..eaecade06a30 100644
--- a/.github/workflows/pr-kumascript.yml
+++ b/.github/workflows/pr-kumascript.yml
@@ -29,7 +29,7 @@ jobs:
           node-version: "12"
 
       - name: Cache node_modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         id: cached-node_modules
         with:
           path: |
diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
index d5a19aa22263..ee42d1fc7ad2 100644
--- a/.github/workflows/prod-build.yml
+++ b/.github/workflows/prod-build.yml
@@ -97,7 +97,7 @@ jobs:
           node-version: "12"
 
       - name: Cache node_modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         id: cached-node_modules
         with:
           path: |
diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
index ef5fe64217ec..dcb1f416bb3c 100644
--- a/.github/workflows/stage-build.yml
+++ b/.github/workflows/stage-build.yml
@@ -97,7 +97,7 @@ jobs:
           node-version: "12"
 
       - name: Cache node_modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         id: cached-node_modules
         with:
           path: |
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 398c9cc70d73..d11701794927 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -22,7 +22,7 @@ jobs:
           node-version: "12"
 
       - name: Cache node_modules
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v2.1.5
         id: cached-node_modules
         with:
           path: |

From bc24a085f825a045dd22bc763f315671a6e6386f Mon Sep 17 00:00:00 2001
From: Florian Scholz <fscholz@mozilla.com>
Date: Tue, 13 Apr 2021 16:11:58 +0200
Subject: [PATCH 169/288] Treat BCD ranges as exact versions to avoid confusion
 for the reader (#3494)

* Treat BCD ranges as exact versions to avoid confusion for the reader

* Update client/src/document/ingredients/browser-compatibility-table/feature-row.tsx

Co-authored-by: Peter Bengtsson <peterbe@mozilla.com>

Co-authored-by: Peter Bengtsson <peterbe@mozilla.com>
---
 .../browser-compatibility-table/feature-row.tsx    | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/client/src/document/ingredients/browser-compatibility-table/feature-row.tsx b/client/src/document/ingredients/browser-compatibility-table/feature-row.tsx
index 34173e96940a..52de03ae4425 100644
--- a/client/src/document/ingredients/browser-compatibility-table/feature-row.tsx
+++ b/client/src/document/ingredients/browser-compatibility-table/feature-row.tsx
@@ -105,16 +105,12 @@ function labelFromString(version: string | boolean | null | undefined) {
   if (typeof version !== "string") {
     return <>{"?"}</>;
   }
-  if (!version.startsWith("≤")) {
-    return <>{version}</>;
+  // Treat BCD ranges as exact versions to avoid confusion for the reader
+  // See https://github.com/mdn/yari/issues/3238
+  if (version.startsWith("≤")) {
+    return <>{version.slice(1)}</>;
   }
-  const title = `Supported in version ${version.slice(1)} or earlier.`;
-  return (
-    <span title={title}>
-      <sup>≤&#xA0;</sup>
-      {version.slice(1)}
-    </span>
-  );
+  return <>{version}</>;
 }
 
 const CellText = React.memo(

From 646770cd5fa9af36c76efb237b62389143683fa8 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 13 Apr 2021 10:36:16 -0400
Subject: [PATCH 170/288] /en-US/ isn't a broken link (#3507)

Fixes #3326
Fixes #3447
---
 build/flaws.js                                | 32 ++++++++++++++++++-
 .../files/en-us/web/homepage_links/index.html | 25 +++++++++++++++
 testing/tests/index.test.js                   | 18 +++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 testing/content/files/en-us/web/homepage_links/index.html

diff --git a/build/flaws.js b/build/flaws.js
index 4b0eae5ade18..3d0d2abbbf18 100644
--- a/build/flaws.js
+++ b/build/flaws.js
@@ -25,7 +25,7 @@ const {
 } = require("./matches-in-text");
 const { humanFileSize } = require("./utils");
 const { VALID_MIME_TYPES } = require("../filecheck/constants");
-const { DEFAULT_LOCALE } = require("../libs/constants");
+const { DEFAULT_LOCALE, VALID_LOCALES } = require("../libs/constants");
 
 function injectFlaws(doc, $, options, document) {
   if (doc.isArchive) return;
@@ -279,6 +279,21 @@ function injectBrokenLinksFlaws(doc, $, { rawContent }, level) {
     });
   }
 
+  function isHomepageURL(url) {
+    // Return true if the URL is something like `/` or `/en-US` or `/fr/`
+    if (url === "/") {
+      return true;
+    }
+    if (!url.endsWith("/")) {
+      url += "/";
+    }
+    const split = url.split("/");
+    if (split.length === 3 && VALID_LOCALES.has(split[1].toLowerCase())) {
+      return true;
+    }
+    return false;
+  }
+
   $("a[href]").each((i, element) => {
     const a = $(element);
     const href = a.attr("href");
@@ -299,6 +314,21 @@ function injectBrokenLinksFlaws(doc, $, { rawContent }, level) {
         href,
         absoluteURL.pathname + absoluteURL.search + absoluteURL.hash
       );
+    } else if (isHomepageURL(href)) {
+      // But did you spell it perfectly?
+      const homepageLocale = href.split("/")[1];
+      if (
+        href !== "/" &&
+        (VALID_LOCALES.get(homepageLocale.toLowerCase()) !== homepageLocale ||
+          !href.endsWith("/"))
+      ) {
+        addBrokenLink(
+          a,
+          checked.get(href),
+          href,
+          `/${VALID_LOCALES.get(homepageLocale.toLowerCase())}/`
+        );
+      }
     } else if (href.startsWith("/") && !href.startsWith("//")) {
       // Got to fake the domain to sensible extract the .search and .hash
       const absoluteURL = new URL(href, "http://www.example.com");
diff --git a/testing/content/files/en-us/web/homepage_links/index.html b/testing/content/files/en-us/web/homepage_links/index.html
new file mode 100644
index 000000000000..78ef6d7aec3e
--- /dev/null
+++ b/testing/content/files/en-us/web/homepage_links/index.html
@@ -0,0 +1,25 @@
+---
+title: A page with links to the home page
+slug: Web/Homepage_links
+---
+<p>
+  <a href="/"><code>/</code></a> - perfect
+</p>
+<p>
+  <a href="/en-US/"><code>/en-US/</code></a> - perfect
+</p>
+<p>
+  <a href="/fr/"><code>/fr/</code></a> - perfect
+</p>
+<p>
+  <a href="/ru"><code>/ru</code></a> - lacking trailing slash
+</p>
+<p>
+  <a href="/JA/"><code>/JA/</code></a> - wrong case
+</p>
+<p>
+  <a href="/ZH-CN"><code>/ZH-CN</code></a> - wrong case and lacking trailing slash
+</p>
+<p>
+  <a href="/notalocale/"><code>/notalocale/</code></a> - not a valid locale
+</p>
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 5175786c1c20..8ae99db637ea 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -1374,3 +1374,21 @@ test("translated content broken links can fall back to en-us", () => {
     "Currently only available in English (US)"
   );
 });
+
+test("homepage links and flaws", () => {
+  const builtFolder = path.join(
+    buildRoot,
+    "en-us",
+    "docs",
+    "web",
+    "homepage_links"
+  );
+  const jsonFile = path.join(builtFolder, "index.json");
+  const { doc } = JSON.parse(fs.readFileSync(jsonFile));
+  expect(doc.flaws.broken_links.length).toBe(4);
+  const map = new Map(doc.flaws.broken_links.map((x) => [x.href, x]));
+  expect(map.get("/ru").suggestion).toBe("/ru/");
+  expect(map.get("/JA/").suggestion).toBe("/ja/");
+  expect(map.get("/ZH-CN").suggestion).toBe("/zh-CN/");
+  expect(map.get("/notalocale/").suggestion).toBeFalsy();
+});

From 849fcfc345b19c9ed6a570b340c87f8ddaccc3c1 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 13 Apr 2021 18:28:23 -0400
Subject: [PATCH 171/288] make all front-matter available in KS rendering
 (#3503)

* make all front-matter available in KS rendering

Fixes #3258

* better error handling in case it's falsy
---
 kumascript/index.js          | 12 ++++--------
 kumascript/macros/Compat.ejs |  5 ++++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/kumascript/index.js b/kumascript/index.js
index 40f2f04dd9fa..2ca379bba012 100644
--- a/kumascript/index.js
+++ b/kumascript/index.js
@@ -56,14 +56,10 @@ const renderFromURL = async (
   const [renderedHtml, errors] = await renderMacros(
     rawHTML,
     {
-      ...{
-        url,
-        locale: metadata.locale,
-        slug: metadata.slug,
-        title: metadata.title,
-        tags: metadata.tags || [],
-        selective_mode,
-      },
+      ...metadata,
+      url,
+      tags: metadata.tags || [],
+      selective_mode,
       interactive_examples: {
         base_url: INTERACTIVE_EXAMPLES_BASE_URL,
       },
diff --git a/kumascript/macros/Compat.ejs b/kumascript/macros/Compat.ejs
index 198ef1f425b5..b940aecb9eb4 100644
--- a/kumascript/macros/Compat.ejs
+++ b/kumascript/macros/Compat.ejs
@@ -30,7 +30,10 @@ Example calls
 
 */
 
-var query = $0;
+var query = $0 || env['browser-compat'];
+if (!query) {
+  throw new Error("No first query argument or 'browser-compat' front-matter value passed");
+}
 var depth = $1 || 1;
 var output = `<div class="bc-data" id="bcd:${query}" data-depth="${depth}">
   If you're able to see this, something went wrong on this page.

From ae0c266b633536a334ecb786545bebe3fe583414 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 13 Apr 2021 18:30:44 -0400
Subject: [PATCH 172/288] Intention to measure: Find out the x-cache values in
 site-searches (#3421)

Part of #3420
---
 client/src/site-search/search-results.tsx    | 12 ++++++++
 docs/experiments/0001_site-search-x-cache.md | 29 ++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 docs/experiments/0001_site-search-x-cache.md

diff --git a/client/src/site-search/search-results.tsx b/client/src/site-search/search-results.tsx
index d6d232ef5194..dd7a4c76d9fa 100644
--- a/client/src/site-search/search-results.tsx
+++ b/client/src/site-search/search-results.tsx
@@ -8,6 +8,7 @@ import { appendURL } from "./utils";
 
 import LANGUAGES_RAW from "../languages.json";
 import "./search-results.scss";
+import { useGA } from "../ga-context";
 
 const LANGUAGES = new Map(
   Object.entries(LANGUAGES_RAW).map(([locale, data]) => {
@@ -77,6 +78,7 @@ class ServerOperationalError extends Error {
 }
 
 export default function SearchResults() {
+  const ga = useGA();
   const [searchParams] = useSearchParams();
   const locale = useLocale();
   // A call to `/api/v1/search` will default to mean the same thing as
@@ -102,6 +104,16 @@ export default function SearchResults() {
       } else if (!response.ok) {
         throw new Error(`${response.status} on ${url}`);
       }
+
+      // See docs/experiments/0001_site-search-x-cache.md
+      const xCacheHeaderValue = response.headers.get("x-cache");
+      ga("send", {
+        hitType: "event",
+        eventCategory: "Site-search X-Cache",
+        eventAction: url,
+        eventLabel: xCacheHeaderValue || "no value",
+      });
+
       return await response.json();
     },
     {
diff --git a/docs/experiments/0001_site-search-x-cache.md b/docs/experiments/0001_site-search-x-cache.md
new file mode 100644
index 000000000000..ebcac79912e0
--- /dev/null
+++ b/docs/experiments/0001_site-search-x-cache.md
@@ -0,0 +1,29 @@
+# Experiment: X-Cache response headers in site-search XHRs
+
+## Issue
+
+<https://github.com/mdn/yari/issues/3420>
+
+## Overview
+
+Find out how the CDN cache is working out for people doing site-search queries.
+The objective is to record what value people get for `X-Cache` from the CDN.
+
+## Start date
+
+Early April 2021.
+
+## End date
+
+May 1 2021.
+
+## Details
+
+As described in the issue, the current `Cache-Control` set by Kuma is 12h
+(`12 * 60 * 60 = 43200`).
+Perhaps we should increase it if too few people are getting cold caches from
+the CDN.
+
+## Analysis
+
+Look at Google Analytics Events under `Site-search X-Cache`.

From 0d93175770cedcbb74917227528490d695d3e0a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 05:49:26 +0000
Subject: [PATCH 173/288] build(deps-dev): bump @storybook/addon-actions from
 6.2.7 to 6.2.8 (#3508)

---
 package.json |   2 +-
 yarn.lock    | 188 ++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 178 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 07d95a536696..ad426f58d5a4 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.2.7",
-    "@storybook/addon-actions": "^6.2.7",
+    "@storybook/addon-actions": "^6.2.8",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.7",
     "@storybook/node-logger": "^6.2.7",
diff --git a/yarn.lock b/yarn.lock
index cc68893c0699..27cec8cd749b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2133,17 +2133,17 @@
     util-deprecate "^1.0.2"
     uuid "^8.0.0"
 
-"@storybook/addon-actions@^6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.7.tgz#ca0500f5eb7017d3e2b4f6ee570c3650e495c7d9"
-  integrity sha512-v0zgJfrgTY5di7pCUZnA5CLSu8LNcq2rwLuQ2I3qiLYszZ9Gdst5kdekMPgiz7Dk8c6GOpml/IMISnEUKBskVQ==
-  dependencies:
-    "@storybook/addons" "6.2.7"
-    "@storybook/api" "6.2.7"
-    "@storybook/client-api" "6.2.7"
-    "@storybook/components" "6.2.7"
-    "@storybook/core-events" "6.2.7"
-    "@storybook/theming" "6.2.7"
+"@storybook/addon-actions@^6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.8.tgz#e11d01a35e4685e692015a5051c583a0931ecd4a"
+  integrity sha512-bQE9rmVGThniXWxz57Py5bqC4my7DLCK3gT4U4cXv31zH+NMlJqSNHHfHf/Ob43fTdoCyLcB3vlWsPLra7WOCg==
+  dependencies:
+    "@storybook/addons" "6.2.8"
+    "@storybook/api" "6.2.8"
+    "@storybook/client-api" "6.2.8"
+    "@storybook/components" "6.2.8"
+    "@storybook/core-events" "6.2.8"
+    "@storybook/theming" "6.2.8"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
     global "^4.4.0"
@@ -2328,6 +2328,21 @@
     global "^4.4.0"
     regenerator-runtime "^0.13.7"
 
+"@storybook/addons@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.8.tgz#31d9bbd2e8b212490065a25e587621dab83ae392"
+  integrity sha512-zbavtYi66HAtgAROw5h4mR3mD9239ocCaYiasRanM+qyprguIvADPMGzgOA7COVfNI9MiIkxSA+E9oZ1y5PKfQ==
+  dependencies:
+    "@storybook/api" "6.2.8"
+    "@storybook/channels" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/core-events" "6.2.8"
+    "@storybook/router" "6.2.8"
+    "@storybook/theming" "6.2.8"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    regenerator-runtime "^0.13.7"
+
 "@storybook/api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.21.tgz#be753ca8d3602efe4a11783c81c689463bee0825"
@@ -2379,6 +2394,32 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.8.tgz#9165b25f8b71e08c4af5a30805407b025fbb5b1f"
+  integrity sha512-jaYT/IzFBUQTx/PqOIBty4HzZnRuk36vsGnBs/CWr8p3JCcnmLRaULsO0Q61rwFj2e4nMFMHEsZXEqRUXk4riw==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/channels" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/core-events" "6.2.8"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "6.2.8"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.8"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    store2 "^2.12.0"
+    telejson "^5.1.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.1.21.tgz#acce71833499dba4c4e686de09f5b281a3239842"
@@ -2405,6 +2446,19 @@
     qs "^6.10.0"
     telejson "^5.1.0"
 
+"@storybook/channel-postmessage@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.8.tgz#8624d8da25cd7bb9ff42bd9a46cd4b105d63d3ec"
+  integrity sha512-SWBpZopkMDstxuhC0qzhzZoJUbLpGkNFjy+f8BAXLikOWcEISk5e74dZm3Q20yV10KSRUoIGfPqhHG3QmkLwBA==
+  dependencies:
+    "@storybook/channels" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/core-events" "6.2.8"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    qs "^6.10.0"
+    telejson "^5.1.0"
+
 "@storybook/channels@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.1.21.tgz#adbfae5f4767234c5b17d9578be983584dddead4"
@@ -2423,6 +2477,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/channels@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.8.tgz#81ec350291adfe479eea69e47f670d64ce0fe8a2"
+  integrity sha512-wn4I1kljyhEYhdJV98SrzQutbeigBwtTtisCdICJrUoENpLBWjZYWg5s+Wam1Q65375ajgIzeL7IZH7/TjxeKg==
+  dependencies:
+    core-js "^3.8.2"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-api@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.1.21.tgz#c9f72bbc9bf9d12cc931eb824f6912173c73b0b3"
@@ -2471,6 +2534,30 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.8.tgz#69b02085fcc4f00798d04ac03e6af514d6c87975"
+  integrity sha512-CZL+ANDUZ2uAdIQ/fe+qLLk7Cba7iT04mwiFIgL4zsG/51RQ8MXksh75RkW1VCLMRiJEuBt3P+Hqe0xs0yLoUw==
+  dependencies:
+    "@storybook/addons" "6.2.8"
+    "@storybook/channel-postmessage" "6.2.8"
+    "@storybook/channels" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/core-events" "6.2.8"
+    "@storybook/csf" "0.0.1"
+    "@types/qs" "^6.9.5"
+    "@types/webpack-env" "^1.16.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    stable "^0.1.8"
+    store2 "^2.12.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.1.21.tgz#fe7d9e645ddb4eb9dc18fdacea24b4baf11bc6c9"
@@ -2487,6 +2574,14 @@
     core-js "^3.8.2"
     global "^4.4.0"
 
+"@storybook/client-logger@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.8.tgz#2e32cc9f0b73e29fb386383ab9e927ab6d3668fc"
+  integrity sha512-O1pmTmKUwR8KW1Bv4o2z3LII/g5PQqykIvUMEoDLjL4ogS7aDaxXZSlONSPpCyGYcH9pVdHiRex37R7U9N8r3A==
+  dependencies:
+    core-js "^3.8.2"
+    global "^4.4.0"
+
 "@storybook/components@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.21.tgz#7b9bfd51e73c179654a114275e5073f494d2a005"
@@ -2544,6 +2639,36 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/components@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.8.tgz#303150977965f9750e7528e58fc5d1c0a1220bd2"
+  integrity sha512-fd0ivsOhHDLISEScWzDIVM4X93gR5Vw0LsxaMW/2qKJZGVHG6cxti5j+LhO41aaGmB7mWcDtgloOWNwTv47YAA==
+  dependencies:
+    "@popperjs/core" "^2.6.0"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/csf" "0.0.1"
+    "@storybook/theming" "6.2.8"
+    "@types/color-convert" "^2.0.0"
+    "@types/overlayscrollbars" "^1.12.0"
+    "@types/react-syntax-highlighter" "11.0.5"
+    color-convert "^2.0.1"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    markdown-to-jsx "^7.1.0"
+    memoizerific "^1.11.3"
+    overlayscrollbars "^1.13.1"
+    polished "^4.0.5"
+    prop-types "^15.7.2"
+    react-colorful "^5.0.1"
+    react-popper-tooltip "^3.1.1"
+    react-syntax-highlighter "^13.5.3"
+    react-textarea-autosize "^8.3.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/core-events@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.1.21.tgz#11f537f78f8c73ba5e627b57b282a279793a3511"
@@ -2558,6 +2683,13 @@
   dependencies:
     core-js "^3.8.2"
 
+"@storybook/core-events@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.8.tgz#e33427f7b4b2bd141c788189d50dc92337dd4e81"
+  integrity sha512-1TVzA5/FEwtgxor2q6tsBBMTmhyJubNWlP3akznume8F7kqoCl+k/ss0PQ0ywlzc9PjWQXS7HGmSVzx0r8gdHQ==
+  dependencies:
+    core-js "^3.8.2"
+
 "@storybook/core@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.1.21.tgz#e4c9f5ab361e0c4690f2827a71308757f9d46395"
@@ -2769,6 +2901,22 @@
     qs "^6.10.0"
     ts-dedent "^2.0.0"
 
+"@storybook/router@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.8.tgz#70d95e66619ebdeb4da61e2fce930bcc53d45bd1"
+  integrity sha512-SDoSa5gp/tzv7GIYauDyrKAiqDOg2bZ+JBIjLbAh29U5fJ/wkHbTeHCMhw9B5RE8O/e4dK2NOaYcuJJx+mFbGA==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/client-logger" "6.2.8"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/semver@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
@@ -2830,6 +2978,24 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
+"@storybook/theming@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.8.tgz#1cb4eeaccdb73924186a06630b4fed3201ee6714"
+  integrity sha512-aQ+VCvzbfaAsq99g0ZsP1/rZFwXqbsTYLaRV/uZ8DA+wLF7uzlAl+FA5HyneStSj9ysyvdyARGxT2SBAT+azyQ==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@emotion/is-prop-valid" "^0.8.6"
+    "@emotion/styled" "^10.0.27"
+    "@storybook/client-logger" "6.2.8"
+    core-js "^3.8.2"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.27"
+    global "^4.4.0"
+    memoizerific "^1.11.3"
+    polished "^4.0.5"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/ui@6.1.21":
   version "6.1.21"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.1.21.tgz#bf7cac3ba9a6250f573fa1ba12d4592891d5ece2"

From 2017728a94b9580c250d7420d5088d235e78569f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 05:49:51 +0000
Subject: [PATCH 174/288] build(deps-dev): bump @storybook/node-logger from
 6.2.7 to 6.2.8 (#3509)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ad426f58d5a4..1ea651a118a5 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@storybook/addon-actions": "^6.2.8",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.7",
-    "@storybook/node-logger": "^6.2.7",
+    "@storybook/node-logger": "^6.2.8",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
     "@testing-library/react": "^11.2.6",
diff --git a/yarn.lock b/yarn.lock
index 27cec8cd749b..0aedfd89ee43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2815,10 +2815,10 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/node-logger@^6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.7.tgz#2329042e44eba1efcc6bb0689c8566a555d5b0ee"
-  integrity sha512-dzsFKn/3as6Nf21/9whh4HHfKOFfKlZaG5FxuhRlB3g3j61sAlE5LI4DXHgc0NoyfV5Ymbj3BPbtlCsNOy2i5A==
+"@storybook/node-logger@^6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.8.tgz#a5cb21e397a3e4945375b73803f901c93513a56c"
+  integrity sha512-mSbHF1yneRScviISaDQmtRcOBwjHbmdc8p791X4Myl87luqENnt0s8mnTG0H8uH/LGKvtZ2AGST89MqusQ6xUw==
   dependencies:
     "@types/npmlog" "^4.1.2"
     chalk "^4.1.0"

From bf9afecc732cd6d1eea31d20e870de3a32150a00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 05:50:54 +0000
Subject: [PATCH 175/288] build(deps): bump remark-rehype from 8.0.0 to 8.1.0
 (#3510)

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

diff --git a/package.json b/package.json
index 1ea651a118a5..29003c37ef89 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "rehype-stringify": "^8.0.0",
     "remark-gfm": "^1.0.0",
     "remark-parse": "^9.0.0",
-    "remark-rehype": "^8.0.0",
+    "remark-rehype": "^8.1.0",
     "remark-stringify": "^9.0.1",
     "sanitize-filename": "^1.6.3",
     "send": "0.17.1",
diff --git a/yarn.lock b/yarn.lock
index 0aedfd89ee43..638423611732 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12558,7 +12558,7 @@ mdast-util-to-hast@9.1.2:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
-mdast-util-to-hast@^10.0.0:
+mdast-util-to-hast@^10.2.0:
   version "10.2.0"
   resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.2.0.tgz#61875526a017d8857b71abc9333942700b2d3604"
   integrity sha512-JoPBfJ3gBnHZ18icCwHR50orC9kNH81tiR1gs01D8Q5YpV6adHNO9nKNuFBCJQ941/32PT1a63UF/DitmS3amQ==
@@ -16117,12 +16117,12 @@ remark-parse@^9.0.0:
   dependencies:
     mdast-util-from-markdown "^0.8.0"
 
-remark-rehype@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-8.0.0.tgz#5a8afc8262a59d205fba21dafb27a673fb3b92fa"
-  integrity sha512-gVvOH02TMFqXOWoL6iXU7NXMsDJguNkNuMrzfkQeA4V6WCyHQnOKptn+IQBVVPuIH2sMJBwo8hlrmtn1MLTh9w==
+remark-rehype@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-8.1.0.tgz#610509a043484c1e697437fa5eb3fd992617c945"
+  integrity sha512-EbCu9kHgAxKmW1yEYjx3QafMyGY3q8noUbNUI5xyKbaFP89wbhDrKxyIQNukNYthzjNHZu6J7hwFg7hRm1svYA==
   dependencies:
-    mdast-util-to-hast "^10.0.0"
+    mdast-util-to-hast "^10.2.0"
 
 remark-slug@^6.0.0:
   version "6.0.0"

From 01974a67e68374f9ee486223aa2b05a9875cebd1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 08:38:25 +0000
Subject: [PATCH 176/288] build(deps-dev): bump @storybook/addon-links from
 6.2.7 to 6.2.8 (#3512)

---
 package.json |  2 +-
 yarn.lock    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 29003c37ef89..260e8286f02f 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "@storybook/addon-a11y": "^6.2.7",
     "@storybook/addon-actions": "^6.2.8",
     "@storybook/addon-essentials": "^6.1.21",
-    "@storybook/addon-links": "^6.2.7",
+    "@storybook/addon-links": "^6.2.8",
     "@storybook/node-logger": "^6.2.8",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.1.21",
diff --git a/yarn.lock b/yarn.lock
index 638423611732..c516a77a7519 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2252,16 +2252,16 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-links@^6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.7.tgz#02d4636bd1ca26d243f346086d5b280fb70a730b"
-  integrity sha512-pGP3gtZSP9xDbS+KgP0fiTLrhcD8eauOsP0JgzyKVCgKYzG4Yx9xuZBcDCvG25DeczDvTx7kuR6U1TavSYn12w==
+"@storybook/addon-links@^6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.8.tgz#5b9a31d84d6ba93d4d05c6e4779ec99151612252"
+  integrity sha512-r64VQDvWaUaBunY2mBPHYh2oEVYNycB/EH4WvXK1it3hXs1XGCIWLap4lKvIcT894XhykS8Jxx/s8SUGIvRzBA==
   dependencies:
-    "@storybook/addons" "6.2.7"
-    "@storybook/client-logger" "6.2.7"
-    "@storybook/core-events" "6.2.7"
+    "@storybook/addons" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/core-events" "6.2.8"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.7"
+    "@storybook/router" "6.2.8"
     "@types/qs" "^6.9.5"
     core-js "^3.8.2"
     global "^4.4.0"

From f445c1afd760dba79a26c3e2da70de3bbd82ab15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 08:47:35 +0000
Subject: [PATCH 177/288] build(deps-dev): bump @storybook/addon-a11y from
 6.2.7 to 6.2.8 (#3513)

---
 package.json |   2 +-
 yarn.lock    | 192 ++++-----------------------------------------------
 2 files changed, 14 insertions(+), 180 deletions(-)

diff --git a/package.json b/package.json
index 260e8286f02f..c8ba4f7daf18 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "@babel/core": "^7.13.15",
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.0",
-    "@storybook/addon-a11y": "^6.2.7",
+    "@storybook/addon-a11y": "^6.2.8",
     "@storybook/addon-actions": "^6.2.8",
     "@storybook/addon-essentials": "^6.1.21",
     "@storybook/addon-links": "^6.2.8",
diff --git a/yarn.lock b/yarn.lock
index c516a77a7519..f9e91ee4b99b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2088,19 +2088,19 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@storybook/addon-a11y@^6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.7.tgz#4e0c4777ed085f81a572724f79576400c42487cf"
-  integrity sha512-pILLWLl3CGLsORDeD76pRphX+nT0C/GpjUOwWZZDqV9aVXY20zUo48EdpyPzgXF1vXzOVIm/6UxnrqorvXnEPg==
-  dependencies:
-    "@storybook/addons" "6.2.7"
-    "@storybook/api" "6.2.7"
-    "@storybook/channels" "6.2.7"
-    "@storybook/client-api" "6.2.7"
-    "@storybook/client-logger" "6.2.7"
-    "@storybook/components" "6.2.7"
-    "@storybook/core-events" "6.2.7"
-    "@storybook/theming" "6.2.7"
+"@storybook/addon-a11y@^6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.8.tgz#11a302579ee3f31dbf7f96ac48c9d1ee53b3e5c5"
+  integrity sha512-bheVrZM0q0CfFNNtzaZphqN8qf7ZT0hqXCiHRGMfv7jrHk34IT6UDIhchydDTta9LirwK1DvBQomsNfHdzGPrA==
+  dependencies:
+    "@storybook/addons" "6.2.8"
+    "@storybook/api" "6.2.8"
+    "@storybook/channels" "6.2.8"
+    "@storybook/client-api" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/components" "6.2.8"
+    "@storybook/core-events" "6.2.8"
+    "@storybook/theming" "6.2.8"
     axe-core "^4.1.1"
     core-js "^3.8.2"
     global "^4.4.0"
@@ -2313,21 +2313,6 @@
     global "^4.3.2"
     regenerator-runtime "^0.13.7"
 
-"@storybook/addons@6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.7.tgz#f31343654e564dd91f1ec103f130fa23e996745b"
-  integrity sha512-OHVGzkS2al/jirChr2otampV3oBvODbisUpHMhgUJQ+fcjKdBOXualJFBHhAI2TNwTODfjld+TsKQlBtiMDNDw==
-  dependencies:
-    "@storybook/api" "6.2.7"
-    "@storybook/channels" "6.2.7"
-    "@storybook/client-logger" "6.2.7"
-    "@storybook/core-events" "6.2.7"
-    "@storybook/router" "6.2.7"
-    "@storybook/theming" "6.2.7"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    regenerator-runtime "^0.13.7"
-
 "@storybook/addons@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.8.tgz#31d9bbd2e8b212490065a25e587621dab83ae392"
@@ -2368,32 +2353,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/api@6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.7.tgz#5417dfe0c5a7a49a4e47f5a4c2be7a1bbdb7d5b3"
-  integrity sha512-GKD9b6OkQi7eDlaPmpjSz7MJsPIY+q7eGvBAWkovLXzvfEY6sE6VqUt9aWn3i6IkzqjYF7c+wgQzpA0JBTzH1Q==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/channels" "6.2.7"
-    "@storybook/client-logger" "6.2.7"
-    "@storybook/core-events" "6.2.7"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.7"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.2.7"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.12.0"
-    telejson "^5.1.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.8.tgz#9165b25f8b71e08c4af5a30805407b025fbb5b1f"
@@ -2433,19 +2392,6 @@
     qs "^6.6.0"
     telejson "^5.0.2"
 
-"@storybook/channel-postmessage@6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.7.tgz#4025d3746fac9b1c2264001606c7a361d1144417"
-  integrity sha512-l+62q/oZrDeuU3xhqVKnyk7FoUZKwr+4ZG6fXc/uXKCryoACiHT1RvStoX4AZqua9xIxMPpQr36UpHUElNHtyg==
-  dependencies:
-    "@storybook/channels" "6.2.7"
-    "@storybook/client-logger" "6.2.7"
-    "@storybook/core-events" "6.2.7"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    qs "^6.10.0"
-    telejson "^5.1.0"
-
 "@storybook/channel-postmessage@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.8.tgz#8624d8da25cd7bb9ff42bd9a46cd4b105d63d3ec"
@@ -2468,15 +2414,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channels@6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.7.tgz#b6b64e9f7318afe3a005042395356fd0a878001c"
-  integrity sha512-s79ghVFrbhj4hEt/HPNz7VgOqKQx8S8JozndHQuiE/KSNxfcgGihUXWxIVr7RGAzQcMT3HsAZ0nDbKdusV9jAg==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/channels@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.8.tgz#81ec350291adfe479eea69e47f670d64ce0fe8a2"
@@ -2510,30 +2447,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-api@6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.7.tgz#7e788314582b9fc09fbd150ef95d0714d5d22b9c"
-  integrity sha512-ZeKNkI1lXW55RnREDYt/wmHi34iMYdRNpybE9QqPBEcFLyvpB7m1bifXxFSgqyMbK+eSTYOfPB1NGQJi77P/iQ==
-  dependencies:
-    "@storybook/addons" "6.2.7"
-    "@storybook/channel-postmessage" "6.2.7"
-    "@storybook/channels" "6.2.7"
-    "@storybook/client-logger" "6.2.7"
-    "@storybook/core-events" "6.2.7"
-    "@storybook/csf" "0.0.1"
-    "@types/qs" "^6.9.5"
-    "@types/webpack-env" "^1.16.0"
-    core-js "^3.8.2"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    regenerator-runtime "^0.13.7"
-    stable "^0.1.8"
-    store2 "^2.12.0"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/client-api@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.8.tgz#69b02085fcc4f00798d04ac03e6af514d6c87975"
@@ -2566,14 +2479,6 @@
     core-js "^3.0.1"
     global "^4.3.2"
 
-"@storybook/client-logger@6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.7.tgz#deca6d5b157d6ea22ec8f271399e9d10bb293a2c"
-  integrity sha512-IhTaZ3NPrV2g7vnoSuq5yb6QLuXQgD5+iuwzOAXlP8vU5X/Tm3zNr5PtqNjrKg1A3ls6A0pCBa5QctWdN/tnuQ==
-  dependencies:
-    core-js "^3.8.2"
-    global "^4.4.0"
-
 "@storybook/client-logger@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.8.tgz#2e32cc9f0b73e29fb386383ab9e927ab6d3668fc"
@@ -2609,36 +2514,6 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/components@6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.7.tgz#03ee5e22c48631fe17829299d2da61bb4e0598ce"
-  integrity sha512-ccKOwGIkuhEHFLzjZvaZG11GIbMvk56bNdCAG8iINKYUjJE3l0PsO5xPhNsyTlwpDScZGwEBKB48Vn54UjiS8g==
-  dependencies:
-    "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.2.7"
-    "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.2.7"
-    "@types/color-convert" "^2.0.0"
-    "@types/overlayscrollbars" "^1.12.0"
-    "@types/react-syntax-highlighter" "11.0.5"
-    color-convert "^2.0.1"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    markdown-to-jsx "^7.1.0"
-    memoizerific "^1.11.3"
-    overlayscrollbars "^1.13.1"
-    polished "^4.0.5"
-    prop-types "^15.7.2"
-    react-colorful "^5.0.1"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.3"
-    react-textarea-autosize "^8.3.0"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/components@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.8.tgz#303150977965f9750e7528e58fc5d1c0a1220bd2"
@@ -2676,13 +2551,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.7.tgz#47f9bbbf7f5959eab9ffcf6e2893f09014297608"
-  integrity sha512-CwMftGVwWDqFva48rs5TlTSkimO7Q42dAuKKmUVHaN2tPacs8NdxhjqHmj+ls+5cxZuDnJy1x3JAo1PyHGyWiw==
-  dependencies:
-    core-js "^3.8.2"
-
 "@storybook/core-events@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.8.tgz#e33427f7b4b2bd141c788189d50dc92337dd4e81"
@@ -2885,22 +2753,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/router@6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.7.tgz#b6bfedc237f0b3834f8fa9eb724d91bd3eaff832"
-  integrity sha512-ZHz5T/IvpsXq0O/frdZN6kNltzy7QiL1TgekwY5evjtRWFAX6vRBQXfQH9opGQ3dThZIhMUi7kA9h9utrHp8HA==
-  dependencies:
-    "@reach/router" "^1.3.4"
-    "@storybook/client-logger" "6.2.7"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-    qs "^6.10.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/router@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.8.tgz#70d95e66619ebdeb4da61e2fce930bcc53d45bd1"
@@ -2960,24 +2812,6 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/theming@6.2.7":
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.7.tgz#7dbbcde537099b1fe65ec63a517fd54a3dd587f5"
-  integrity sha512-0zTw1DhPWuNsk/fSg7rqLa/99+dxUfwjDnCYu4WJAUjfBWP/++0VWtQJVtt8ogyHKsY2dUzm5mhUg8EtqnGePg==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.2.7"
-    core-js "^3.8.2"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.27"
-    global "^4.4.0"
-    memoizerific "^1.11.3"
-    polished "^4.0.5"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
 "@storybook/theming@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.8.tgz#1cb4eeaccdb73924186a06630b4fed3201ee6714"

From c916994e48f57d12cffc5f4595f0cde3e27ab5f6 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Wed, 14 Apr 2021 10:54:38 -0400
Subject: [PATCH 178/288] force-lowercase all H4 IDs in post-processing (#3497)

* force-lowercase all H4 IDs in post-processing

Fixes #3429

* apply for h5 and h6 headings too
---
 build/index.js                                | 22 +++++++++++++++++++
 .../content/files/en-us/web/foo/index.html    |  4 ++++
 testing/tests/index.test.js                   |  3 +++
 3 files changed, 29 insertions(+)

diff --git a/build/index.js b/build/index.js
index 3039590ef1fc..bba30844ba4a 100644
--- a/build/index.js
+++ b/build/index.js
@@ -139,6 +139,21 @@ function postProcessExternalLinks($) {
   });
 }
 
+/**
+ * Fix the heading IDs so they're all lower case.
+ *
+ * @param {Cheerio document instance} $
+ */
+function postProcessSmallerHeadingIDs($) {
+  $("h4[id], h5[id], h6[id]").each((i, element) => {
+    const id = element.attribs.id;
+    const lcID = id.toLowerCase();
+    if (id !== lcID) {
+      $(element).attr("id", lcID);
+    }
+  });
+}
+
 /**
  * Find all `in-page-callout` div elements and rewrite
  * to be just `callout`, no more need to mark them as `webdev`
@@ -431,6 +446,13 @@ async function buildDocument(document, documentOptions = {}) {
   // All external hyperlinks should have the `external` class name.
   postProcessExternalLinks($);
 
+  // Since all anchor links are forced into lower case, and `<h2>` and `<h3>`
+  // is taken care of by the React rendering itself, we have to post-process
+  // any possible headings whose ID might not be perfect.
+  // The reason we can't do this as part of the kumascript rendering is because
+  // the old
+  postProcessSmallerHeadingIDs($);
+
   // All content that uses `<div class="in-page-callout">` needs to
   // become `<div class="callout">`
   // Some day, we can hopefully do a mass search-and-replace so we never
diff --git a/testing/content/files/en-us/web/foo/index.html b/testing/content/files/en-us/web/foo/index.html
index 3a9b5b6df884..5025ab74a3c2 100644
--- a/testing/content/files/en-us/web/foo/index.html
+++ b/testing/content/files/en-us/web/foo/index.html
@@ -21,3 +21,7 @@
   <img src="screenshot.png" alt="Screenshot of colors">
   <figcaption>A perfectly normal image</figcaption>
 </figure>
+
+<h3>Heading 3</h3>
+
+<h4 id="Heading_4">Heading 4 with own bad ID</h4>
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 8ae99db637ea..782baeb74965 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -161,6 +161,9 @@ test("content built foo page", () => {
   // going to be used.
   expect(toEnUSURL).toBe("https://developer.mozilla.org/en-US/docs/Web/Foo");
   expect(toFrURL).toBe("https://developer.mozilla.org/fr/docs/Web/Foo");
+
+  // The h4 heading in there has its ID transformed to lowercase
+  expect($("h4").attr("id")).toBe($("h4").attr("id").toLowerCase());
 });
 
 test("icons mentioned in <head> should resolve", () => {

From c5540fb502966d0123a9bea9d18e33f53a960c99 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Wed, 14 Apr 2021 15:20:21 -0400
Subject: [PATCH 179/288] chore: bump Storybook deps (#3398)

* chore: bump Storybook deps

* chore: pin babel-loader for create-react-app
---
 package.json |    7 +-
 yarn.lock    | 2569 ++++++++++++++++++++++++++++----------------------
 2 files changed, 1447 insertions(+), 1129 deletions(-)

diff --git a/package.json b/package.json
index c8ba4f7daf18..3643609dde6f 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
   },
   "resolutions": {
     "@typescript-eslint/typescript-estree": ">=4.15.2",
+    "babel-loader": "8.1.0",
     "lodash": ">=4.17.15",
     "mixin-deep": ">=1.3.2",
     "set-value": ">=2.0.1"
@@ -106,15 +107,16 @@
     "@mdn/minimalist": "^0.8.0",
     "@storybook/addon-a11y": "^6.2.8",
     "@storybook/addon-actions": "^6.2.8",
-    "@storybook/addon-essentials": "^6.1.21",
+    "@storybook/addon-essentials": "^6.2.8",
     "@storybook/addon-links": "^6.2.8",
     "@storybook/node-logger": "^6.2.8",
     "@storybook/preset-create-react-app": "^3.1.7",
-    "@storybook/react": "^6.1.21",
+    "@storybook/react": "^6.2.8",
     "@testing-library/react": "^11.2.6",
     "@types/jest": "^26.0.22",
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.3",
+    "babel-loader": "8.1.0",
     "braces": "^3.0.2",
     "cross-env": "^7.0.3",
     "diff": "^5.0.0",
@@ -146,6 +148,7 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-is": "^17.0.2",
+    "react-refresh": "0.9",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
     "react-scripts": "4.0.3",
diff --git a/yarn.lock b/yarn.lock
index f9e91ee4b99b..7e935ccaa3bf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,7 +9,7 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
   integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
@@ -21,24 +21,29 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
   integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
 
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
+  integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==
+
 "@babel/compat-data@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1"
   integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==
 
-"@babel/core@7.11.6":
-  version "7.11.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
-  integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==
+"@babel/core@7.12.3":
+  version "7.12.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
+  integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.6"
-    "@babel/helper-module-transforms" "^7.11.0"
-    "@babel/helpers" "^7.10.4"
-    "@babel/parser" "^7.11.5"
+    "@babel/generator" "^7.12.1"
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helpers" "^7.12.1"
+    "@babel/parser" "^7.12.3"
     "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.11.5"
-    "@babel/types" "^7.11.5"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -48,19 +53,19 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@7.12.3":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
-  integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
+"@babel/core@7.12.9":
+  version "7.12.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
+  integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.1"
+    "@babel/generator" "^7.12.5"
     "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helpers" "^7.12.1"
-    "@babel/parser" "^7.12.3"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/helpers" "^7.12.5"
+    "@babel/parser" "^7.12.7"
+    "@babel/template" "^7.12.7"
+    "@babel/traverse" "^7.12.9"
+    "@babel/types" "^7.12.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -70,7 +75,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.1", "@babel/core@^7.12.3", "@babel/core@^7.13.15", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
+"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.15", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
   version "7.13.15"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.15.tgz#a6d40917df027487b54312202a06812c4f7792d0"
   integrity sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ==
@@ -91,7 +96,7 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.11.6", "@babel/generator@^7.12.1", "@babel/generator@^7.13.9":
+"@babel/generator@^7.12.1", "@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.13.9":
   version "7.13.9"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
   integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
@@ -122,6 +127,14 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
+  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-builder-react-jsx-experimental@^7.12.4":
   version "7.12.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48"
@@ -139,7 +152,7 @@
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.13.13":
+"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.13", "@babel/helper-compilation-targets@^7.13.8":
   version "7.13.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5"
   integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==
@@ -160,6 +173,17 @@
     "@babel/helper-replace-supers" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.10.4"
 
+"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.13.11":
+  version "7.13.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz#30d30a005bca2c953f5653fc25091a492177f4f6"
+  integrity sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-member-expression-to-functions" "^7.13.0"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+
 "@babel/helper-create-regexp-features-plugin@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
@@ -177,6 +201,14 @@
     "@babel/helper-annotate-as-pure" "^7.10.4"
     regexpu-core "^4.7.1"
 
+"@babel/helper-create-regexp-features-plugin@^7.12.13":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
+  integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    regexpu-core "^4.7.1"
+
 "@babel/helper-define-map@^7.10.4":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
@@ -186,6 +218,34 @@
     "@babel/types" "^7.10.5"
     lodash "^4.17.19"
 
+"@babel/helper-define-polyfill-provider@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e"
+  integrity sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
+"@babel/helper-define-polyfill-provider@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz#a640051772045fedaaecc6f0c6c69f02bdd34bf1"
+  integrity sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
 "@babel/helper-explode-assignable-expression@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz#40a1cd917bff1288f699a94a75b37a1a2dbd8c7c"
@@ -194,6 +254,13 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
+"@babel/helper-explode-assignable-expression@^7.12.13":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
+  integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
+  dependencies:
+    "@babel/types" "^7.13.0"
+
 "@babel/helper-function-name@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
@@ -233,6 +300,14 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
+"@babel/helper-hoist-variables@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz#5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8"
+  integrity sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==
+  dependencies:
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
 "@babel/helper-member-expression-to-functions@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"
@@ -240,7 +315,7 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
-"@babel/helper-member-expression-to-functions@^7.13.12":
+"@babel/helper-member-expression-to-functions@^7.13.0", "@babel/helper-member-expression-to-functions@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
   integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
@@ -282,7 +357,7 @@
   dependencies:
     "@babel/types" "^7.13.12"
 
-"@babel/helper-module-transforms@^7.11.0", "@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.13.14":
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.13.14":
   version "7.13.14"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
   integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
@@ -320,6 +395,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb"
   integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==
 
+"@babel/helper-plugin-utils@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
+  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
+
 "@babel/helper-regex@^7.10.4":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
@@ -336,6 +416,15 @@
     "@babel/helper-wrap-function" "^7.10.4"
     "@babel/types" "^7.12.1"
 
+"@babel/helper-remap-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
+  integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-wrap-function" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
 "@babel/helper-replace-supers@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz#f15c9cc897439281891e11d5ce12562ac0cf3fa9"
@@ -346,7 +435,7 @@
     "@babel/traverse" "^7.12.1"
     "@babel/types" "^7.12.1"
 
-"@babel/helper-replace-supers@^7.13.12":
+"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
   integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
@@ -363,7 +452,7 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
-"@babel/helper-simple-access@^7.13.12":
+"@babel/helper-simple-access@^7.12.13", "@babel/helper-simple-access@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
   integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
@@ -421,7 +510,17 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helpers@^7.10.4", "@babel/helpers@^7.12.1", "@babel/helpers@^7.13.10":
+"@babel/helper-wrap-function@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
+  integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.5", "@babel/helpers@^7.13.10":
   version "7.13.10"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
   integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
@@ -448,11 +547,20 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.11.5", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.13.15", "@babel/parser@^7.7.0":
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7", "@babel/parser@^7.13.15", "@babel/parser@^7.7.0":
   version "7.13.15"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.15.tgz#8e66775fb523599acb6a289e12929fa5ab0954d8"
   integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==
 
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
+  integrity sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
+
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e"
@@ -462,6 +570,15 @@
     "@babel/helper-remap-async-to-generator" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
+"@babel/plugin-proposal-async-generator-functions@^7.13.15":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b"
+  integrity sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
 "@babel/plugin-proposal-class-properties@7.12.1", "@babel/plugin-proposal-class-properties@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
@@ -470,7 +587,15 @@
     "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-decorators@7.12.1", "@babel/plugin-proposal-decorators@^7.12.1":
+"@babel/plugin-proposal-class-properties@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37"
+  integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-proposal-decorators@7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz#59271439fed4145456c41067450543aee332d15f"
   integrity sha512-knNIuusychgYN8fGJHONL0RbFxLGawhXOJNLBk75TniTsZZeA+wdkDuv6wp4lGwzQEKjZi6/WYtnb3udNPmQmQ==
@@ -479,6 +604,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-decorators" "^7.12.1"
 
+"@babel/plugin-proposal-decorators@^7.12.12":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz#e91ccfef2dc24dd5bd5dcc9fc9e2557c684ecfb8"
+  integrity sha512-ibAMAqUm97yzi+LPgdr5Nqb9CMkeieGHvwPg1ywSGjZrZHQEGqE01HmOio8kxRpA/+VtOHouIVy2FMpBbtltjA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.11"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-decorators" "^7.12.13"
+
 "@babel/plugin-proposal-dynamic-import@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
@@ -487,6 +621,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
+"@babel/plugin-proposal-dynamic-import@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d"
+  integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
 "@babel/plugin-proposal-export-default-from@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.1.tgz#c6e62d668a8abcfe0d28b82f560395fecb611c5a"
@@ -503,6 +645,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
+"@babel/plugin-proposal-export-namespace-from@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d"
+  integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
 "@babel/plugin-proposal-json-strings@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
@@ -511,6 +661,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
+"@babel/plugin-proposal-json-strings@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b"
+  integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
 "@babel/plugin-proposal-logical-assignment-operators@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751"
@@ -519,6 +677,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
+"@babel/plugin-proposal-logical-assignment-operators@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"
+  integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
 "@babel/plugin-proposal-nullish-coalescing-operator@7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
@@ -527,6 +693,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"
+  integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
 "@babel/plugin-proposal-numeric-separator@7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz#0e2c6774c4ce48be412119b4d693ac777f7685a6"
@@ -543,16 +717,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af"
-  integrity sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==
+"@babel/plugin-proposal-numeric-separator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db"
+  integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.12.1":
+"@babel/plugin-proposal-object-rest-spread@7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
   integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
@@ -561,6 +734,17 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-transform-parameters" "^7.12.1"
 
+"@babel/plugin-proposal-object-rest-spread@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a"
+  integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==
+  dependencies:
+    "@babel/compat-data" "^7.13.8"
+    "@babel/helper-compilation-targets" "^7.13.8"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.13.0"
+
 "@babel/plugin-proposal-optional-catch-binding@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942"
@@ -569,6 +753,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
+"@babel/plugin-proposal-optional-catch-binding@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"
+  integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
 "@babel/plugin-proposal-optional-chaining@7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797"
@@ -587,6 +779,15 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
+"@babel/plugin-proposal-optional-chaining@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866"
+  integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
 "@babel/plugin-proposal-private-methods@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389"
@@ -595,6 +796,14 @@
     "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-proposal-private-methods@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"
+  integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
@@ -603,6 +812,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-proposal-unicode-property-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
+  integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
@@ -632,6 +849,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-class-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-syntax-decorators@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd"
@@ -639,6 +863,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-decorators@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648"
+  integrity sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -681,14 +912,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz#39abaae3cbf710c4373d8429484e6ba21340166c"
-  integrity sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-jsx@^7.12.1":
+"@babel/plugin-syntax-jsx@7.12.1", "@babel/plugin-syntax-jsx@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926"
   integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==
@@ -751,6 +975,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-top-level-await@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
+  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz#4bbeb8917b54fcf768364e0a81f560e33a3ef57d"
@@ -765,6 +996,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-typescript@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474"
+  integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-arrow-functions@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
@@ -772,6 +1010,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-arrow-functions@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
+  integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
 "@babel/plugin-transform-async-to-generator@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1"
@@ -781,6 +1026,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-remap-async-to-generator" "^7.12.1"
 
+"@babel/plugin-transform-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
+  integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
+
 "@babel/plugin-transform-block-scoped-functions@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"
@@ -788,6 +1042,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-block-scoped-functions@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
+  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-block-scoping@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1"
@@ -795,6 +1056,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61"
+  integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-classes@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
@@ -809,6 +1077,19 @@
     "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
+"@babel/plugin-transform-classes@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b"
+  integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    globals "^11.1.0"
+
 "@babel/plugin-transform-computed-properties@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852"
@@ -816,6 +1097,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-computed-properties@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
+  integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
 "@babel/plugin-transform-destructuring@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847"
@@ -823,6 +1111,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-destructuring@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz#c5dce270014d4e1ebb1d806116694c12b7028963"
+  integrity sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
 "@babel/plugin-transform-dotall-regex@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975"
@@ -831,6 +1126,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-dotall-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
+  integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
@@ -846,6 +1149,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-duplicate-keys@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
+  integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-exponentiation-operator@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"
@@ -854,6 +1164,14 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-exponentiation-operator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
+  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-flow-strip-types@7.12.1", "@babel/plugin-transform-flow-strip-types@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.1.tgz#8430decfa7eb2aea5414ed4a3fa6e1652b7d77c4"
@@ -869,6 +1187,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-for-of@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
+  integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
 "@babel/plugin-transform-function-name@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667"
@@ -877,6 +1202,14 @@
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
+  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-literals@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"
@@ -884,6 +1217,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
+  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-member-expression-literals@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad"
@@ -891,6 +1231,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-member-expression-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
+  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-modules-amd@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9"
@@ -900,6 +1247,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-amd@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3"
+  integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-commonjs@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
@@ -910,6 +1266,16 @@
     "@babel/helper-simple-access" "^7.12.1"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-commonjs@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b"
+  integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-simple-access" "^7.12.13"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-systemjs@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086"
@@ -921,6 +1287,17 @@
     "@babel/helper-validator-identifier" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-systemjs@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
+  integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.13.0"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-umd@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"
@@ -929,6 +1306,14 @@
     "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-modules-umd@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b"
+  integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
 "@babel/plugin-transform-named-capturing-groups-regex@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753"
@@ -936,6 +1321,13 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
 
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
+  integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+
 "@babel/plugin-transform-new-target@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0"
@@ -943,6 +1335,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-new-target@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
+  integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-object-super@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
@@ -951,13 +1350,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-replace-supers" "^7.12.1"
 
-"@babel/plugin-transform-parameters@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a"
-  integrity sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==
+"@babel/plugin-transform-object-super@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
+  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.12.13"
 
 "@babel/plugin-transform-parameters@^7.12.1":
   version "7.12.1"
@@ -966,6 +1365,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-parameters@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"
+  integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
 "@babel/plugin-transform-property-literals@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd"
@@ -973,6 +1379,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-property-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
+  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-react-constant-elements@^7.12.1":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.13.tgz#f8ee56888545d53d80f766b3cc1563ab2c241f92"
@@ -1010,6 +1423,13 @@
   dependencies:
     "@babel/plugin-transform-react-jsx" "^7.12.12"
 
+"@babel/plugin-transform-react-jsx-development@^7.12.17":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz#f510c0fa7cd7234153539f9a362ced41a5ca1447"
+  integrity sha512-BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ==
+  dependencies:
+    "@babel/plugin-transform-react-jsx" "^7.12.17"
+
 "@babel/plugin-transform-react-jsx-self@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28"
@@ -1045,6 +1465,17 @@
     "@babel/plugin-syntax-jsx" "^7.12.13"
     "@babel/types" "^7.12.13"
 
+"@babel/plugin-transform-react-jsx@^7.12.17", "@babel/plugin-transform-react-jsx@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz#1df5dfaf0f4b784b43e96da6f28d630e775f68b3"
+  integrity sha512-jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-module-imports" "^7.13.12"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-jsx" "^7.12.13"
+    "@babel/types" "^7.13.12"
+
 "@babel/plugin-transform-react-pure-annotations@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42"
@@ -1060,6 +1491,13 @@
   dependencies:
     regenerator-transform "^0.14.2"
 
+"@babel/plugin-transform-regenerator@^7.13.15":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39"
+  integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
 "@babel/plugin-transform-reserved-words@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"
@@ -1067,6 +1505,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-reserved-words@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
+  integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-runtime@7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5"
@@ -1084,6 +1529,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-shorthand-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
+  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-spread@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"
@@ -1092,6 +1544,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
 
+"@babel/plugin-transform-spread@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
+  integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+
 "@babel/plugin-transform-sticky-regex@^7.12.1", "@babel/plugin-transform-sticky-regex@^7.12.7":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
@@ -1099,6 +1559,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-sticky-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
+  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-template-literals@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843"
@@ -1106,6 +1573,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-template-literals@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
+  integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
 "@babel/plugin-transform-typeof-symbol@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a"
@@ -1113,6 +1587,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-typeof-symbol@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
+  integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-typescript@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz#d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4"
@@ -1122,6 +1603,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-typescript" "^7.12.1"
 
+"@babel/plugin-transform-typescript@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853"
+  integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-typescript" "^7.12.13"
+
 "@babel/plugin-transform-unicode-escapes@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
@@ -1129,6 +1619,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-unicode-escapes@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"
+  integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-unicode-regex@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
@@ -1137,6 +1634,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-unicode-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
+  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/preset-env@7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
@@ -1281,6 +1786,81 @@
     core-js-compat "^3.7.0"
     semver "^5.5.0"
 
+"@babel/preset-env@^7.12.11":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.15.tgz#c8a6eb584f96ecba183d3d414a83553a599f478f"
+  integrity sha512-D4JAPMXcxk69PKe81jRJ21/fP/uYdcTZ3hJDF5QX2HSI9bBxxYw/dumdR6dGumhjxlprHPE4XWoPaqzZUVy2MA==
+  dependencies:
+    "@babel/compat-data" "^7.13.15"
+    "@babel/helper-compilation-targets" "^7.13.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-option" "^7.12.17"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12"
+    "@babel/plugin-proposal-async-generator-functions" "^7.13.15"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-dynamic-import" "^7.13.8"
+    "@babel/plugin-proposal-export-namespace-from" "^7.12.13"
+    "@babel/plugin-proposal-json-strings" "^7.13.8"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.13"
+    "@babel/plugin-proposal-object-rest-spread" "^7.13.8"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.13.8"
+    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
+    "@babel/plugin-proposal-private-methods" "^7.13.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.12.13"
+    "@babel/plugin-transform-arrow-functions" "^7.13.0"
+    "@babel/plugin-transform-async-to-generator" "^7.13.0"
+    "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
+    "@babel/plugin-transform-block-scoping" "^7.12.13"
+    "@babel/plugin-transform-classes" "^7.13.0"
+    "@babel/plugin-transform-computed-properties" "^7.13.0"
+    "@babel/plugin-transform-destructuring" "^7.13.0"
+    "@babel/plugin-transform-dotall-regex" "^7.12.13"
+    "@babel/plugin-transform-duplicate-keys" "^7.12.13"
+    "@babel/plugin-transform-exponentiation-operator" "^7.12.13"
+    "@babel/plugin-transform-for-of" "^7.13.0"
+    "@babel/plugin-transform-function-name" "^7.12.13"
+    "@babel/plugin-transform-literals" "^7.12.13"
+    "@babel/plugin-transform-member-expression-literals" "^7.12.13"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.13.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.13.8"
+    "@babel/plugin-transform-modules-umd" "^7.13.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13"
+    "@babel/plugin-transform-new-target" "^7.12.13"
+    "@babel/plugin-transform-object-super" "^7.12.13"
+    "@babel/plugin-transform-parameters" "^7.13.0"
+    "@babel/plugin-transform-property-literals" "^7.12.13"
+    "@babel/plugin-transform-regenerator" "^7.13.15"
+    "@babel/plugin-transform-reserved-words" "^7.12.13"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.13"
+    "@babel/plugin-transform-spread" "^7.13.0"
+    "@babel/plugin-transform-sticky-regex" "^7.12.13"
+    "@babel/plugin-transform-template-literals" "^7.13.0"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.13"
+    "@babel/plugin-transform-unicode-escapes" "^7.12.13"
+    "@babel/plugin-transform-unicode-regex" "^7.12.13"
+    "@babel/preset-modules" "^0.1.4"
+    "@babel/types" "^7.13.14"
+    babel-plugin-polyfill-corejs2 "^0.2.0"
+    babel-plugin-polyfill-corejs3 "^0.2.0"
+    babel-plugin-polyfill-regenerator "^0.2.0"
+    core-js-compat "^3.9.0"
+    semver "^6.3.0"
+
 "@babel/preset-flow@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.12.1.tgz#1a81d376c5a9549e75352a3888f8c273455ae940"
@@ -1300,6 +1880,17 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
+"@babel/preset-modules@^0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
+  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
 "@babel/preset-react@7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.1.tgz#7f022b13f55b6dd82f00f16d1c599ae62985358c"
@@ -1313,7 +1904,19 @@
     "@babel/plugin-transform-react-jsx-source" "^7.12.1"
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
-"@babel/preset-react@^7.12.1", "@babel/preset-react@^7.12.5":
+"@babel/preset-react@^7.12.10":
+  version "7.13.13"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz#fa6895a96c50763fe693f9148568458d5a839761"
+  integrity sha512-gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-option" "^7.12.17"
+    "@babel/plugin-transform-react-display-name" "^7.12.13"
+    "@babel/plugin-transform-react-jsx" "^7.13.12"
+    "@babel/plugin-transform-react-jsx-development" "^7.12.17"
+    "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
+
+"@babel/preset-react@^7.12.5":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.13.tgz#5f911b2eb24277fa686820d5bd81cad9a0602a0a"
   integrity sha512-TYM0V9z6Abb6dj1K7i5NrEhA13oS5ujUYQYDfqIBXYHOc2c2VkFgc+q9kyssIyUfy4/hEwqrgSlJ/Qgv8zJLsA==
@@ -1332,14 +1935,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-transform-typescript" "^7.12.1"
 
-"@babel/preset-typescript@^7.12.1":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz#fc7df8199d6aae747896f1e6c61fc872056632a3"
-  integrity sha512-nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw==
+"@babel/preset-typescript@^7.12.7":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.13.0.tgz#ab107e5f050609d806fbb039bec553b33462c60a"
+  integrity sha512-LXJwxrHy0N3f6gIJlYbLta1D9BDtHpQeqwzM0LIfjDlr6UE/D5Mc7W4iDiQzaE+ks0sTjT26ArcHWnJVt0QiHw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-validator-option" "^7.12.1"
-    "@babel/plugin-transform-typescript" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-option" "^7.12.17"
+    "@babel/plugin-transform-typescript" "^7.13.0"
 
 "@babel/register@^7.12.1":
   version "7.12.1"
@@ -1367,14 +1970,14 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4":
   version "7.13.10"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
   integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.10.4", "@babel/template@^7.12.13", "@babel/template@^7.3.3":
+"@babel/template@^7.10.4", "@babel/template@^7.12.13", "@babel/template@^7.12.7", "@babel/template@^7.3.3":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
   integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
@@ -1383,7 +1986,7 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.7.0":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.7.0":
   version "7.13.15"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.15.tgz#c38bf7679334ddd4028e8e1f7b3aa5019f0dada7"
   integrity sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ==
@@ -1397,7 +2000,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.13.14"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
   integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
@@ -1532,7 +2135,7 @@
     "@emotion/serialize" "^0.11.15"
     "@emotion/utils" "0.11.3"
 
-"@emotion/styled@^10.0.23", "@emotion/styled@^10.0.27":
+"@emotion/styled@^10.0.27":
   version "10.0.27"
   resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.27.tgz#12cb67e91f7ad7431e1875b1d83a94b814133eaf"
   integrity sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q==
@@ -1630,11 +2233,6 @@
     strip-ansi "^6.0.0"
     text-table "^0.2.0"
 
-"@icons/material@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
-  integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==
-
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -1801,27 +2399,6 @@
     jest-runner "^26.6.3"
     jest-runtime "^26.6.3"
 
-"@jest/transform@^26.0.0":
-  version "26.2.2"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.2.2.tgz#86c005c8d5d749ac54d8df53ea58675fffe7a97e"
-  integrity sha512-c1snhvi5wRVre1XyoO3Eef5SEWpuBCH/cEbntBUd9tI5sNYiBDmO0My/lc5IuuGYKp/HFIHV1eZpSx5yjdkhKw==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^26.2.0"
-    babel-plugin-istanbul "^6.0.0"
-    chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-haste-map "^26.2.2"
-    jest-regex-util "^26.0.0"
-    jest-util "^26.2.0"
-    micromatch "^4.0.2"
-    pirates "^4.0.1"
-    slash "^3.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "^3.0.0"
-
 "@jest/transform@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
@@ -1853,17 +2430,6 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
-"@jest/types@^26.2.0":
-  version "26.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.2.0.tgz#b28ca1fb517a4eb48c0addea7fcd9edc4ab45721"
-  integrity sha512-lvm3rJvctxd7+wxKSxxbzpDbr4FXDLaC57WEKdUIZ2cjTYuxYSc0zlyD7Z4Uqr5VdKxRUrtwIkiqBuvgf8uKJA==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/node" "*"
-    "@types/yargs" "^15.0.0"
-    chalk "^4.0.0"
-
 "@jest/types@^26.6.0":
   version "26.6.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.0.tgz#2c045f231bfd79d52514cda3fbc93ef46157fa6a"
@@ -1903,33 +2469,33 @@
   resolved "https://registry.yarnpkg.com/@mdn/minimalist/-/minimalist-0.8.0.tgz#e466fc2f7820eeb00dca1f4b41412f1a7ddf2d4b"
   integrity sha512-VHKjKieSaXRtnm2UGX85TRUmCQNfRGQrhLATZLNzhfq8JizwFETDM0eNxGI+qPbMGG12Lbx6EAlbjdXT61/axQ==
 
-"@mdx-js/loader@^1.6.19":
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.21.tgz#e5b2b5c48d182e495d36104b0c7a5da96964a2dd"
-  integrity sha512-4xNtT7oal4PrLSpZE+75nj9XMwYwc5BuoHmer1GDmer2Hhg8DCLxskk4lWpXnMv+IUg7MboK0EAtZ2fk0szt3A==
+"@mdx-js/loader@^1.6.22":
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.22.tgz#d9e8fe7f8185ff13c9c8639c048b123e30d322c4"
+  integrity sha512-9CjGwy595NaxAYp0hF9B/A0lH6C8Rms97e2JS9d3jVUtILn6pT5i5IV965ra3lIWc7Rs1GG1tBdVF7dCowYe6Q==
   dependencies:
-    "@mdx-js/mdx" "1.6.21"
-    "@mdx-js/react" "1.6.21"
+    "@mdx-js/mdx" "1.6.22"
+    "@mdx-js/react" "1.6.22"
     loader-utils "2.0.0"
 
-"@mdx-js/mdx@1.6.21", "@mdx-js/mdx@^1.6.19":
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.21.tgz#d3651b4802db7bdc399270c0ffa9e2aa99dd4b00"
-  integrity sha512-z35VI6qDw9eAzR/obtgHbYVUdb/Pm+oUnlP1lLR94Oe05Xs2H7vlAgpuFBCLH5g/egzAc2wZCyoVydr25CsF+A==
+"@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.6.22":
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba"
+  integrity sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==
   dependencies:
-    "@babel/core" "7.11.6"
-    "@babel/plugin-syntax-jsx" "7.10.4"
+    "@babel/core" "7.12.9"
+    "@babel/plugin-syntax-jsx" "7.12.1"
     "@babel/plugin-syntax-object-rest-spread" "7.8.3"
-    "@mdx-js/util" "1.6.21"
-    babel-plugin-apply-mdx-type-prop "1.6.21"
-    babel-plugin-extract-import-names "1.6.21"
+    "@mdx-js/util" "1.6.22"
+    babel-plugin-apply-mdx-type-prop "1.6.22"
+    babel-plugin-extract-import-names "1.6.22"
     camelcase-css "2.0.1"
-    detab "2.0.3"
+    detab "2.0.4"
     hast-util-raw "6.0.1"
     lodash.uniq "4.5.0"
-    mdast-util-to-hast "9.1.2"
+    mdast-util-to-hast "10.0.1"
     remark-footnotes "2.0.0"
-    remark-mdx "1.6.21"
+    remark-mdx "1.6.22"
     remark-parse "8.0.3"
     remark-squeeze-paragraphs "4.0.0"
     style-to-object "0.3.0"
@@ -1937,15 +2503,15 @@
     unist-builder "2.0.3"
     unist-util-visit "2.0.3"
 
-"@mdx-js/react@1.6.21", "@mdx-js/react@^1.6.19":
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.21.tgz#86d962471a5e160c59a6b32054aa55c0c7ca404e"
-  integrity sha512-CgSNT9sq2LAlhEbVlPg7DwUQkypz+CWaWGcJbkgmp9WCAy6vW33CQ44UbKPiH3wet9o+UbXeQOqzZd041va83g==
+"@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.22":
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573"
+  integrity sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==
 
-"@mdx-js/util@1.6.21":
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.21.tgz#25f97a0a1b76e78c16ae5d98c6c73e1be8d89e39"
-  integrity sha512-6sANhqfEHu6gdHZSrzDjN18Y48mIon8f2Os6J+IFmMHN0IhNG/0PUIIsI07kA1sZ9t6vgZNBloVmcDa5WOSe6A==
+"@mdx-js/util@1.6.22":
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b"
+  integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
@@ -1988,7 +2554,7 @@
   dependencies:
     mkdirp "^1.0.4"
 
-"@pmmmwh/react-refresh-webpack-plugin@0.4.3", "@pmmmwh/react-refresh-webpack-plugin@^0.4.2", "@pmmmwh/react-refresh-webpack-plugin@^0.4.3":
+"@pmmmwh/react-refresh-webpack-plugin@0.4.3", "@pmmmwh/react-refresh-webpack-plugin@^0.4.3":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz#1eec460596d200c0236bf195b078a5d1df89b766"
   integrity sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==
@@ -2010,7 +2576,7 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.1.tgz#7f554e7368c9ab679a11f4a042ca17149d70cf12"
   integrity sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA==
 
-"@reach/router@^1.3.3", "@reach/router@^1.3.4":
+"@reach/router@^1.3.4":
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/@reach/router/-/router-1.3.4.tgz#d2574b19370a70c80480ed91f3da840136d10f8c"
   integrity sha512-+mtn9wjlB9NN2CNnnC/BRYtwdKBfSyyasPYraNAyvaV1occr/5NnB4CVzjEZipNHwYebQwcndGUmpFzxAUoqSA==
@@ -2110,30 +2676,7 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.1.21.tgz#881dceb0ed650fe28086d9993703f8081b29f4ce"
-  integrity sha512-H+nhSgK3X5L+JfArsC9ufvgJzQwPN9UXBxhMl74faEDCo9RGmq9ywNcjn9XlZGGnJ3jCaYrI/T1u0J7F6PBrTA==
-  dependencies:
-    "@storybook/addons" "6.1.21"
-    "@storybook/api" "6.1.21"
-    "@storybook/client-api" "6.1.21"
-    "@storybook/components" "6.1.21"
-    "@storybook/core-events" "6.1.21"
-    "@storybook/theming" "6.1.21"
-    core-js "^3.0.1"
-    fast-deep-equal "^3.1.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    polished "^3.4.4"
-    prop-types "^15.7.2"
-    react-inspector "^5.0.1"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-    uuid "^8.0.0"
-
-"@storybook/addon-actions@^6.2.8":
+"@storybook/addon-actions@6.2.8", "@storybook/addon-actions@^6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.8.tgz#e11d01a35e4685e692015a5051c583a0931ecd4a"
   integrity sha512-bQE9rmVGThniXWxz57Py5bqC4my7DLCK3gT4U4cXv31zH+NMlJqSNHHfHf/Ob43fTdoCyLcB3vlWsPLra7WOCg==
@@ -2156,99 +2699,101 @@
     util-deprecate "^1.0.2"
     uuid-browser "^3.1.0"
 
-"@storybook/addon-backgrounds@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.1.21.tgz#ada6c0a8a375855f99da0a7de770dd2c245d536d"
-  integrity sha512-4kJB6UcrqOo8fjm1BnfEOvw8ysPSfzIn2j5Q7h3WzoQF0VbU62+EQLTznluFfMjJ1I2FMCTz8YcwDOZn1FNlig==
-  dependencies:
-    "@storybook/addons" "6.1.21"
-    "@storybook/api" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/components" "6.1.21"
-    "@storybook/core-events" "6.1.21"
-    "@storybook/theming" "6.1.21"
-    core-js "^3.0.1"
-    global "^4.3.2"
+"@storybook/addon-backgrounds@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.2.8.tgz#9fb199c283c346335503e8a6cd18b0839aea9b8e"
+  integrity sha512-nsKpoDIYsiYLWe+NCIMWkdUhQIUw0wcfAtSS/+Lm9WXlJ4ateB0guxdZn+676nt1FbO9wR22QQYwLHvUED4v5A==
+  dependencies:
+    "@storybook/addons" "6.2.8"
+    "@storybook/api" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/components" "6.2.8"
+    "@storybook/core-events" "6.2.8"
+    "@storybook/theming" "6.2.8"
+    core-js "^3.8.2"
+    global "^4.4.0"
     memoizerific "^1.11.3"
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-controls@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.1.21.tgz#14e3473cfa6dcdb88e57a74e1a42b57bd87c69ee"
-  integrity sha512-IJgZWD2E9eLKj8DJLA9lT63N4jPfVneFJ05gnPco01ZJCEiDAo7babP5Ns2UTJDUaQEtX0m04UoIkidcteWKsA==
-  dependencies:
-    "@storybook/addons" "6.1.21"
-    "@storybook/api" "6.1.21"
-    "@storybook/client-api" "6.1.21"
-    "@storybook/components" "6.1.21"
-    "@storybook/node-logger" "6.1.21"
-    "@storybook/theming" "6.1.21"
-    core-js "^3.0.1"
+"@storybook/addon-controls@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.2.8.tgz#15c79b6c1daae218dcabf240bc0013e2c68bf208"
+  integrity sha512-VpMo5qPlRVWr1GALWOCRDuompYZm+7z0FRc3x71AkT3sCIZdiPjHHMt7IkG14ranEumusNtBZ2ez8NgKX0mDdQ==
+  dependencies:
+    "@storybook/addons" "6.2.8"
+    "@storybook/api" "6.2.8"
+    "@storybook/client-api" "6.2.8"
+    "@storybook/components" "6.2.8"
+    "@storybook/node-logger" "6.2.8"
+    "@storybook/theming" "6.2.8"
+    core-js "^3.8.2"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-docs@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.1.21.tgz#2ab12698200e7353c4789d705b0a1972f6d268d8"
-  integrity sha512-MvTmxrOSo+zZ5MaMx9LVWM8DlvVHeryCJKPJx8BYCEN38r8mIK7uCFYok8oMPmACrVe0MfXOdJCm1HKkBKjsMg==
+"@storybook/addon-docs@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.2.8.tgz#b5d039ad04805eceb99dbbb60a45c6d49096f0c3"
+  integrity sha512-IWnb10ImrzRMT2qw9785p3wYEI6U9gjsg6H2zKcRJQP5dEboqeX3OFjUKfXkaIWii4nz8MtJjBg5t4BdEYqLdw==
   dependencies:
-    "@babel/core" "^7.12.1"
-    "@babel/generator" "^7.12.1"
-    "@babel/parser" "^7.12.3"
-    "@babel/plugin-transform-react-jsx" "^7.12.1"
-    "@babel/preset-env" "^7.12.1"
-    "@jest/transform" "^26.0.0"
-    "@mdx-js/loader" "^1.6.19"
-    "@mdx-js/mdx" "^1.6.19"
-    "@mdx-js/react" "^1.6.19"
-    "@storybook/addons" "6.1.21"
-    "@storybook/api" "6.1.21"
-    "@storybook/client-api" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/components" "6.1.21"
-    "@storybook/core" "6.1.21"
-    "@storybook/core-events" "6.1.21"
+    "@babel/core" "^7.12.10"
+    "@babel/generator" "^7.12.11"
+    "@babel/parser" "^7.12.11"
+    "@babel/plugin-transform-react-jsx" "^7.12.12"
+    "@babel/preset-env" "^7.12.11"
+    "@jest/transform" "^26.6.2"
+    "@mdx-js/loader" "^1.6.22"
+    "@mdx-js/mdx" "^1.6.22"
+    "@mdx-js/react" "^1.6.22"
+    "@storybook/addons" "6.2.8"
+    "@storybook/api" "6.2.8"
+    "@storybook/builder-webpack4" "6.2.8"
+    "@storybook/client-api" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/components" "6.2.8"
+    "@storybook/core" "6.2.8"
+    "@storybook/core-events" "6.2.8"
     "@storybook/csf" "0.0.1"
-    "@storybook/node-logger" "6.1.21"
-    "@storybook/postinstall" "6.1.21"
-    "@storybook/source-loader" "6.1.21"
-    "@storybook/theming" "6.1.21"
-    acorn "^7.1.0"
-    acorn-jsx "^5.1.0"
-    acorn-walk "^7.0.0"
-    core-js "^3.0.1"
+    "@storybook/node-logger" "6.2.8"
+    "@storybook/postinstall" "6.2.8"
+    "@storybook/source-loader" "6.2.8"
+    "@storybook/theming" "6.2.8"
+    acorn "^7.4.1"
+    acorn-jsx "^5.3.1"
+    acorn-walk "^7.2.0"
+    core-js "^3.8.2"
     doctrine "^3.0.0"
-    escodegen "^1.12.0"
-    fast-deep-equal "^3.1.1"
-    global "^4.3.2"
+    escodegen "^2.0.0"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
     html-tags "^3.1.0"
     js-string-escape "^1.0.1"
-    lodash "^4.17.15"
-    prettier "~2.0.5"
+    loader-utils "^2.0.0"
+    lodash "^4.17.20"
+    prettier "~2.2.1"
     prop-types "^15.7.2"
-    react-element-to-jsx-string "^14.3.1"
+    react-element-to-jsx-string "^14.3.2"
     regenerator-runtime "^0.13.7"
-    remark-external-links "^6.0.0"
+    remark-external-links "^8.0.0"
     remark-slug "^6.0.0"
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-essentials@^6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.1.21.tgz#ed528fbdebbc841459a8264f74e517c04b0e1a27"
-  integrity sha512-kdQ/hnfwwodWVFvMdvSbhOyLv/cUJyhgVRyIamrURP9I0OlWhpOAHhwMjAT2KKceutN3UjNpSCqFNSL4dMu25g==
-  dependencies:
-    "@storybook/addon-actions" "6.1.21"
-    "@storybook/addon-backgrounds" "6.1.21"
-    "@storybook/addon-controls" "6.1.21"
-    "@storybook/addon-docs" "6.1.21"
-    "@storybook/addon-toolbars" "6.1.21"
-    "@storybook/addon-viewport" "6.1.21"
-    "@storybook/addons" "6.1.21"
-    "@storybook/api" "6.1.21"
-    "@storybook/node-logger" "6.1.21"
-    core-js "^3.0.1"
+"@storybook/addon-essentials@^6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.2.8.tgz#0a2551d73362f8e7d9758049b7ff3ddbf1f79e10"
+  integrity sha512-co2+/AYCWqQiokKJbVfJyQvcj0juMGXjLv57kZfJM0L0gP9i4rGtyTjy5VlmB8BmSs650ZuaKgShioC//gUr+g==
+  dependencies:
+    "@storybook/addon-actions" "6.2.8"
+    "@storybook/addon-backgrounds" "6.2.8"
+    "@storybook/addon-controls" "6.2.8"
+    "@storybook/addon-docs" "6.2.8"
+    "@storybook/addon-toolbars" "6.2.8"
+    "@storybook/addon-viewport" "6.2.8"
+    "@storybook/addons" "6.2.8"
+    "@storybook/api" "6.2.8"
+    "@storybook/node-logger" "6.2.8"
+    core-js "^3.8.2"
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
@@ -2270,49 +2815,34 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-toolbars@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.1.21.tgz#7e03ef74fe448c5b4e378cb08e1d79b9d8496d9f"
-  integrity sha512-89NtiqLT3ltb7Jb7rAug7jnWIDh6SxXa9i3mOoKEIcvuRJEmxGLF1Z79A+zXOJOKBUEEUgfJCtVS2lixakgwKA==
-  dependencies:
-    "@storybook/addons" "6.1.21"
-    "@storybook/api" "6.1.21"
-    "@storybook/client-api" "6.1.21"
-    "@storybook/components" "6.1.21"
-    core-js "^3.0.1"
-
-"@storybook/addon-viewport@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.1.21.tgz#893090cca12f55abb4d8acade5f04e58e6317b1f"
-  integrity sha512-FrQk0BXCI4HdbBn9+8b+Cp2HvsweZkgW/joKfcF2vVLoasUBB4bl+9uU3HV/3a08glgjPl24caDMPgoRKS90WQ==
-  dependencies:
-    "@storybook/addons" "6.1.21"
-    "@storybook/api" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/components" "6.1.21"
-    "@storybook/core-events" "6.1.21"
-    "@storybook/theming" "6.1.21"
-    core-js "^3.0.1"
-    global "^4.3.2"
+"@storybook/addon-toolbars@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.2.8.tgz#ab6dd7e080feed25d562d468316ac8e47b745ee4"
+  integrity sha512-BInsquQhEN/AD/any2tRZwreRQVueGrHg9bu1FnJzigpoUJv8VuDwOSIY1Fr1ZfMljhwVxwM5wGmHdVtG+SwDQ==
+  dependencies:
+    "@storybook/addons" "6.2.8"
+    "@storybook/api" "6.2.8"
+    "@storybook/client-api" "6.2.8"
+    "@storybook/components" "6.2.8"
+    core-js "^3.8.2"
+
+"@storybook/addon-viewport@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.2.8.tgz#65e6d028c757d18a3bb889e23bb80985d59b685b"
+  integrity sha512-SQvVQ59yGIH1BoBSZNssVeaHAUxCiORDzXzOLK7B6AjKx2hiIgP7+qQlqs2IzWvzdGzTOAZw3JP8+DiOnN1ehg==
+  dependencies:
+    "@storybook/addons" "6.2.8"
+    "@storybook/api" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/components" "6.2.8"
+    "@storybook/core-events" "6.2.8"
+    "@storybook/theming" "6.2.8"
+    core-js "^3.8.2"
+    global "^4.4.0"
     memoizerific "^1.11.3"
     prop-types "^15.7.2"
     regenerator-runtime "^0.13.7"
 
-"@storybook/addons@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.1.21.tgz#94bb66fc51d1dfee80d0fe84f5b83c10045651b5"
-  integrity sha512-xo5TGu9EZVCqgh3D1veVnfuGzyKDWWsvOMo18phVqRxj21G3/+hScVyfIYwNTv7Ys5/Ahp9JxJUMXL3V3ny+tw==
-  dependencies:
-    "@storybook/api" "6.1.21"
-    "@storybook/channels" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/core-events" "6.1.21"
-    "@storybook/router" "6.1.21"
-    "@storybook/theming" "6.1.21"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    regenerator-runtime "^0.13.7"
-
 "@storybook/addons@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.8.tgz#31d9bbd2e8b212490065a25e587621dab83ae392"
@@ -2328,31 +2858,6 @@
     global "^4.4.0"
     regenerator-runtime "^0.13.7"
 
-"@storybook/api@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.21.tgz#be753ca8d3602efe4a11783c81c689463bee0825"
-  integrity sha512-QjZk70VSXMw/wPPoWdMp5Bl9VmkfmGhIz8PALrFLLEZHjzptpfZE2qkGEEJHG0NAksFUv6NxGki2/632dzR7Ug==
-  dependencies:
-    "@reach/router" "^1.3.3"
-    "@storybook/channels" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/core-events" "6.1.21"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.1.21"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.1.21"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.0.1"
-    fast-deep-equal "^3.1.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    regenerator-runtime "^0.13.7"
-    store2 "^2.7.1"
-    telejson "^5.0.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.8.tgz#9165b25f8b71e08c4af5a30805407b025fbb5b1f"
@@ -2379,18 +2884,81 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channel-postmessage@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.1.21.tgz#acce71833499dba4c4e686de09f5b281a3239842"
-  integrity sha512-SuI/ffqcPT02VNda32k8V0D4XpLm5bIy8CLIs0OAnQg+zt5KjGBpQBngk3q4EaAiOoAhbMWAQiUzRUXfrgkgXg==
+"@storybook/builder-webpack4@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.2.8.tgz#af7b7d72617c38b917b2dfc910d268e022090fcd"
+  integrity sha512-7fQ9WQVbL/1SHiu853bTwwN8+CprbXycGd6VjN1PeSRXu8LkVOQWsNhWV3lwykOpDpieYSuZU3aS2ThRtWonGA==
   dependencies:
-    "@storybook/channels" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/core-events" "6.1.21"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    qs "^6.6.0"
-    telejson "^5.0.2"
+    "@babel/core" "^7.12.10"
+    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    "@babel/plugin-proposal-decorators" "^7.12.12"
+    "@babel/plugin-proposal-export-default-from" "^7.12.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
+    "@babel/plugin-proposal-private-methods" "^7.12.1"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.12"
+    "@babel/plugin-transform-classes" "^7.12.1"
+    "@babel/plugin-transform-destructuring" "^7.12.1"
+    "@babel/plugin-transform-for-of" "^7.12.1"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
+    "@babel/plugin-transform-spread" "^7.12.1"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/preset-env" "^7.12.11"
+    "@babel/preset-react" "^7.12.10"
+    "@babel/preset-typescript" "^7.12.7"
+    "@storybook/addons" "6.2.8"
+    "@storybook/api" "6.2.8"
+    "@storybook/channel-postmessage" "6.2.8"
+    "@storybook/channels" "6.2.8"
+    "@storybook/client-api" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/components" "6.2.8"
+    "@storybook/core-common" "6.2.8"
+    "@storybook/core-events" "6.2.8"
+    "@storybook/node-logger" "6.2.8"
+    "@storybook/router" "6.2.8"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.8"
+    "@storybook/ui" "6.2.8"
+    "@types/node" "^14.0.10"
+    "@types/webpack" "^4.41.26"
+    autoprefixer "^9.8.6"
+    babel-loader "^8.2.2"
+    babel-plugin-macros "^2.8.0"
+    babel-plugin-polyfill-corejs3 "^0.1.0"
+    case-sensitive-paths-webpack-plugin "^2.3.0"
+    core-js "^3.8.2"
+    css-loader "^3.6.0"
+    dotenv-webpack "^1.8.0"
+    file-loader "^6.2.0"
+    find-up "^5.0.0"
+    fork-ts-checker-webpack-plugin "^4.1.6"
+    fs-extra "^9.0.1"
+    glob "^7.1.6"
+    glob-promise "^3.4.0"
+    global "^4.4.0"
+    html-webpack-plugin "^4.0.0"
+    pnp-webpack-plugin "1.6.4"
+    postcss "^7.0.35"
+    postcss-flexbugs-fixes "^4.2.1"
+    postcss-loader "^4.2.0"
+    raw-loader "^4.0.2"
+    react-dev-utils "^11.0.3"
+    stable "^0.1.8"
+    style-loader "^1.3.0"
+    terser-webpack-plugin "^3.1.0"
+    ts-dedent "^2.0.0"
+    url-loader "^4.1.1"
+    util-deprecate "^1.0.2"
+    webpack "4"
+    webpack-dev-middleware "^3.7.3"
+    webpack-filter-warnings-plugin "^1.2.1"
+    webpack-hot-middleware "^2.25.0"
+    webpack-virtual-modules "^0.2.2"
 
 "@storybook/channel-postmessage@6.2.8":
   version "6.2.8"
@@ -2405,45 +2973,12 @@
     qs "^6.10.0"
     telejson "^5.1.0"
 
-"@storybook/channels@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.1.21.tgz#adbfae5f4767234c5b17d9578be983584dddead4"
-  integrity sha512-7WoizMjyHqCyvcWncLexSg9FLPIErWAZL4NvluEthwsHSO2sDybn9mh1pzsFHdYMuTP6ml06Zt9ayWMtIveHDg==
-  dependencies:
-    core-js "^3.0.1"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
 "@storybook/channels@6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.8.tgz#81ec350291adfe479eea69e47f670d64ce0fe8a2"
-  integrity sha512-wn4I1kljyhEYhdJV98SrzQutbeigBwtTtisCdICJrUoENpLBWjZYWg5s+Wam1Q65375ajgIzeL7IZH7/TjxeKg==
-  dependencies:
-    core-js "^3.8.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-
-"@storybook/client-api@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.1.21.tgz#c9f72bbc9bf9d12cc931eb824f6912173c73b0b3"
-  integrity sha512-uLFXQ5z1LLWYnw1w+YUJPzIPRVlwCCvM2Si37aHDZn1F3fnbMg+huEhEqIQ1TTTw3wiJoTeGuShYvqyaiNwq/w==
-  dependencies:
-    "@storybook/addons" "6.1.21"
-    "@storybook/channel-postmessage" "6.1.21"
-    "@storybook/channels" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/core-events" "6.1.21"
-    "@storybook/csf" "0.0.1"
-    "@types/qs" "^6.9.0"
-    "@types/webpack-env" "^1.15.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-    regenerator-runtime "^0.13.7"
-    stable "^0.1.8"
-    store2 "^2.7.1"
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.8.tgz#81ec350291adfe479eea69e47f670d64ce0fe8a2"
+  integrity sha512-wn4I1kljyhEYhdJV98SrzQutbeigBwtTtisCdICJrUoENpLBWjZYWg5s+Wam1Q65375ajgIzeL7IZH7/TjxeKg==
+  dependencies:
+    core-js "^3.8.2"
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
@@ -2471,14 +3006,6 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-logger@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.1.21.tgz#fe7d9e645ddb4eb9dc18fdacea24b4baf11bc6c9"
-  integrity sha512-QJV+gnVM2fQ4M7lSkRLCXkOw/RU+aEtUefo9TAnXxPHK3UGG+DyvLmha6fHGaz9GAcFxyWtgqCyVOhMe03Q35g==
-  dependencies:
-    core-js "^3.0.1"
-    global "^4.3.2"
-
 "@storybook/client-logger@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.8.tgz#2e32cc9f0b73e29fb386383ab9e927ab6d3668fc"
@@ -2487,33 +3014,6 @@
     core-js "^3.8.2"
     global "^4.4.0"
 
-"@storybook/components@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.21.tgz#7b9bfd51e73c179654a114275e5073f494d2a005"
-  integrity sha512-2NjkyS1yeYXlRY7azt88woqd6eqJA00oloIxgMAFLVpRmvFxoHalY61wNrvxl2QSu9cNofp984AbGc8gPbizBA==
-  dependencies:
-    "@popperjs/core" "^2.5.4"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.1.21"
-    "@types/overlayscrollbars" "^1.9.0"
-    "@types/react-color" "^3.0.1"
-    "@types/react-syntax-highlighter" "11.0.4"
-    core-js "^3.0.1"
-    fast-deep-equal "^3.1.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    markdown-to-jsx "^6.11.4"
-    memoizerific "^1.11.3"
-    overlayscrollbars "^1.10.2"
-    polished "^3.4.4"
-    react-color "^2.17.0"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.0"
-    react-textarea-autosize "^8.1.1"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-
 "@storybook/components@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.8.tgz#303150977965f9750e7528e58fc5d1c0a1220bd2"
@@ -2544,127 +3044,156 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/core-events@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.1.21.tgz#11f537f78f8c73ba5e627b57b282a279793a3511"
-  integrity sha512-KWqnh1C7M1pT//WfQb3AD60yTR8jL48AfaeLGto2gO9VK7VVgj/EGsrXZP/GTL90ygyExbbBI5gkr7EBTu/HYw==
-  dependencies:
-    core-js "^3.0.1"
-
-"@storybook/core-events@6.2.8":
+"@storybook/core-client@6.2.8":
   version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.8.tgz#e33427f7b4b2bd141c788189d50dc92337dd4e81"
-  integrity sha512-1TVzA5/FEwtgxor2q6tsBBMTmhyJubNWlP3akznume8F7kqoCl+k/ss0PQ0ywlzc9PjWQXS7HGmSVzx0r8gdHQ==
+  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.2.8.tgz#0a103d8fb6c2e56a9565b7af36f11f4ed9620fe8"
+  integrity sha512-U26SMRCf2DEd1bHJR/g+jO6ujlEyBK1VudPQvsNjGdWedmtRc0FTQS13k0eQgawDBRC+hKTtTs/IRW5E0dn2KA==
   dependencies:
+    "@storybook/addons" "6.2.8"
+    "@storybook/channel-postmessage" "6.2.8"
+    "@storybook/client-api" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/core-events" "6.2.8"
+    "@storybook/csf" "0.0.1"
+    "@storybook/ui" "6.2.8"
+    ansi-to-html "^0.6.11"
     core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    unfetch "^4.2.0"
+    util-deprecate "^1.0.2"
 
-"@storybook/core@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.1.21.tgz#e4c9f5ab361e0c4690f2827a71308757f9d46395"
-  integrity sha512-ITqSid3VVL5/fkx7Wwu7QfD2Y5xjl3V6p7yUpLSzP8GpBnCHKDvJ4pFJUdJlGQ0mnGz6ACa0qVnSc+V0hiy1sA==
+"@storybook/core-common@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.2.8.tgz#2dac023450196b3cb2bce3c5fdb04d01741ade20"
+  integrity sha512-fPSsThcVxmYy/LYPxYiUXVIbAnZ2YAPD6210GaYbM/z+MZePkQ02V/RRyxVNJ2AS5o649TkW13lc7nMWdvzv3A==
   dependencies:
-    "@babel/core" "^7.12.3"
+    "@babel/core" "^7.12.10"
     "@babel/plugin-proposal-class-properties" "^7.12.1"
-    "@babel/plugin-proposal-decorators" "^7.12.1"
+    "@babel/plugin-proposal-decorators" "^7.12.12"
     "@babel/plugin-proposal-export-default-from" "^7.12.1"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
     "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
     "@babel/plugin-proposal-private-methods" "^7.12.1"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-transform-arrow-functions" "^7.12.1"
-    "@babel/plugin-transform-block-scoping" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.12"
     "@babel/plugin-transform-classes" "^7.12.1"
     "@babel/plugin-transform-destructuring" "^7.12.1"
     "@babel/plugin-transform-for-of" "^7.12.1"
     "@babel/plugin-transform-parameters" "^7.12.1"
     "@babel/plugin-transform-shorthand-properties" "^7.12.1"
     "@babel/plugin-transform-spread" "^7.12.1"
-    "@babel/plugin-transform-template-literals" "^7.12.1"
-    "@babel/preset-env" "^7.12.1"
-    "@babel/preset-react" "^7.12.1"
-    "@babel/preset-typescript" "^7.12.1"
+    "@babel/preset-env" "^7.12.11"
+    "@babel/preset-react" "^7.12.10"
+    "@babel/preset-typescript" "^7.12.7"
     "@babel/register" "^7.12.1"
-    "@storybook/addons" "6.1.21"
-    "@storybook/api" "6.1.21"
-    "@storybook/channel-postmessage" "6.1.21"
-    "@storybook/channels" "6.1.21"
-    "@storybook/client-api" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/components" "6.1.21"
-    "@storybook/core-events" "6.1.21"
-    "@storybook/csf" "0.0.1"
-    "@storybook/node-logger" "6.1.21"
-    "@storybook/router" "6.1.21"
+    "@storybook/node-logger" "6.2.8"
     "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.1.21"
-    "@storybook/ui" "6.1.21"
     "@types/glob-base" "^0.3.0"
     "@types/micromatch" "^4.0.1"
-    "@types/node-fetch" "^2.5.4"
+    "@types/node" "^14.0.10"
+    "@types/pretty-hrtime" "^1.0.0"
+    babel-loader "^8.2.2"
+    babel-plugin-macros "^3.0.1"
+    babel-plugin-polyfill-corejs3 "^0.1.0"
+    chalk "^4.1.0"
+    core-js "^3.8.2"
+    express "^4.17.1"
+    file-system-cache "^1.0.5"
+    find-up "^5.0.0"
+    fork-ts-checker-webpack-plugin "^6.0.4"
+    glob "^7.1.6"
+    glob-base "^0.3.0"
+    interpret "^2.2.0"
+    json5 "^2.1.3"
+    lazy-universal-dotenv "^3.0.1"
+    micromatch "^4.0.2"
+    pkg-dir "^5.0.0"
+    pretty-hrtime "^1.0.3"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+    webpack "4"
+
+"@storybook/core-events@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.8.tgz#e33427f7b4b2bd141c788189d50dc92337dd4e81"
+  integrity sha512-1TVzA5/FEwtgxor2q6tsBBMTmhyJubNWlP3akznume8F7kqoCl+k/ss0PQ0ywlzc9PjWQXS7HGmSVzx0r8gdHQ==
+  dependencies:
+    core-js "^3.8.2"
+
+"@storybook/core-server@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.2.8.tgz#83bd8e229225b3d7e5b11d91850b7b15bdab7525"
+  integrity sha512-2kNgnsf8eX5QWPQmzP0SIViSKysMDOxSS0doOHd0KJBkcPwj1FUoNithu7RllQPSsphsifLua6OtTjt4UP/ycg==
+  dependencies:
+    "@babel/core" "^7.12.10"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/preset-react" "^7.12.10"
+    "@storybook/addons" "6.2.8"
+    "@storybook/builder-webpack4" "6.2.8"
+    "@storybook/core-client" "6.2.8"
+    "@storybook/core-common" "6.2.8"
+    "@storybook/node-logger" "6.2.8"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.8"
+    "@storybook/ui" "6.2.8"
+    "@types/node" "^14.0.10"
+    "@types/node-fetch" "^2.5.7"
+    "@types/pretty-hrtime" "^1.0.0"
+    "@types/webpack" "^4.41.26"
     airbnb-js-shims "^2.2.1"
-    ansi-to-html "^0.6.11"
-    autoprefixer "^9.7.2"
-    babel-loader "^8.0.6"
-    babel-plugin-emotion "^10.0.20"
-    babel-plugin-macros "^2.8.0"
-    babel-preset-minify "^0.5.0 || 0.6.0-alpha.5"
-    better-opn "^2.0.0"
-    boxen "^4.1.0"
-    case-sensitive-paths-webpack-plugin "^2.2.0"
-    chalk "^4.0.0"
+    babel-loader "^8.2.2"
+    better-opn "^2.1.1"
+    boxen "^4.2.0"
+    case-sensitive-paths-webpack-plugin "^2.3.0"
+    chalk "^4.1.0"
     cli-table3 "0.6.0"
-    commander "^5.0.0"
-    core-js "^3.0.1"
+    commander "^6.2.1"
+    core-js "^3.8.2"
     cpy "^8.1.1"
-    css-loader "^3.5.3"
+    css-loader "^3.6.0"
     detect-port "^1.3.0"
-    dotenv-webpack "^1.7.0"
-    ejs "^3.1.2"
-    express "^4.17.0"
-    file-loader "^6.0.0"
+    dotenv-webpack "^1.8.0"
+    express "^4.17.1"
+    file-loader "^6.2.0"
     file-system-cache "^1.0.5"
-    find-up "^4.1.0"
-    fork-ts-checker-webpack-plugin "^4.1.4"
-    fs-extra "^9.0.0"
-    glob "^7.1.6"
-    glob-base "^0.3.0"
-    glob-promise "^3.4.0"
-    global "^4.3.2"
-    html-webpack-plugin "^4.2.1"
-    inquirer "^7.0.0"
-    interpret "^2.0.0"
+    find-up "^5.0.0"
+    fs-extra "^9.0.1"
+    global "^4.4.0"
+    html-webpack-plugin "^4.0.0"
     ip "^1.1.5"
-    json5 "^2.1.1"
-    lazy-universal-dotenv "^3.0.1"
-    micromatch "^4.0.2"
-    node-fetch "^2.6.0"
-    pkg-dir "^4.2.0"
+    node-fetch "^2.6.1"
     pnp-webpack-plugin "1.6.4"
-    postcss-flexbugs-fixes "^4.1.0"
-    postcss-loader "^3.0.0"
     pretty-hrtime "^1.0.3"
-    qs "^6.6.0"
-    raw-loader "^4.0.1"
-    react-dev-utils "^11.0.3"
+    prompts "^2.4.0"
+    read-pkg-up "^7.0.1"
     regenerator-runtime "^0.13.7"
     resolve-from "^5.0.0"
     serve-favicon "^2.5.0"
-    shelljs "^0.8.4"
-    stable "^0.1.8"
-    style-loader "^1.2.1"
-    telejson "^5.0.2"
-    terser-webpack-plugin "^3.0.0"
+    style-loader "^1.3.0"
+    telejson "^5.1.0"
+    terser-webpack-plugin "^3.1.0"
     ts-dedent "^2.0.0"
-    unfetch "^4.1.0"
-    url-loader "^4.0.0"
+    url-loader "^4.1.1"
     util-deprecate "^1.0.2"
-    webpack "^4.44.2"
-    webpack-dev-middleware "^3.7.0"
-    webpack-filter-warnings-plugin "^1.2.1"
-    webpack-hot-middleware "^2.25.0"
+    webpack "4"
+    webpack-dev-middleware "^3.7.3"
     webpack-virtual-modules "^0.2.2"
 
+"@storybook/core@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.2.8.tgz#f157574ad23eebd656c4b47fd3d10caf021adab7"
+  integrity sha512-9gD/tti/+ZmzEihnrv+FF1+AgjIdCQ6VMFT76UXUEX44WZSqM8O9KA+8Llx2AD4wU928KDWLruP+5UiHkDAJKw==
+  dependencies:
+    "@storybook/core-client" "6.2.8"
+    "@storybook/core-server" "6.2.8"
+
 "@storybook/csf@0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.0.1.tgz#95901507dc02f0bc6f9ac8ee1983e2fc5bb98ce6"
@@ -2672,18 +3201,7 @@
   dependencies:
     lodash "^4.17.15"
 
-"@storybook/node-logger@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.1.21.tgz#bcf882209697acfe4fc60bc224676400bce260ed"
-  integrity sha512-wQZZw4n1PG3kGOsczWCBC6+8RagYkrGYDqsVOpUcs5shGbPg5beCXDuzP4nxz2IlsoP9ZtTSaX741H791OIOjA==
-  dependencies:
-    "@types/npmlog" "^4.1.2"
-    chalk "^4.0.0"
-    core-js "^3.0.1"
-    npmlog "^4.1.2"
-    pretty-hrtime "^1.0.3"
-
-"@storybook/node-logger@^6.2.8":
+"@storybook/node-logger@6.2.8", "@storybook/node-logger@^6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.8.tgz#a5cb21e397a3e4945375b73803f901c93513a56c"
   integrity sha512-mSbHF1yneRScviISaDQmtRcOBwjHbmdc8p791X4Myl87luqENnt0s8mnTG0H8uH/LGKvtZ2AGST89MqusQ6xUw==
@@ -2694,12 +3212,12 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/postinstall@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.1.21.tgz#a7598b53291e3ab74400feb492359cc0d725d9a3"
-  integrity sha512-mg3fNqdQYiz6ivQIU1WMKqtqrFt5GySmsPCar3Y+xOdMClmpx6pZYcpiN782h8CIFA1XnldGR3TKVtWP848qOg==
+"@storybook/postinstall@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.2.8.tgz#abf0f1b26f8273b49c10360207d20d3f23eafbb6"
+  integrity sha512-VaFQ622qSSpBqZpx+BGFGY52VKk4gnlpFs9r6+TgqaoFv9DpRWnj95fhkdtYuumzVhMiJLerdYdKgR/NsM+hJg==
   dependencies:
-    core-js "^3.0.1"
+    core-js "^3.8.2"
 
 "@storybook/preset-create-react-app@^3.1.7":
   version "3.1.7"
@@ -2714,44 +3232,34 @@
     react-docgen-typescript-plugin "^0.6.2"
     semver "^7.3.2"
 
-"@storybook/react@^6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.1.21.tgz#1c4d01dba8d8f130f9b7da4038a380eeb9c61f38"
-  integrity sha512-j3gq/ssWxRCCH5iCHbP3ihXSGS7lVWh1HpmBmGbbhHGHgdmSPsRjwDXiQGE81EmE7bzbC8NECBhU3zHJ6h1TvA==
+"@storybook/react@^6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.2.8.tgz#7b3fb79f30a696856e8bb98b2dc6a2b3a48cbdba"
+  integrity sha512-n8nQmuclm+KvwOKWpZfTFeeUWISZuEUcHQc6MGoi0fzXDnJDPSk4KI6kvIMlr1kSDh41+iZfbbBTil+XWORaRA==
   dependencies:
     "@babel/preset-flow" "^7.12.1"
-    "@babel/preset-react" "^7.12.1"
-    "@pmmmwh/react-refresh-webpack-plugin" "^0.4.2"
-    "@storybook/addons" "6.1.21"
-    "@storybook/core" "6.1.21"
-    "@storybook/node-logger" "6.1.21"
+    "@babel/preset-react" "^7.12.10"
+    "@pmmmwh/react-refresh-webpack-plugin" "^0.4.3"
+    "@storybook/addons" "6.2.8"
+    "@storybook/core" "6.2.8"
+    "@storybook/core-common" "6.2.8"
+    "@storybook/node-logger" "6.2.8"
     "@storybook/semver" "^7.3.2"
-    "@types/webpack-env" "^1.15.3"
+    "@types/webpack-env" "^1.16.0"
     babel-plugin-add-react-displayname "^0.0.5"
     babel-plugin-named-asset-import "^0.3.1"
     babel-plugin-react-docgen "^4.2.1"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
     prop-types "^15.7.2"
     react-dev-utils "^11.0.3"
     react-docgen-typescript-plugin "^0.6.2"
     react-refresh "^0.8.3"
+    read-pkg-up "^7.0.1"
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
-    webpack "^4.44.2"
-
-"@storybook/router@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.1.21.tgz#0a822fa9cc67589a082f7a10fff15c8413f17706"
-  integrity sha512-m75WvUhoCBWDVekICAdbkidji/w5hCjHo+M8L13UghpwXWEnyr4/QqvkOb/PcSC8aZzxeMqSCpRQ1o6LWULneg==
-  dependencies:
-    "@reach/router" "^1.3.3"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
+    webpack "4"
 
 "@storybook/router@6.2.8":
   version "6.2.8"
@@ -2777,40 +3285,21 @@
     core-js "^3.6.5"
     find-up "^4.1.0"
 
-"@storybook/source-loader@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.1.21.tgz#23cda170dd77d188df52cb3f2ab8ef191e04b8a0"
-  integrity sha512-eMbmQG3a/7SFxVN+KGJKfk4uxLqQz2Nk95zvHyRvoX15LRyMnFvmdvmULe5vwRev8Npd4AS0EZ37m3jAEcD0ig==
+"@storybook/source-loader@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.2.8.tgz#2dfa0563cbac911685eb6cd575daa55a36a79049"
+  integrity sha512-e5rOLRPN39mTeRNv5FfIxR7XMb8bhx6kk0SS2ciojkcTg9aLLnguZSfm9E/OBLp/be8//TX4y5m3PwNQSXUrLg==
   dependencies:
-    "@storybook/addons" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
+    "@storybook/addons" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
     "@storybook/csf" "0.0.1"
-    core-js "^3.0.1"
-    estraverse "^4.2.0"
-    global "^4.3.2"
+    core-js "^3.8.2"
+    estraverse "^5.2.0"
+    global "^4.4.0"
     loader-utils "^2.0.0"
-    lodash "^4.17.15"
-    prettier "~2.0.5"
+    lodash "^4.17.20"
+    prettier "~2.2.1"
     regenerator-runtime "^0.13.7"
-    source-map "^0.7.3"
-
-"@storybook/theming@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.1.21.tgz#b8e612e5a39b77f7e63a5f9ea322ed62adb0d5b0"
-  integrity sha512-yq7+/mpdljRdSRJYw/In/9tnDGXIUDe//mhyMftFfrB2mq6zi1yAZpowCerWhiDE2ipGkrfzIYx/Sn7bcaXgqg==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.23"
-    "@storybook/client-logger" "6.1.21"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.19"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.4.4"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
 
 "@storybook/theming@6.2.8":
   version "6.2.8"
@@ -2830,41 +3319,40 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/ui@6.1.21":
-  version "6.1.21"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.1.21.tgz#bf7cac3ba9a6250f573fa1ba12d4592891d5ece2"
-  integrity sha512-2nRb5egnSBKbosuR7g5PsuM4XnRLXZUf7TBjwT6eRlomnE2wrWM5DtTLpFeUpDob0SI5hPlOV1xCpPz3XmeyyA==
+"@storybook/ui@6.2.8":
+  version "6.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.2.8.tgz#331f8f5bb8e6feaf15a3a91b23eba48509882650"
+  integrity sha512-lPRa6z3ArHEewuIAAtHFdF7VwK7chMGza/PV1gAQT2ywUDibJoTen/qtUP4TKhLSJTOUsZK8q4X7yiN1KJBu5w==
   dependencies:
     "@emotion/core" "^10.1.1"
-    "@storybook/addons" "6.1.21"
-    "@storybook/api" "6.1.21"
-    "@storybook/channels" "6.1.21"
-    "@storybook/client-logger" "6.1.21"
-    "@storybook/components" "6.1.21"
-    "@storybook/core-events" "6.1.21"
-    "@storybook/router" "6.1.21"
+    "@storybook/addons" "6.2.8"
+    "@storybook/api" "6.2.8"
+    "@storybook/channels" "6.2.8"
+    "@storybook/client-logger" "6.2.8"
+    "@storybook/components" "6.2.8"
+    "@storybook/core-events" "6.2.8"
+    "@storybook/router" "6.2.8"
     "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.1.21"
-    "@types/markdown-to-jsx" "^6.11.0"
-    copy-to-clipboard "^3.0.8"
-    core-js "^3.0.1"
-    core-js-pure "^3.0.1"
-    downshift "^6.0.6"
-    emotion-theming "^10.0.19"
+    "@storybook/theming" "6.2.8"
+    "@types/markdown-to-jsx" "^6.11.3"
+    copy-to-clipboard "^3.3.1"
+    core-js "^3.8.2"
+    core-js-pure "^3.8.2"
+    downshift "^6.0.15"
+    emotion-theming "^10.0.27"
     fuse.js "^3.6.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
+    global "^4.4.0"
+    lodash "^4.17.20"
     markdown-to-jsx "^6.11.4"
     memoizerific "^1.11.3"
-    polished "^3.4.4"
-    qs "^6.6.0"
-    react-draggable "^4.0.3"
-    react-helmet-async "^1.0.2"
-    react-hotkeys "2.0.0"
-    react-sizeme "^2.6.7"
+    polished "^4.0.5"
+    qs "^6.10.0"
+    react-draggable "^4.4.3"
+    react-helmet-async "^1.0.7"
+    react-sizeme "^3.0.1"
     regenerator-runtime "^0.13.7"
     resolve-from "^5.0.0"
-    store2 "^2.7.1"
+    store2 "^2.12.0"
 
 "@stylelint/postcss-css-in-js@^0.37.2":
   version "0.37.2"
@@ -3249,10 +3737,10 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440"
   integrity sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==
 
-"@types/markdown-to-jsx@^6.11.0":
-  version "6.11.1"
-  resolved "https://registry.yarnpkg.com/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.1.tgz#4d9464aa76337d798b874dd3f2d6b4c86ddd98ad"
-  integrity sha512-fm/II24OzSx7J7CzXnHjEIf0d+s82bmdcokbyzY7PFMUnhyhnuGJgedt8R+yZgDn1mqhCLHmMjBPMsL8K4Xp9g==
+"@types/markdown-to-jsx@^6.11.3":
+  version "6.11.3"
+  resolved "https://registry.yarnpkg.com/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.3.tgz#cdd1619308fecbc8be7e6a26f3751260249b020e"
+  integrity sha512-30nFYpceM/ZEvhGiqWjm5quLUxNeld0HCzJEXMZZDpq53FPkS85mTwkWtCXzCqq8s5JYLgM5W392a02xn8Bdaw==
   dependencies:
     "@types/react" "*"
 
@@ -3285,10 +3773,10 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
-"@types/node-fetch@^2.5.4":
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
-  integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
+"@types/node-fetch@^2.5.7":
+  version "2.5.10"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.10.tgz#9b4d4a0425562f9fcea70b12cb3fcdd946ca8132"
+  integrity sha512-IpkX0AasN44hgEad0gEF/V6EgR5n69VEqPEgnmoM8GsIGro3PowbWs4tR6IhxUTyPLpOn+fiGG6nrQhcmoCuIQ==
   dependencies:
     "@types/node" "*"
     form-data "^3.0.0"
@@ -3308,6 +3796,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18"
   integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==
 
+"@types/node@^14.0.10":
+  version "14.14.37"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
+  integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -3318,7 +3811,7 @@
   resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.2.tgz#d070fe6a6b78755d1092a3dc492d34c3d8f871c4"
   integrity sha512-4QQmOF5KlwfxJ5IGXFIudkeLCdMABz03RcUXu+LCb24zmln8QW6aDjuGl4d4XPVLf2j+FnjelHTP7dvceAFbhA==
 
-"@types/overlayscrollbars@^1.12.0", "@types/overlayscrollbars@^1.9.0":
+"@types/overlayscrollbars@^1.12.0":
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/@types/overlayscrollbars/-/overlayscrollbars-1.12.0.tgz#98456caceca8ad73bd5bb572632a585074e70764"
   integrity sha512-h/pScHNKi4mb+TrJGDon8Yb06ujFG0mSg12wIO0sWMUF3dQIe2ExRRdNRviaNt9IjxIiOfnRr7FsQAdHwK4sMg==
@@ -3338,6 +3831,11 @@
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.5.tgz#b6ab3bba29e16b821d84e09ecfaded462b816b00"
   integrity sha512-UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ==
 
+"@types/pretty-hrtime@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/pretty-hrtime/-/pretty-hrtime-1.0.0.tgz#c5a2d644a135e988b2932f99737e67b3c62528d0"
+  integrity sha512-xl+5r2rcrxdLViAYkkiLMYsoUs3qEyrAnHFyEzYysgRxdVp3WbhysxIvJIxZp9FvZ2CYezh0TaHZorivH+voOQ==
+
 "@types/prop-types@*":
   version "15.7.3"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
@@ -3348,7 +3846,7 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
   integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
 
-"@types/qs@^6.9.0", "@types/qs@^6.9.5":
+"@types/qs@^6.9.5":
   version "6.9.6"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
   integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
@@ -3360,14 +3858,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-color@^3.0.1":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/react-color/-/react-color-3.0.4.tgz#c63daf012ad067ac0127bdd86725f079d02082bd"
-  integrity sha512-EswbYJDF1kkrx93/YU+BbBtb46CCtDMvTiGmcOa/c5PETnwTiSWoseJ1oSWeRl/4rUXkhME9bVURvvPg0W5YQw==
-  dependencies:
-    "@types/react" "*"
-    "@types/reactcss" "*"
-
 "@types/react-dom@^17.0.3":
   version "17.0.3"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.3.tgz#7fdf37b8af9d6d40127137865bb3fff8871d7ee1"
@@ -3375,13 +3865,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-syntax-highlighter@11.0.4":
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.4.tgz#d86d17697db62f98046874f62fdb3e53a0bbc4cd"
-  integrity sha512-9GfTo3a0PHwQeTVoqs0g5bS28KkSY48pp5659wA+Dp4MqceDEa8EHBqrllJvvtyusszyJhViUEap0FDvlk/9Zg==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-syntax-highlighter@11.0.5":
   version "11.0.5"
   resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz#0d546261b4021e1f9d85b50401c0a42acb106087"
@@ -3398,13 +3881,6 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/reactcss@*":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@types/reactcss/-/reactcss-1.2.3.tgz#af28ae11bbb277978b99d04d1eedfd068ca71834"
-  integrity sha512-d2gQQ0IL6hXLnoRfVYZukQNWHuVsE75DzFTLPUuyyEhJS8G2VvlE+qfQQ91SJjaMqlURRCNIsX7Jcsw6cEuJlA==
-  dependencies:
-    "@types/react" "*"
-
 "@types/readable-stream@^2.3.9":
   version "2.3.9"
   resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.9.tgz#40a8349e6ace3afd2dd1b6d8e9b02945de4566a9"
@@ -3464,6 +3940,11 @@
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"
   integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==
 
+"@types/tapable@^1":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.7.tgz#545158342f949e8fd3bfd813224971ecddc3fac4"
+  integrity sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ==
+
 "@types/uglify-js@*":
   version "3.9.3"
   resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.9.3.tgz#d94ed608e295bc5424c9600e6b8565407b6b4b6b"
@@ -3476,11 +3957,6 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
 
-"@types/webpack-env@^1.15.3":
-  version "1.15.3"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.3.tgz#fb602cd4c2f0b7c0fb857e922075fdf677d25d84"
-  integrity sha512-5oiXqR7kwDGZ6+gmzIO2lTC+QsriNuQXZDWNYRV3l2XRN/zmPgnC21DLSx2D05zvD8vnXW6qUg7JnXZ4I6qLVQ==
-
 "@types/webpack-env@^1.16.0":
   version "1.16.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.0.tgz#8c0a9435dfa7b3b1be76562f3070efb3f92637b4"
@@ -3507,6 +3983,18 @@
     "@types/webpack-sources" "*"
     source-map "^0.6.0"
 
+"@types/webpack@^4.41.26":
+  version "4.41.27"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.27.tgz#f47da488c8037e7f1b2dbf2714fbbacb61ec0ffc"
+  integrity sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA==
+  dependencies:
+    "@types/anymatch" "*"
+    "@types/node" "*"
+    "@types/tapable" "^1"
+    "@types/uglify-js" "*"
+    "@types/webpack-sources" "*"
+    source-map "^0.6.0"
+
 "@types/wrap-ansi@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz#18b97a972f94f60a679fd5c796d96421b9abb9fd"
@@ -3837,17 +4325,12 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-jsx@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
-  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
-
 acorn-jsx@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
   integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
-acorn-walk@^7.0.0, acorn-walk@^7.1.1:
+acorn-walk@^7.1.1, acorn-walk@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
@@ -3862,7 +4345,7 @@ acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
-acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:
+acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0, acorn@^7.4.1:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
@@ -4338,7 +4821,7 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@^9.6.1, autoprefixer@^9.7.2, autoprefixer@^9.8.6:
+autoprefixer@^9.6.1, autoprefixer@^9.8.6:
   version "9.8.6"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
   integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
@@ -4397,41 +4880,6 @@ babel-extract-comments@^1.0.0:
   dependencies:
     babylon "^6.18.0"
 
-babel-helper-evaluate-path@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.5.0.tgz#a62fa9c4e64ff7ea5cea9353174ef023a900a67c"
-  integrity sha512-mUh0UhS607bGh5wUMAQfOpt2JX2ThXMtppHRdRU1kL7ZLRWIXxoV2UIV1r2cAeeNeU1M5SB5/RSUgUxrK8yOkA==
-
-babel-helper-flip-expressions@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.3.tgz#3696736a128ac18bc25254b5f40a22ceb3c1d3fd"
-  integrity sha1-NpZzahKKwYvCUlS19AoizrPB0/0=
-
-babel-helper-is-nodes-equiv@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
-  integrity sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=
-
-babel-helper-is-void-0@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.3.tgz#7d9c01b4561e7b95dbda0f6eee48f5b60e67313e"
-  integrity sha1-fZwBtFYee5Xb2g9u7kj1tg5nMT4=
-
-babel-helper-mark-eval-scopes@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.3.tgz#d244a3bef9844872603ffb46e22ce8acdf551562"
-  integrity sha1-0kSjvvmESHJgP/tG4izorN9VFWI=
-
-babel-helper-remove-or-void@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz#a4f03b40077a0ffe88e45d07010dee241ff5ae60"
-  integrity sha1-pPA7QAd6D/6I5F0HAQ3uJB/1rmA=
-
-babel-helper-to-multiple-sequence-expressions@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz#a3f924e3561882d42fcf48907aa98f7979a4588d"
-  integrity sha512-m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA==
-
 babel-jest@^26.6.0, babel-jest@^26.6.3:
   version "26.6.3"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
@@ -4446,7 +4894,7 @@ babel-jest@^26.6.0, babel-jest@^26.6.3:
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
-babel-loader@8.1.0, babel-loader@^8.0.6:
+babel-loader@8.1.0, babel-loader@^8.2.2:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
   integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
@@ -4462,13 +4910,13 @@ babel-plugin-add-react-displayname@^0.0.5:
   resolved "https://registry.yarnpkg.com/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz#339d4cddb7b65fd62d1df9db9fe04de134122bd5"
   integrity sha1-M51M3be2X9YtHfnbn+BN4TQSK9U=
 
-babel-plugin-apply-mdx-type-prop@1.6.21:
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.21.tgz#0c8600c965ca4203e3c026ed971ed5b7e810aeba"
-  integrity sha512-+vQarmm+g+kePH4CMp2iEN/HOx1oEvZeSKCdKCEZlnJOthXzkpaRAbM3ZNCiKqVr9WuoqPNfoXQ0EVppYpIwfg==
+babel-plugin-apply-mdx-type-prop@1.6.22:
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b"
+  integrity sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==
   dependencies:
     "@babel/helper-plugin-utils" "7.10.4"
-    "@mdx-js/util" "1.6.21"
+    "@mdx-js/util" "1.6.22"
 
 babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
@@ -4477,7 +4925,7 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-emotion@^10.0.20, babel-plugin-emotion@^10.0.27:
+babel-plugin-emotion@^10.0.27:
   version "10.0.33"
   resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz#ce1155dcd1783bbb9286051efee53f4e2be63e03"
   integrity sha512-bxZbTTGz0AJQDHm8k6Rf3RQJ8tX2scsfsRyKVgAbiUPUNIRtlK+7JxP+TAd1kRLABFxe0CFm2VdK4ePkoA9FxQ==
@@ -4493,10 +4941,10 @@ babel-plugin-emotion@^10.0.20, babel-plugin-emotion@^10.0.27:
     find-root "^1.1.0"
     source-map "^0.5.7"
 
-babel-plugin-extract-import-names@1.6.21:
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.21.tgz#94efffee4ea79982491573e5f67d9957ab77596a"
-  integrity sha512-mCjTry00HB/4xHGunxQNMOGZ7JEGJdEScNh7C1WJBto7nePyn9wCdYAZP61pGC6+z3ETH5btY20mqg0plcxZGA==
+babel-plugin-extract-import-names@1.6.22:
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc"
+  integrity sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==
   dependencies:
     "@babel/helper-plugin-utils" "7.10.4"
 
@@ -4530,86 +4978,51 @@ babel-plugin-macros@2.8.0, babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-minify-builtins@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz#31eb82ed1a0d0efdc31312f93b6e4741ce82c36b"
-  integrity sha512-wpqbN7Ov5hsNwGdzuzvFcjgRlzbIeVv1gMIlICbPj0xkexnfoIDe7q+AZHMkQmAE/F9R5jkrB6TLfTegImlXag==
-
-babel-plugin-minify-constant-folding@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.5.0.tgz#f84bc8dbf6a561e5e350ff95ae216b0ad5515b6e"
-  integrity sha512-Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-
-babel-plugin-minify-dead-code-elimination@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.1.tgz#1a0c68e44be30de4976ca69ffc535e08be13683f"
-  integrity sha512-x8OJOZIrRmQBcSqxBcLbMIK8uPmTvNWPXH2bh5MDCW1latEqYiRMuUkPImKcfpo59pTUB2FT7HfcgtG8ZlR5Qg==
+babel-plugin-macros@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.0.1.tgz#0d412d68f5b3d1b64358f24ab099bd148724e2a9"
+  integrity sha512-CKt4+Oy9k2wiN+hT1uZzOw7d8zb1anbQpf7KLwaaXRCi/4pzKdFKHf7v5mvoPmjkmxshh7eKZQuRop06r5WP4w==
   dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-mark-eval-scopes "^0.4.3"
-    babel-helper-remove-or-void "^0.4.3"
-    lodash "^4.17.11"
+    "@babel/runtime" "^7.12.5"
+    cosmiconfig "^7.0.0"
+    resolve "^1.19.0"
 
-babel-plugin-minify-flip-comparisons@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.3.tgz#00ca870cb8f13b45c038b3c1ebc0f227293c965a"
-  integrity sha1-AMqHDLjxO0XAOLPB68DyJyk8llo=
-  dependencies:
-    babel-helper-is-void-0 "^0.4.3"
+babel-plugin-named-asset-import@^0.3.1, babel-plugin-named-asset-import@^0.3.7:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd"
+  integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==
 
-babel-plugin-minify-guarded-expressions@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.4.tgz#818960f64cc08aee9d6c75bec6da974c4d621135"
-  integrity sha512-RMv0tM72YuPPfLT9QLr3ix9nwUIq+sHT6z8Iu3sLbqldzC1Dls8DPCywzUIzkTx9Zh1hWX4q/m9BPoPed9GOfA==
+babel-plugin-polyfill-corejs2@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz#686775bf9a5aa757e10520903675e3889caeedc4"
+  integrity sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==
   dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-flip-expressions "^0.4.3"
-
-babel-plugin-minify-infinity@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.3.tgz#dfb876a1b08a06576384ef3f92e653ba607b39ca"
-  integrity sha1-37h2obCKBldjhO8/kuZTumB7Oco=
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.2.0"
+    semver "^6.1.1"
 
-babel-plugin-minify-mangle-names@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.5.0.tgz#bcddb507c91d2c99e138bd6b17a19c3c271e3fd3"
-  integrity sha512-3jdNv6hCAw6fsX1p2wBGPfWuK69sfOjfd3zjUXkbq8McbohWy23tpXfy5RnToYWggvqzuMOwlId1PhyHOfgnGw==
+babel-plugin-polyfill-corejs3@^0.1.0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz#80449d9d6f2274912e05d9e182b54816904befd0"
+  integrity sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==
   dependencies:
-    babel-helper-mark-eval-scopes "^0.4.3"
-
-babel-plugin-minify-numeric-literals@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.3.tgz#8e4fd561c79f7801286ff60e8c5fd9deee93c0bc"
-  integrity sha1-jk/VYcefeAEob/YOjF/Z3u6TwLw=
+    "@babel/helper-define-polyfill-provider" "^0.1.5"
+    core-js-compat "^3.8.1"
 
-babel-plugin-minify-replace@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.5.0.tgz#d3e2c9946c9096c070efc96761ce288ec5c3f71c"
-  integrity sha512-aXZiaqWDNUbyNNNpWs/8NyST+oU7QTpK7J9zFEFSA0eOmtUNMU3fczlTTTlnCxHmq/jYNFEmkkSG3DDBtW3Y4Q==
-
-babel-plugin-minify-simplify@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.1.tgz#f21613c8b95af3450a2ca71502fdbd91793c8d6a"
-  integrity sha512-OSYDSnoCxP2cYDMk9gxNAed6uJDiDz65zgL6h8d3tm8qXIagWGMLWhqysT6DY3Vs7Fgq7YUDcjOomhVUb+xX6A==
+babel-plugin-polyfill-corejs3@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz#f4b4bb7b19329827df36ff56f6e6d367026cb7a2"
+  integrity sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==
   dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-flip-expressions "^0.4.3"
-    babel-helper-is-nodes-equiv "^0.0.1"
-    babel-helper-to-multiple-sequence-expressions "^0.5.0"
+    "@babel/helper-define-polyfill-provider" "^0.2.0"
+    core-js-compat "^3.9.1"
 
-babel-plugin-minify-type-constructors@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.3.tgz#1bc6f15b87f7ab1085d42b330b717657a2156500"
-  integrity sha1-G8bxW4f3qxCF1CszC3F2V6IVZQA=
+babel-plugin-polyfill-regenerator@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz#853f5f5716f4691d98c84f8069c7636ea8da7ab8"
+  integrity sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==
   dependencies:
-    babel-helper-is-void-0 "^0.4.3"
-
-babel-plugin-named-asset-import@^0.3.1, babel-plugin-named-asset-import@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd"
-  integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==
+    "@babel/helper-define-polyfill-provider" "^0.2.0"
 
 babel-plugin-react-docgen@^4.1.0, babel-plugin-react-docgen@^4.2.1:
   version "4.2.1"
@@ -4630,26 +5043,6 @@ babel-plugin-syntax-object-rest-spread@^6.8.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
   integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
 
-babel-plugin-transform-inline-consecutive-adds@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz#323d47a3ea63a83a7ac3c811ae8e6941faf2b0d1"
-  integrity sha1-Mj1Ho+pjqDp6w8gRro5pQfrysNE=
-
-babel-plugin-transform-member-expression-literals@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz#37039c9a0c3313a39495faac2ff3a6b5b9d038bf"
-  integrity sha1-NwOcmgwzE6OUlfqsL/OmtbnQOL8=
-
-babel-plugin-transform-merge-sibling-variables@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz#85b422fc3377b449c9d1cde44087203532401dae"
-  integrity sha1-hbQi/DN3tEnJ0c3kQIcgNTJAHa4=
-
-babel-plugin-transform-minify-booleans@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz#acbb3e56a3555dd23928e4b582d285162dd2b198"
-  integrity sha1-rLs+VqNVXdI5KOS1gtKFFi3SsZg=
-
 babel-plugin-transform-object-rest-spread@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
@@ -4658,50 +5051,11 @@ babel-plugin-transform-object-rest-spread@^6.26.0:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
     babel-runtime "^6.26.0"
 
-babel-plugin-transform-property-literals@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz#98c1d21e255736573f93ece54459f6ce24985d39"
-  integrity sha1-mMHSHiVXNlc/k+zlRFn2ziSYXTk=
-  dependencies:
-    esutils "^2.0.2"
-
 babel-plugin-transform-react-remove-prop-types@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
   integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==
 
-babel-plugin-transform-regexp-constructors@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz#58b7775b63afcf33328fae9a5f88fbd4fb0b4965"
-  integrity sha1-WLd3W2OvzzMyj66aX4j71PsLSWU=
-
-babel-plugin-transform-remove-console@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
-  integrity sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A=
-
-babel-plugin-transform-remove-debugger@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz#42b727631c97978e1eb2d199a7aec84a18339ef2"
-  integrity sha1-QrcnYxyXl44estGZp67IShgznvI=
-
-babel-plugin-transform-remove-undefined@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.5.0.tgz#80208b31225766c630c97fa2d288952056ea22dd"
-  integrity sha512-+M7fJYFaEE/M9CXa0/IRkDbiV3wRELzA1kKQFCJ4ifhrzLKn/9VCCgj9OFmYWwBd8IB48YdgPkHYtbYq+4vtHQ==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-
-babel-plugin-transform-simplify-comparison-operators@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz#f62afe096cab0e1f68a2d753fdf283888471ceb9"
-  integrity sha1-9ir+CWyrDh9ootdT/fKDiIRxzrk=
-
-babel-plugin-transform-undefined-to-void@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
-  integrity sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA=
-
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz#cf5feef29551253471cfa82fc8e0f5063df07a77"
@@ -4728,35 +5082,6 @@ babel-preset-jest@^26.6.2:
     babel-plugin-jest-hoist "^26.6.2"
     babel-preset-current-node-syntax "^1.0.0"
 
-"babel-preset-minify@^0.5.0 || 0.6.0-alpha.5":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.5.1.tgz#25f5d0bce36ec818be80338d0e594106e21eaa9f"
-  integrity sha512-1IajDumYOAPYImkHbrKeiN5AKKP9iOmRoO2IPbIuVp0j2iuCcj0n7P260z38siKMZZ+85d3mJZdtW8IgOv+Tzg==
-  dependencies:
-    babel-plugin-minify-builtins "^0.5.0"
-    babel-plugin-minify-constant-folding "^0.5.0"
-    babel-plugin-minify-dead-code-elimination "^0.5.1"
-    babel-plugin-minify-flip-comparisons "^0.4.3"
-    babel-plugin-minify-guarded-expressions "^0.4.4"
-    babel-plugin-minify-infinity "^0.4.3"
-    babel-plugin-minify-mangle-names "^0.5.0"
-    babel-plugin-minify-numeric-literals "^0.4.3"
-    babel-plugin-minify-replace "^0.5.0"
-    babel-plugin-minify-simplify "^0.5.1"
-    babel-plugin-minify-type-constructors "^0.4.3"
-    babel-plugin-transform-inline-consecutive-adds "^0.4.3"
-    babel-plugin-transform-member-expression-literals "^6.9.4"
-    babel-plugin-transform-merge-sibling-variables "^6.9.4"
-    babel-plugin-transform-minify-booleans "^6.9.4"
-    babel-plugin-transform-property-literals "^6.9.4"
-    babel-plugin-transform-regexp-constructors "^0.4.3"
-    babel-plugin-transform-remove-console "^6.9.4"
-    babel-plugin-transform-remove-debugger "^6.9.4"
-    babel-plugin-transform-remove-undefined "^0.5.0"
-    babel-plugin-transform-simplify-comparison-operators "^6.9.4"
-    babel-plugin-transform-undefined-to-void "^6.9.4"
-    lodash "^4.17.11"
-
 babel-preset-react-app@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-10.0.0.tgz#689b60edc705f8a70ce87f47ab0e560a317d7045"
@@ -4836,10 +5161,10 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-better-opn@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-2.0.0.tgz#c70d198e51164bdc220306a28a885d9ac7a14c44"
-  integrity sha512-PPbGRgO/K0LowMHbH/JNvaV3qY3Vt+A2nH28fzJxy16h/DfR5OsVti6ldGl6S9SMsyUqT13sltikiAVtI6tKLA==
+better-opn@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-2.1.1.tgz#94a55b4695dc79288f31d7d0e5f658320759f7c6"
+  integrity sha512-kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==
   dependencies:
     open "^7.0.3"
 
@@ -4979,7 +5304,7 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-boxen@^4.1.0, boxen@^4.2.0:
+boxen@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
   integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==
@@ -5126,6 +5451,17 @@ browserslist@^4.14.5, browserslist@^4.14.7:
     escalade "^3.1.1"
     node-releases "^1.1.66"
 
+browserslist@^4.16.3:
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.4.tgz#7ebf913487f40caf4637b892b268069951c35d58"
+  integrity sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==
+  dependencies:
+    caniuse-lite "^1.0.30001208"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.712"
+    escalade "^3.1.1"
+    node-releases "^1.1.71"
+
 bser@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -5408,6 +5744,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001093, can
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001180.tgz"
   integrity sha512-n8JVqXuZMVSPKiPiypjFtDTXc4jWIdjxull0f92WLo7e1MSi3uJ3NvveakSh/aCl1QKFAvIz3vIj0v+0K+FrXw==
 
+caniuse-lite@^1.0.30001208:
+  version "1.0.30001208"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz#a999014a35cebd4f98c405930a057a0d75352eb9"
+  integrity sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -5415,11 +5756,16 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-case-sensitive-paths-webpack-plugin@2.3.0, case-sensitive-paths-webpack-plugin@^2.2.0:
+case-sensitive-paths-webpack-plugin@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz#23ac613cc9a856e4f88ff8bb73bbb5e989825cf7"
   integrity sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ==
 
+case-sensitive-paths-webpack-plugin@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"
+  integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -5534,7 +5880,7 @@ cheerio@1.0.0-rc.6:
     parse5 "^6.0.1"
     parse5-htmlparser2-tree-adapter "^6.0.1"
 
-"chokidar@>=2.0.0 <4.0.0", chokidar@^3.2.2, chokidar@^3.4.1:
+"chokidar@>=2.0.0 <4.0.0", chokidar@^3.2.2, chokidar@^3.4.1, chokidar@^3.4.2:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
   integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
@@ -5833,6 +6179,11 @@ colorette@^1.2.1:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
   integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
 
+colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
 colornames@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"
@@ -5878,10 +6229,10 @@ commander@^4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+commander@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
+  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
 commander@^7.0.0, commander@^7.1.0:
   version "7.1.0"
@@ -6074,7 +6425,7 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-to-clipboard@^3.0.8:
+copy-to-clipboard@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
   integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
@@ -6097,17 +6448,30 @@ core-js-compat@^3.7.0:
     browserslist "^4.14.7"
     semver "7.0.0"
 
-core-js-pure@^3.0.0, core-js-pure@^3.0.1:
+core-js-compat@^3.8.1, core-js-compat@^3.9.0, core-js-compat@^3.9.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.10.1.tgz#62183a3a77ceeffcc420d907a3e6fc67d9b27f1c"
+  integrity sha512-ZHQTdTPkqvw2CeHiZC970NNJcnwzT6YIueDMASKt+p3WbZsLXOcoD392SkcWhkC0wBBHhlfhqGKKsNCQUozYtg==
+  dependencies:
+    browserslist "^4.16.3"
+    semver "7.0.0"
+
+core-js-pure@^3.0.0:
   version "3.6.5"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
   integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
 
+core-js-pure@^3.8.2:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.10.1.tgz#28642697dfcf02e0fd9f4d9891bd03a22df28ecf"
+  integrity sha512-PeyJH2SE0KuxY5eCGNWA+W+CeDpB6M1PN3S7Am7jSv/Ttuxz2SnWbIiVQOn/TDaGaGtxo8CRWHkXwJscbUHtVw==
+
 core-js@^2.4.0, core-js@^2.6.5:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
-core-js@^3.0.1, core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
+core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz#cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"
   integrity sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==
@@ -6322,7 +6686,7 @@ css-loader@4.3.0:
     schema-utils "^2.7.1"
     semver "^7.3.2"
 
-css-loader@^3.5.3:
+css-loader@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
   integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
@@ -6908,10 +7272,10 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
-detab@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.3.tgz#33e5dd74d230501bd69985a0d2b9a3382699a130"
-  integrity sha512-Up8P0clUVwq0FnFjDclzZsy9PadzRn5FFxrr47tQQvMHqyiFYVbpH8oXDzWtF0Q7pYy3l+RPmtBl+BsFF6wH0A==
+detab@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43"
+  integrity sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==
   dependencies:
     repeat-string "^1.5.4"
 
@@ -7166,7 +7530,7 @@ dotenv-expand@5.1.0, dotenv-expand@^5.1.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
-dotenv-webpack@^1.7.0:
+dotenv-webpack@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.8.0.tgz#7ca79cef2497dd4079d43e81e0796bc9d0f68a5e"
   integrity sha512-o8pq6NLBehtrqA8Jv8jFQNtG9nhRtVqmoD4yWbgUyoU3+9WBlPe+c2EAiaJok9RB28QvrWvdWLZGeTT5aATDMg==
@@ -7218,7 +7582,7 @@ download@^7.1.0:
     p-event "^2.1.0"
     pify "^3.0.0"
 
-downshift@^6.0.6, downshift@^6.1.2:
+downshift@^6.0.15, downshift@^6.1.2:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.1.2.tgz#99d9a03d4da4bf369df766effc3b70f7e789950e"
   integrity sha512-WnPoQ6miic4+uEzPEfqgeen0t5YREOUabMopU/Juo/UYDMZl0ZACkO6ykWCRg48dlEUmEt6zfaJlj1x7kEy78g==
@@ -7261,7 +7625,7 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@3.1.6, ejs@^3.1.2:
+ejs@3.1.6:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a"
   integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==
@@ -7283,12 +7647,10 @@ electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.591:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.607.tgz#1bff13f1cf89f2fee0d244b8c64a7138f80f3a3b"
   integrity sha512-h2SYNaBnlplGS0YyXl8oJWokfcNxVjJANQfMCsQefG6OSuAuNIeW+A8yGT/ci+xRoBb3k2zq1FrOvkgoKBol8g==
 
-element-resize-detector@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.1.tgz#b0305194447a4863155e58f13323a0aef30851d1"
-  integrity sha512-BdFsPepnQr9fznNPF9nF4vQ457U/ZJXQDSNF1zBe7yaga8v9AdZf3/NElYxFdUh7SitSGt040QygiTo6dtatIw==
-  dependencies:
-    batch-processor "1.0.0"
+electron-to-chromium@^1.3.712:
+  version "1.3.717"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.717.tgz#78d4c857070755fb58ab64bcc173db1d51cbc25f"
+  integrity sha512-OfzVPIqD1MkJ7fX+yTl2nKyOE4FReeVfMCzzxQS+Kp43hZYwHwThlGP+EGIZRXJsxCM7dqo8Y65NOX/HP12iXQ==
 
 element-resize-detector@^1.2.2:
   version "1.2.2"
@@ -7345,7 +7707,7 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-emotion-theming@^10.0.19, emotion-theming@^10.0.27:
+emotion-theming@^10.0.27:
   version "10.0.27"
   resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.0.27.tgz#1887baaec15199862c89b1b984b79806f2b9ab10"
   integrity sha512-MlF1yu/gYh8u+sLUqA0YuA9JX0P4Hb69WlKc/9OLo+WCXuX6sy/KoIa+qJimgmr2dWqnypYKYPX37esjDBbhdw==
@@ -7391,6 +7753,15 @@ enhanced-resolve@^4.0.0, enhanced-resolve@^4.3.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
+enhanced-resolve@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
 enquirer@^2.3.5, enquirer@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
@@ -7596,18 +7967,6 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^1.12.0:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
-  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
 escodegen@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
@@ -7882,7 +8241,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.0, estraverse@^4.1.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -8054,7 +8413,7 @@ expect@^26.6.0, expect@^26.6.2:
     jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
 
-express@4.17.1, express@^4.17.0, express@^4.17.1:
+express@4.17.1, express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
@@ -8313,7 +8672,7 @@ file-entry-cache@^6.0.0, file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-loader@6.1.1, file-loader@^6.0.0:
+file-loader@6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.1.tgz#a6f29dfb3f5933a1c350b2dbaa20ac5be0539baa"
   integrity sha512-Klt8C4BjWSXYQAfhpYYkG4qHNTna4toMHEbWrI5IuVoxbU6uiDKeKAP99R8mmbJi3lvewn/jQBOgU4+NS3tDQw==
@@ -8321,6 +8680,14 @@ file-loader@6.1.1, file-loader@^6.0.0:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
+file-loader@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
+  integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
+  dependencies:
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+
 file-system-cache@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/file-system-cache/-/file-system-cache-1.0.5.tgz#84259b36a2bbb8d3d6eb1021d3132ffe64cfff4f"
@@ -8608,7 +8975,7 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-fork-ts-checker-webpack-plugin@4.1.6, fork-ts-checker-webpack-plugin@^4.1.4:
+fork-ts-checker-webpack-plugin@4.1.6, fork-ts-checker-webpack-plugin@^4.1.6:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5"
   integrity sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==
@@ -8621,6 +8988,24 @@ fork-ts-checker-webpack-plugin@4.1.6, fork-ts-checker-webpack-plugin@^4.1.4:
     tapable "^1.0.0"
     worker-rpc "^0.1.0"
 
+fork-ts-checker-webpack-plugin@^6.0.4:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.1.tgz#e3a7e64c90e5490a75d43d86d47f02e538c0a13e"
+  integrity sha512-Pyhn2kav/Y2g6I7aInABgcph/B78jjdXc4kGHzaAUBL4UVthknxM6aMH47JwpnuTJmdOuf6p5vMbIahsBHuWGg==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@types/json-schema" "^7.0.5"
+    chalk "^4.1.0"
+    chokidar "^3.4.2"
+    cosmiconfig "^6.0.0"
+    deepmerge "^4.2.2"
+    fs-extra "^9.0.0"
+    memfs "^3.1.2"
+    minimatch "^3.0.4"
+    schema-utils "2.7.0"
+    semver "^7.3.2"
+    tapable "^1.0.0"
+
 form-data@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
@@ -8732,6 +9117,11 @@ fs-minipass@^2.0.0:
   dependencies:
     minipass "^3.0.0"
 
+fs-monkey@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
+  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -8986,7 +9376,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.3, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.3, glob@^7.1.0, 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==
@@ -9039,7 +9429,7 @@ global-prefix@^3.0.0:
     kind-of "^6.0.2"
     which "^1.3.1"
 
-global@^4.3.2, global@^4.4.0:
+global@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
   integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
@@ -9735,7 +10125,7 @@ html-void-elements@^1.0.0:
   resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483"
   integrity sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==
 
-html-webpack-plugin@4.5.0, html-webpack-plugin@^4.2.1:
+html-webpack-plugin@4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz#625097650886b97ea5dae331c320e3238f6c121c"
   integrity sha512-MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw==
@@ -9750,6 +10140,21 @@ html-webpack-plugin@4.5.0, html-webpack-plugin@^4.2.1:
     tapable "^1.1.3"
     util.promisify "1.0.0"
 
+html-webpack-plugin@^4.0.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz#76fc83fa1a0f12dd5f7da0404a54e2699666bc12"
+  integrity sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==
+  dependencies:
+    "@types/html-minifier-terser" "^5.0.0"
+    "@types/tapable" "^1.0.5"
+    "@types/webpack" "^4.41.8"
+    html-minifier-terser "^5.0.1"
+    loader-utils "^1.2.3"
+    lodash "^4.17.20"
+    pretty-error "^2.1.1"
+    tapable "^1.1.3"
+    util.promisify "1.0.0"
+
 html-whitespace-sensitive-tag-names@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.3.tgz#60325c5bd331048d14ced6bac419c89d76cc9dd8"
@@ -10175,25 +10580,6 @@ inquirer@^6.0.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-inquirer@^7.0.0:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.2.tgz#25245d2e32dc9f33dbe26eeaada231daa66e9c7c"
-  integrity sha512-DF4osh1FM6l0RJc5YWYhSDB6TawiBRlbV9Cox8MWlidU218Tb7fm3lQTULyUJDfJ0tjbzl0W4q651mrCCEM55w==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.16"
-    mute-stream "0.0.8"
-    run-async "^2.4.0"
-    rxjs "^6.6.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-
 inquirer@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.0.0.tgz#957a46db1abcf0fdd2ab82deb7470e90afc7d0ac"
@@ -10230,12 +10616,7 @@ internal-slot@^1.0.2:
     has "^1.0.3"
     side-channel "^1.0.2"
 
-interpret@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
-  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
-
-interpret@^2.0.0, interpret@^2.2.0:
+interpret@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
@@ -10399,6 +10780,13 @@ is-core-module@^2.0.0, is-core-module@^2.1.0:
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -10655,12 +11043,10 @@ is-plain-obj@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
   integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
 
-is-plain-object@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928"
-  integrity sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg==
-  dependencies:
-    isobject "^4.0.0"
+is-plain-object@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b"
+  integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.4:
   version "2.0.4"
@@ -11118,27 +11504,6 @@ jest-get-type@^26.3.0:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
   integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
 
-jest-haste-map@^26.2.2:
-  version "26.2.2"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.2.2.tgz#6d4267b1903854bfdf6a871419f35a82f03ae71e"
-  integrity sha512-3sJlMSt+NHnzCB+0KhJ1Ut4zKJBiJOlbrqEYNdRQGlXTv8kqzZWjUKQRY3pkjmlf+7rYjAV++MQ4D6g4DhAyOg==
-  dependencies:
-    "@jest/types" "^26.2.0"
-    "@types/graceful-fs" "^4.1.2"
-    "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.4"
-    jest-regex-util "^26.0.0"
-    jest-serializer "^26.2.0"
-    jest-util "^26.2.0"
-    jest-worker "^26.2.1"
-    micromatch "^4.0.2"
-    sane "^4.0.3"
-    walker "^1.0.7"
-  optionalDependencies:
-    fsevents "^2.1.2"
-
 jest-haste-map@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
@@ -11367,14 +11732,6 @@ jest-runtime@^26.6.0, jest-runtime@^26.6.3:
     strip-bom "^4.0.0"
     yargs "^15.4.1"
 
-jest-serializer@^26.2.0:
-  version "26.2.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.2.0.tgz#92dcae5666322410f4bf50211dd749274959ddac"
-  integrity sha512-V7snZI9IVmyJEu0Qy0inmuXgnMWDtrsbV2p9CRAcmlmPVwpC2ZM8wXyYpiugDQnwLHx0V4+Pnog9Exb3UO8M6Q==
-  dependencies:
-    "@types/node" "*"
-    graceful-fs "^4.2.4"
-
 jest-serializer@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1"
@@ -11416,18 +11773,6 @@ jest-util@^25.1.0, jest-util@^25.5.0:
     is-ci "^2.0.0"
     make-dir "^3.0.0"
 
-jest-util@^26.2.0:
-  version "26.2.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.2.0.tgz#0597d2a27c559340957609f106c408c17c1d88ac"
-  integrity sha512-YmDwJxLZ1kFxpxPfhSJ0rIkiZOM0PQbRcfH0TzJOhqCisCAsI1WcmoQqO83My9xeVA2k4n+rzg2UuexVKzPpig==
-  dependencies:
-    "@jest/types" "^26.2.0"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.4"
-    is-ci "^2.0.0"
-    micromatch "^4.0.2"
-
 jest-util@^26.6.0, jest-util@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
@@ -11657,13 +12002,20 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.1, json5@^2.1.2:
+json5@^2.1.2:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
   integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
   dependencies:
     minimist "^1.2.5"
 
+json5@^2.1.3:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
+  dependencies:
+    minimist "^1.2.5"
+
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -11970,6 +12322,11 @@ lodash._reinterpolate@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+
 lodash.escaperegexp@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
@@ -12020,7 +12377,7 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.15, "lodash@>=3.5 <5", lodash@>=4.17.15, lodash@^4.0.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.7.0:
+lodash@4.17.15, "lodash@>=3.5 <5", lodash@>=4.17.15, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.7.0:
   version "4.17.19"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
   integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
@@ -12263,11 +12620,6 @@ markdown-to-jsx@^7.1.0:
   resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.1.2.tgz#19d3da4cd8864045cdd13a0d179147fbd6a088d4"
   integrity sha512-O8DMCl32V34RrD+ZHxcAPc2+kYytuDIoQYjY36RVdsLK7uHjgNVvFec4yv0X6LgB4YEZgSvK5QtFi5YVqEpoMA==
 
-material-colors@^1.2.1:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
-  integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
-
 mathml-tag-names@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
@@ -12289,20 +12641,6 @@ mdast-squeeze-paragraphs@^4.0.0:
   dependencies:
     unist-util-remove "^2.0.0"
 
-mdast-util-definitions@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-2.0.1.tgz#2c931d8665a96670639f17f98e32c3afcfee25f3"
-  integrity sha512-Co+DQ6oZlUzvUR7JCpP249PcexxygiaKk9axJh+eRzHDZJk2julbIdKB4PXHVxdBuLzvJ1Izb+YDpj2deGMOuA==
-  dependencies:
-    unist-util-visit "^2.0.0"
-
-mdast-util-definitions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-3.0.1.tgz#06af6c49865fc63d6d7d30125569e2f7ae3d0a86"
-  integrity sha512-BAv2iUm/e6IK/b2/t+Fx69EL/AGcq/IG2S+HxHjDJGfLJtd6i9SZUS76aC9cig+IEucsqxKTR0ot3m933R3iuA==
-  dependencies:
-    unist-util-visit "^2.0.0"
-
 mdast-util-definitions@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2"
@@ -12378,14 +12716,14 @@ mdast-util-phrasing@^2.0.0:
   dependencies:
     unist-util-is "^4.0.0"
 
-mdast-util-to-hast@9.1.2:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-9.1.2.tgz#10fa5ed9d45bf3755891e5801d0f32e2584a9423"
-  integrity sha512-OpkFLBC2VnNAb2FNKcKWu9FMbJhQKog+FCT8nuKmQNIKXyT1n3SIskE7uWDep6x+cA20QXlK5AETHQtYmQmxtQ==
+mdast-util-to-hast@10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb"
+  integrity sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==
   dependencies:
     "@types/mdast" "^3.0.0"
     "@types/unist" "^2.0.0"
-    mdast-util-definitions "^3.0.0"
+    mdast-util-definitions "^4.0.0"
     mdurl "^1.0.0"
     unist-builder "^2.0.0"
     unist-util-generated "^1.0.0"
@@ -12470,6 +12808,13 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
+memfs@^3.1.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.2.tgz#5de461389d596e3f23d48bb7c2afb6161f4df40e"
+  integrity sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==
+  dependencies:
+    fs-monkey "1.0.3"
+
 memoizerific@^1.11.3:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
@@ -12988,10 +13333,10 @@ node-dir@^0.1.10:
   dependencies:
     minimatch "^3.0.2"
 
-node-fetch@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+node-fetch@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
 node-forge@^0.10.0:
   version "0.10.0"
@@ -13059,6 +13404,11 @@ node-releases@^1.1.61, node-releases@^1.1.66:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
   integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
 
+node-releases@^1.1.71:
+  version "1.1.71"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
+  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+
 nodemon@2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.7.tgz#6f030a0a0ebe3ea1ba2a38f71bf9bab4841ced32"
@@ -13490,11 +13840,6 @@ os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-overlayscrollbars@^1.10.2:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.0.tgz#1edb436328133b94877b558f77966d5497ca36a7"
-  integrity sha512-p8oHrMeRAKxXDMPI/EBNITj/zTVHKNnAnM59Im+xnoZUlV07FyTg46wom2286jJlXGGfcPFG/ba5NUiCwWNd4w==
-
 overlayscrollbars@^1.13.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.1.tgz#0b840a88737f43a946b9d87875a2f9e421d0338a"
@@ -14044,13 +14389,6 @@ pnp-webpack-plugin@1.6.4, pnp-webpack-plugin@^1.6.4:
   dependencies:
     ts-pnp "^1.1.6"
 
-polished@^3.4.4:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/polished/-/polished-3.6.5.tgz#dbefdde64c675935ec55119fe2a2ab627ca82e9c"
-  integrity sha512-VwhC9MlhW7O5dg/z7k32dabcAFW1VI2+7fSe8cE/kXcfL7mVdoa5UxciYGW2sJU78ldDLT6+ROEKIZKFNTnUXQ==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-
 polished@^4.0.5:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/polished/-/polished-4.1.1.tgz#40442cc973348e466f2918cdf647531bb6c29bfb"
@@ -14232,7 +14570,7 @@ postcss-env-function@^2.0.2:
     postcss "^7.0.2"
     postcss-values-parser "^2.0.0"
 
-postcss-flexbugs-fixes@4.2.1, postcss-flexbugs-fixes@^4.1.0:
+postcss-flexbugs-fixes@4.2.1, postcss-flexbugs-fixes@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz#9218a65249f30897deab1033aced8578562a6690"
   integrity sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==
@@ -14314,7 +14652,7 @@ postcss-load-config@^2.0.0:
     cosmiconfig "^5.0.0"
     import-cwd "^2.0.0"
 
-postcss-loader@3.0.0, postcss-loader@^3.0.0:
+postcss-loader@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
   integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
@@ -14324,6 +14662,17 @@ postcss-loader@3.0.0, postcss-loader@^3.0.0:
     postcss-load-config "^2.0.0"
     schema-utils "^1.0.0"
 
+postcss-loader@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.2.0.tgz#f6993ea3e0f46600fb3ee49bbd010448123a7db4"
+  integrity sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA==
+  dependencies:
+    cosmiconfig "^7.0.0"
+    klona "^2.0.4"
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+    semver "^7.3.4"
+
 postcss-logical@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5"
@@ -14837,16 +15186,11 @@ prettier-plugin-packagejson@^2.2.10:
   dependencies:
     sort-package-json "1.49.0"
 
-prettier@2.2.1:
+prettier@2.2.1, prettier@~2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
   integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
-prettier@~2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
-  integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
-
 pretty-bytes@^5.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz#cd89f79bbcef21e3d21eb0da68ffe93f803e884b"
@@ -14956,7 +15300,15 @@ prompts@2.4.0, prompts@^2.0.0, prompts@^2.0.1, prompts@^2.3.0:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prompts@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61"
+  integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==
+  dependencies:
+    kleur "^3.0.3"
+    sisteransi "^1.0.5"
+
+prop-types@^15.0.0, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -15095,7 +15447,7 @@ qs@6.7.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
-qs@^6.10.0, qs@^6.6.0:
+qs@^6.10.0:
   version "6.10.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
   integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
@@ -15198,13 +15550,13 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-loader@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.1.tgz#14e1f726a359b68437e183d5a5b7d33a3eba6933"
-  integrity sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==
+raw-loader@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
+  integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==
   dependencies:
     loader-utils "^2.0.0"
-    schema-utils "^2.6.5"
+    schema-utils "^3.0.0"
 
 rc@^1.2.8:
   version "1.2.8"
@@ -15228,18 +15580,6 @@ react-app-polyfill@^2.0.0:
     regenerator-runtime "^0.13.7"
     whatwg-fetch "^3.4.1"
 
-react-color@^2.17.0:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.18.1.tgz#2cda8cc8e06a9e2c52ad391a30ddad31972472f4"
-  integrity sha512-X5XpyJS6ncplZs74ak0JJoqPi+33Nzpv5RYWWxn17bslih+X7OlgmfpmGC1fNvdkK7/SGWYf1JJdn7D2n5gSuQ==
-  dependencies:
-    "@icons/material" "^0.2.4"
-    lodash "^4.17.11"
-    material-colors "^1.2.1"
-    prop-types "^15.5.10"
-    reactcss "^1.2.0"
-    tinycolor2 "^1.4.1"
-
 react-colorful@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.1.0.tgz#45c8044d80bc0e7ee08dc78c760e6694f3745ca2"
@@ -15324,7 +15664,7 @@ react-dom@17.0.2:
     object-assign "^4.1.1"
     scheduler "^0.20.2"
 
-react-draggable@^4.0.3:
+react-draggable@^4.4.3:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3"
   integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==
@@ -15332,43 +15672,36 @@ react-draggable@^4.0.3:
     classnames "^2.2.5"
     prop-types "^15.6.0"
 
-react-element-to-jsx-string@^14.3.1:
-  version "14.3.1"
-  resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-14.3.1.tgz#a08fa6e46eb76061aca7eabc2e70f433583cb203"
-  integrity sha512-LRdQWRB+xcVPOL4PU4RYuTg6dUJ/FNmaQ8ls6w38YbzkbV6Yr5tFNESroub9GiSghtnMq8dQg2LcNN5aMIDzVg==
+react-element-to-jsx-string@^14.3.2:
+  version "14.3.2"
+  resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-14.3.2.tgz#c0000ed54d1f8b4371731b669613f2d4e0f63d5c"
+  integrity sha512-WZbvG72cjLXAxV7VOuSzuHEaI3RHj10DZu8EcKQpkKcAj7+qAkG5XUeSdX5FXrA0vPrlx0QsnAzZEBJwzV0e+w==
   dependencies:
     "@base2/pretty-print-object" "1.0.0"
-    is-plain-object "3.0.0"
+    is-plain-object "3.0.1"
 
 react-error-overlay@^6.0.9:
   version "6.0.9"
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"
   integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==
 
-react-fast-compare@^3.0.1:
+react-fast-compare@^3.0.1, react-fast-compare@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
   integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
 
-react-helmet-async@^1.0.2:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.0.6.tgz#11c15c74e79b3f66670c73779bef3e0e352b1d4e"
-  integrity sha512-t+bhAI4NgxfEv8ez4r77cLfR4O4Z55E/FH2DT+uiE4U7yfWgAk7OAOi7IxHxuYEVLI26bqjZvlVCkpC5/5AoNA==
+react-helmet-async@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.0.9.tgz#5b9ed2059de6b4aab47f769532f9fbcbce16c5ca"
+  integrity sha512-N+iUlo9WR3/u9qGMmP4jiYfaD6pe9IvDTapZLFJz2D3xlTlCM1Bzy4Ab3g72Nbajo/0ZyW+W9hdz8Hbe4l97pQ==
   dependencies:
-    "@babel/runtime" "^7.9.2"
+    "@babel/runtime" "^7.12.5"
     invariant "^2.2.4"
     prop-types "^15.7.2"
-    react-fast-compare "^3.0.1"
+    react-fast-compare "^3.2.0"
     shallowequal "^1.1.0"
 
-react-hotkeys@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-2.0.0.tgz#a7719c7340cbba888b0e9184f806a9ec0ac2c53f"
-  integrity sha512-3n3OU8vLX/pfcJrR3xJ1zlww6KS1kEJt0Whxc4FiGV+MJrQ1mYSYI3qS/11d2MJDFm8IhOXMTFQirfu6AVOF6Q==
-  dependencies:
-    prop-types "^15.6.1"
-
-react-inspector@^5.0.1, react-inspector@^5.1.0:
+react-inspector@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-5.1.0.tgz#45a325e15f33e595be5356ca2d3ceffb7d6b8c3a"
   integrity sha512-JAwswiengIcxi4X/Ssb8nf6suOuQsyit8Fxo04+iPKTnPNY3XIOuagjMZSzpJDDKkYcc/ARlySOYZZv626WUvA==
@@ -15409,6 +15742,11 @@ react-popper@^2.2.4:
     react-fast-compare "^3.0.1"
     warning "^4.0.2"
 
+react-refresh@0.9:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.9.0.tgz#71863337adc3e5c2f8a6bfddd12ae3bfe32aafbf"
+  integrity sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ==
+
 react-refresh@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f"
@@ -15495,16 +15833,6 @@ react-scripts@4.0.3:
   optionalDependencies:
     fsevents "^2.1.3"
 
-react-sizeme@^2.6.7:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-2.6.12.tgz#ed207be5476f4a85bf364e92042520499455453e"
-  integrity sha512-tL4sCgfmvapYRZ1FO2VmBmjPVzzqgHA7kI8lSJ6JS6L78jXFNRdOZFpXyK6P1NBZvKPPCZxReNgzZNUajAerZw==
-  dependencies:
-    element-resize-detector "^1.2.1"
-    invariant "^2.2.4"
-    shallowequal "^1.1.0"
-    throttle-debounce "^2.1.0"
-
 react-sizeme@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-3.0.1.tgz#4d12f4244e0e6a0fb97253e7af0314dc7c83a5a0"
@@ -15515,7 +15843,7 @@ react-sizeme@^3.0.1:
     shallowequal "^1.1.0"
     throttle-debounce "^3.0.1"
 
-react-syntax-highlighter@^13.5.0, react-syntax-highlighter@^13.5.3:
+react-syntax-highlighter@^13.5.3:
   version "13.5.3"
   resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz#9712850f883a3e19eb858cf93fad7bb357eea9c6"
   integrity sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==
@@ -15526,15 +15854,6 @@ react-syntax-highlighter@^13.5.0, react-syntax-highlighter@^13.5.3:
     prismjs "^1.21.0"
     refractor "^3.1.0"
 
-react-textarea-autosize@^8.1.1:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.2.0.tgz#fae38653f5ec172a855fd5fffb39e466d56aebdb"
-  integrity sha512-grajUlVbkx6VdtSxCgzloUIphIZF5bKr21OYMceWPKkniy7H0mRAT/AXPrRtObAe+zUePnNlBwUc4ivVjUGIjw==
-  dependencies:
-    "@babel/runtime" "^7.10.2"
-    use-composed-ref "^1.0.0"
-    use-latest "^1.0.0"
-
 react-textarea-autosize@^8.3.0:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.2.tgz#4f9374d357b0a6f6469956726722549124a1b2db"
@@ -15552,13 +15871,6 @@ react@17.0.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-reactcss@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
-  integrity sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==
-  dependencies:
-    lodash "^4.0.1"
-
 read-chunk@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-3.2.0.tgz#2984afe78ca9bfbbdb74b19387bf9e86289c16ca"
@@ -15675,13 +15987,6 @@ readdirp@~3.5.0:
   dependencies:
     picomatch "^2.2.1"
 
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
-  dependencies:
-    resolve "^1.1.6"
-
 rechoir@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca"
@@ -15884,14 +16189,14 @@ relateurl@^0.2.7:
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
-remark-external-links@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/remark-external-links/-/remark-external-links-6.1.0.tgz#1a545b3cf896eae00ec1732d90f595f75a329abe"
-  integrity sha512-dJr+vhe3wuh1+E9jltQ+efRMqtMDOOnfFkhtoArOmhnBcPQX6THttXMkc/H0kdnAvkXTk7f2QdOYm5qo/sGqdw==
+remark-external-links@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/remark-external-links/-/remark-external-links-8.0.0.tgz#308de69482958b5d1cd3692bc9b725ce0240f345"
+  integrity sha512-5vPSX0kHoSsqtdftSHhIYofVINC8qmp0nctkeU9YoJwV3YfiBRiI6cbFRJ0oI/1F9xS+bopXG0m2KS8VFscuKA==
   dependencies:
     extend "^3.0.0"
     is-absolute-url "^3.0.0"
-    mdast-util-definitions "^2.0.0"
+    mdast-util-definitions "^4.0.0"
     space-separated-tokens "^1.0.0"
     unist-util-visit "^2.0.0"
 
@@ -15908,16 +16213,16 @@ remark-gfm@^1.0.0:
     mdast-util-gfm "^0.1.0"
     micromark-extension-gfm "^0.3.0"
 
-remark-mdx@1.6.21:
-  version "1.6.21"
-  resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.21.tgz#0c1a7e042e50938ff89ad8dd7e8e219d4b0404ce"
-  integrity sha512-IGb3l46a6NFi62egT+WXeTT3T8wYTunmPCEGTfDO6oRAfuss9VAb/3InVCKKGXXoiNi0mTuplI0EFusdCLGk3A==
+remark-mdx@1.6.22:
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd"
+  integrity sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==
   dependencies:
-    "@babel/core" "7.11.6"
+    "@babel/core" "7.12.9"
     "@babel/helper-plugin-utils" "7.10.4"
-    "@babel/plugin-proposal-object-rest-spread" "7.11.0"
-    "@babel/plugin-syntax-jsx" "7.10.4"
-    "@mdx-js/util" "1.6.21"
+    "@babel/plugin-proposal-object-rest-spread" "7.12.1"
+    "@babel/plugin-syntax-jsx" "7.12.1"
+    "@mdx-js/util" "1.6.22"
     is-alphabetical "1.0.4"
     remark-parse "8.0.3"
     unified "9.2.0"
@@ -16173,7 +16478,7 @@ resolve@1.18.1:
     is-core-module "^2.0.0"
     path-parse "^1.0.6"
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.8.1, resolve@^1.9.0:
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.8.1, resolve@^1.9.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
   integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
@@ -16181,6 +16486,14 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13
     is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
+resolve@^1.19.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
 responselike@1.0.2, responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -16338,7 +16651,7 @@ rx@^4.1.0:
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
   integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
 
-rxjs@^6.4.0, rxjs@^6.6.0, rxjs@^6.6.6:
+rxjs@^6.4.0, rxjs@^6.6.6:
   version "6.6.6"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.6.tgz#14d8417aa5a07c5e633995b525e1e3c0dec03b70"
   integrity sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==
@@ -16437,6 +16750,15 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+schema-utils@2.7.0, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
+  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
+  dependencies:
+    "@types/json-schema" "^7.0.4"
+    ajv "^6.12.2"
+    ajv-keywords "^3.4.1"
+
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -16446,15 +16768,6 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
-  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
-  dependencies:
-    "@types/json-schema" "^7.0.4"
-    ajv "^6.12.2"
-    ajv-keywords "^3.4.1"
-
 schema-utils@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
@@ -16541,7 +16854,7 @@ semver@7.3.2:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -16713,15 +17026,6 @@ shell-quote@1.7.2, shell-quote@^1.6.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
-shelljs@^0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
-  integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
@@ -17109,11 +17413,6 @@ store2@^2.12.0:
   resolved "https://registry.yarnpkg.com/store2/-/store2-2.12.0.tgz#e1f1b7e1a59b6083b2596a8d067f6ee88fd4d3cf"
   integrity sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==
 
-store2@^2.7.1:
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/store2/-/store2-2.11.2.tgz#a298e5e97b21b3ce7419b732540bc7c79cb007db"
-  integrity sha512-TQMKs+C6n9idtzLpxluikmDCYiDJrTbbIGn9LFxMg0BVTu+8JZKSlXTWYRpOFKlfKD5HlDWLVpJJyNGZ2e9l1A==
-
 stream-browserify@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -17385,7 +17684,7 @@ strtok3@^6.0.3:
     "@types/debug" "^4.1.5"
     peek-readable "^3.1.0"
 
-style-loader@1.3.0, style-loader@^1.2.1:
+style-loader@1.3.0, style-loader@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e"
   integrity sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==
@@ -17684,20 +17983,6 @@ tar@^6.0.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-telejson@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/telejson/-/telejson-5.0.2.tgz#ed1e64be250cc1c757a53c19e1740b49832b3d51"
-  integrity sha512-XCrDHGbinczsscs8LXFr9jDhvy37yBk9piB7FJrCfxE8oP66WDkolNMpaBkWYgQqB9dQGBGtTDzGQPedc9KJmw==
-  dependencies:
-    "@types/is-function" "^1.0.0"
-    global "^4.4.0"
-    is-function "^1.0.2"
-    is-regex "^1.1.1"
-    is-symbol "^1.0.3"
-    isobject "^4.0.0"
-    lodash "^4.17.19"
-    memoizerific "^1.11.3"
-
 telejson@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/telejson/-/telejson-5.1.0.tgz#cc04e4c2a355f9eb6af557e37acd6449feb1d146"
@@ -17793,7 +18078,7 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^3.0.0:
+terser-webpack-plugin@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.1.0.tgz#91e6d39571460ed240c0cf69d295bcf30ebf98cb"
   integrity sha512-cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA==
@@ -17850,11 +18135,6 @@ throat@^5.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
-throttle-debounce@^2.1.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.2.1.tgz#fbd933ae6793448816f7d5b3cae259d464c98137"
-  integrity sha512-i9hAVld1f+woAiyNGqWelpDD5W1tpMroL3NofTz9xzwq6acWBlO2dC8k5EFSZepU6oOINtV5Q3aSPoRg7o4+fA==
-
 throttle-debounce@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
@@ -17900,11 +18180,6 @@ tiny-emitter@^2.0.0:
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
   integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
 
-tinycolor2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
-  integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
-
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -18256,10 +18531,10 @@ undefsafe@^2.0.3:
   dependencies:
     debug "^2.2.0"
 
-unfetch@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db"
-  integrity sha512-crP/n3eAPUJxZXM9T80/yv0YhkTEx2K1D3h7D1AJM6fzsWZrxdyRuLN0JH/dkZh1LNH8LxCnBzoPFCPbb2iGpg==
+unfetch@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
+  integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
 
 unherit@^1.0.4:
   version "1.1.3"
@@ -18510,7 +18785,7 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-loader@4.1.1, url-loader@^4.0.0:
+url-loader@4.1.1, url-loader@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2"
   integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==
@@ -18653,7 +18928,7 @@ uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2, uuid@^3.4.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^8.0.0, uuid@^8.3.0:
+uuid@^8.3.0:
   version "8.3.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
   integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
@@ -18841,7 +19116,7 @@ webpack-cli@^4.6.0:
     v8-compile-cache "^2.2.0"
     webpack-merge "^5.7.3"
 
-webpack-dev-middleware@^3.7.0, webpack-dev-middleware@^3.7.2:
+webpack-dev-middleware@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
   integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
@@ -18852,6 +19127,17 @@ webpack-dev-middleware@^3.7.0, webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
+webpack-dev-middleware@^3.7.3:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
+  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
+  dependencies:
+    memory-fs "^0.4.1"
+    mime "^2.4.4"
+    mkdirp "^0.5.1"
+    range-parser "^1.2.1"
+    webpack-log "^2.0.0"
+
 webpack-dev-server@3.11.1:
   version "3.11.1"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.1.tgz#c74028bf5ba8885aaf230e48a20e8936ab8511f0"
@@ -18962,6 +19248,35 @@ webpack-virtual-modules@^0.2.2:
   dependencies:
     debug "^3.0.0"
 
+webpack@4:
+  version "4.46.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
+  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.0"
+    "@webassemblyjs/wasm-edit" "1.9.0"
+    "@webassemblyjs/wasm-parser" "1.9.0"
+    acorn "^6.4.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.5.0"
+    eslint-scope "^4.0.3"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.3"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.3"
+    watchpack "^1.7.4"
+    webpack-sources "^1.4.1"
+
 webpack@4.44.2, webpack@^4.44.2:
   version "4.44.2"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"

From f414a9bb043e63f59178ec07f9d15ec43c0945e2 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Wed, 14 Apr 2021 18:23:34 -0400
Subject: [PATCH 180/288] don't double-encode the query string when redirecting
 (#3502)

Fixes #3425
---
 deployer/aws-lambda/content-origin-request/index.js | 13 ++++++++++++-
 .../content-origin-request/server.test.js           |  9 ++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/deployer/aws-lambda/content-origin-request/index.js b/deployer/aws-lambda/content-origin-request/index.js
index 79ba52eb3ee4..c02d0a732f73 100644
--- a/deployer/aws-lambda/content-origin-request/index.js
+++ b/deployer/aws-lambda/content-origin-request/index.js
@@ -49,6 +49,17 @@ function redirect(location, { status = 302, cacheControlSeconds = 0 } = {}) {
   } else {
     cacheControlValue = "no-store";
   }
+  // We need to URL encode the pathname, but leave the query string as is.
+  // Suppose the old URL was `/search?q=text%2Dshadow` and all we need to do
+  // is to inject the locale to that URL, we should not URL encode the whole
+  // new URL otherwise you'd end up with `/en-US/search?q=text%252Dshadow`
+  // since the already encoded `%2D` would become `%252D` which is wrong and
+  // different.
+  const [pathname, querystring] = location.split("?", 2);
+  let newLocation = encodeURI(pathname);
+  if (querystring) {
+    newLocation += `?${querystring}`;
+  }
   return {
     status,
     statusDescription,
@@ -56,7 +67,7 @@ function redirect(location, { status = 302, cacheControlSeconds = 0 } = {}) {
       location: [
         {
           key: "Location",
-          value: encodeURI(location),
+          value: newLocation,
         },
       ],
       "cache-control": [
diff --git a/deployer/aws-lambda/content-origin-request/server.test.js b/deployer/aws-lambda/content-origin-request/server.test.js
index 0f93938438fd..39d8e74474dd 100644
--- a/deployer/aws-lambda/content-origin-request/server.test.js
+++ b/deployer/aws-lambda/content-origin-request/server.test.js
@@ -25,12 +25,19 @@ describe("root URL redirects", () => {
     expect(r.headers["location"]).toBe("/en-US/");
   });
 
-  it("should preserve the query string", async () => {
+  it("should preserve the basic query string", async () => {
     const r = await get("/?foo=bar");
     expect(r.statusCode).toBe(302);
     expect(r.headers["location"]).toBe("/en-US/?foo=bar");
   });
 
+  it("should preserve the query string and not encode it twice", async () => {
+    // This test is based on https://github.com/mdn/yari/issues/3425
+    const r = await get("/?q=text%2Dshadow");
+    expect(r.statusCode).toBe(302);
+    expect(r.headers["location"]).toBe("/en-US/?q=text%2Dshadow");
+  });
+
   it("should redirect with a trailing slash when cased correctly", async () => {
     const r = await get("/en-US");
     expect(r.statusCode).toBe(302);

From d95e03f0899628449771ed6d830837382c834ef3 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Wed, 14 Apr 2021 18:28:31 -0400
Subject: [PATCH 181/288] Use Elasticsearch index aliases to avoid search
 downtime (#3409)

* Use ElasticSearch index aliases to avoid search downtime

Fixes #3098

* Use ElasticSearch index aliases to avoid search downtime

Part of #3098

(the reason this PR doesn't close issue #3098) is because the `prod-build.yml` still uses `--update`)

* flake8

* Apply suggestions from code review

Co-authored-by: Ryan Johnson <escattone@gmail.com>

* remove 'already'

* feedbacked

* cleaning up

* cope with --update the first time ever

* Apply suggestions from code review

Co-authored-by: Ryan Johnson <escattone@gmail.com>

* feedbacked

Co-authored-by: Ryan Johnson <escattone@gmail.com>
---
 .github/workflows/prod-build.yml         |  11 +-
 .github/workflows/stage-build.yml        |  11 +-
 deployer/README.md                       |  44 ++++---
 deployer/src/deployer/main.py            |   7 --
 deployer/src/deployer/search/__init__.py | 147 +++++++++++++++--------
 deployer/src/deployer/search/models.py   |  12 +-
 6 files changed, 136 insertions(+), 96 deletions(-)

diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
index ee42d1fc7ad2..c7d3268ddcbf 100644
--- a/.github/workflows/prod-build.yml
+++ b/.github/workflows/prod-build.yml
@@ -231,16 +231,7 @@ jobs:
           # poetry run deployer upload --prune --archived-files ../content/archived.txt ../client/build
           poetry run deployer upload ../client/build
           poetry run deployer update-lambda-functions ./aws-lambda
-
-          # TODO: Depending on how long the upload takes, consider switching to
-          # use `--update` in this command. It will skip the index re-creation
-          # and "cake on". This is slightly faster and means no window of time
-          # where the Elasticsearch server is nearly empty.
-          # Consider doing something like a clean indexing on Sundays and
-          # use `--update` on all the other week days.
-          # poetry run deployer search-index ../client/build --priority-prefix=en-us/docs/web
-          # TEMPORARY
-          poetry run deployer search-index ../client/build --update
+          poetry run deployer search-index ../client/build
 
           # Record the deployment in our Speedcurve account. This should always
           # be done after the upload of the documents and Lambda functions, as well
diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
index dcb1f416bb3c..f2d22cd80015 100644
--- a/.github/workflows/stage-build.yml
+++ b/.github/workflows/stage-build.yml
@@ -237,16 +237,7 @@ jobs:
           # poetry run deployer upload --prune --archived-files ../content/archived.txt ../client/build
           poetry run deployer upload ../client/build
           poetry run deployer update-lambda-functions ./aws-lambda
-
-          # TODO: Depending on how long the upload takes, consider switching to
-          # use `--update` in this command. It will skip the index re-creation
-          # and "cake on". This is slightly faster and means no window of time
-          # where the Elasticsearch server is nearly empty.
-          # Consider doing something like a clean indexing on Sundays and
-          # use `--update` on all the other week days.
-          # poetry run deployer search-index ../client/build --priority-prefix=en-us/docs/web
-          # TEMPORARY
-          poetry run deployer search-index ../client/build --update
+          poetry run deployer search-index ../client/build
 
           # Record the deployment in our Speedcurve account. This should always
           # be done after the upload of the documents and Lambda functions, as well
diff --git a/deployer/README.md b/deployer/README.md
index 7cedfde95fe2..9fd00e7ab7de 100644
--- a/deployer/README.md
+++ b/deployer/README.md
@@ -131,6 +131,30 @@ This is to make it convenient in GitHub Actions to control the
 execution purely based on the presence of the
 environment variable.
 
+### About Elasticsearch aliases
+
+The default behavior is that each day you get a different index name.
+E.g. `mdn_docs_20210331093714`. And then there's an alias with a more "generic" name.
+E.g. `mdn_docs`. It's the alias name that Kuma uses to send search queries to.
+
+The way indexing works is that we leave the existing index and its alias in place,
+then we fill up a new index and once that works, we atomically "move the alias" and
+delete the old index. To demonstrate, consider this example timeline:
+
+- Yesterday: index `mdn_docs_20210330093714` and `mdn_docs --> mdn_docs_20210330093714`
+- Today:
+  - create new index `mdn_docs_20210331094500`
+  - populate `mdn_docs_20210331094500` (could take a long time)
+  - atomically re-assign alias `mdn_docs --> mdn_docs_20210331094500` and delete old index `mdn_docs_20210330093714`
+  - delete old index `mdn_docs_20210330`
+
+Note, this only applies if you _don't_ use `--update`.
+If you use `--update` it will just keep adding to the existing index whose
+name is based on today's date.
+
+What this means it that **there is zero downtime for the search queries**. Nothing
+needs to be reconfigured on the Kuma side.
+
 ### To update or not start a fresh
 
 The default behavior is that it deletes the index first and immediately creates
@@ -148,26 +172,6 @@ only from time to time omit it for a fresh new start.
 But note, if you omit the `--update` (i.e. recreating the index), search
 will work. It just may find less that it finds when it's fully indexed.
 
-### Priority prefixes
-
-When you index without `--update` it will delete and recreate the index.
-That means that during the time you're indexing, the searches that are happening
-concurrently will not find much. That's probably OK in most cases but you
-can adjust the priority of what gets indexed first. This has the advantage
-that most searches, that are expecting to find content in the popular document,
-will get something useful while the indexing is going on.
-
-To set up one or multiple priority prefixes use the `--priority-prefixes`
-(or just `-p` for short). Best described with an example:
-
-```sh
-poetry run deployer search-index ../client/build -p en-us/docs/web -p en-us/docs
-```
-
-This will first index all the files whose `index.json` file path (relative
-to the root) matches `en-us/docs/web`. Then it does all that match `en-us/docs`.
-And lastly, it does all the files that don't match any of the prefixes.
-
 ## Analyze PR builds
 
 When you've built files you can analyze those built files to produce a Markdown
diff --git a/deployer/src/deployer/main.py b/deployer/src/deployer/main.py
index 04f3052c4913..4659859641ed 100644
--- a/deployer/src/deployer/main.py
+++ b/deployer/src/deployer/main.py
@@ -337,12 +337,6 @@ def speedcurve_deploy(ctx, **kwargs):
     default=CI,
     show_default=True,
 )
-@click.option(
-    "--priority-prefix",
-    "-p",
-    multiple=True,
-    help="Specific folder prefixes to index first.",
-)
 @click.argument("buildroot", type=click.Path(), callback=validate_directory)
 @click.pass_context
 def search_index(ctx, buildroot: Path, **kwargs):
@@ -360,7 +354,6 @@ def search_index(ctx, buildroot: Path, **kwargs):
         url,
         update=kwargs["update"],
         no_progressbar=kwargs["no_progressbar"],
-        priority_prefixes=kwargs["priority_prefix"],
     )
 
 
diff --git a/deployer/src/deployer/search/__init__.py b/deployer/src/deployer/search/__init__.py
index b25047d68a1f..4c6be2e0e28a 100644
--- a/deployer/src/deployer/search/__init__.py
+++ b/deployer/src/deployer/search/__init__.py
@@ -2,14 +2,19 @@
 import re
 import time
 from pathlib import Path
-from collections import defaultdict, Counter
+from collections import Counter
 
 import click
 from elasticsearch.helpers import streaming_bulk
+from elasticsearch_dsl import Index
 from elasticsearch_dsl.connections import connections
 from selectolax.parser import HTMLParser
 
-from .models import Document
+from .models import Document, INDEX_ALIAS_NAME
+
+
+class IndexAliasError(Exception):
+    """When there's something wrong with finding the index alias."""
 
 
 def index(
@@ -17,7 +22,6 @@ def index(
     url: str,
     update=False,
     no_progressbar=False,
-    priority_prefixes: (str) = (),
 ):
     # We can confidently use a single host here because we're not searching
     # a cluster.
@@ -34,48 +38,51 @@ def index(
 
     click.echo(f"Found {count_todo:,} (potential) documents to index")
 
-    # Confusingly, `._index` is actually not a private API.
-    # It's the documented way you're supposed to reach it.
-    document_index = Document._index
-    if not update:
+    if update:
+        index_name = None
+        has_old_index = False
+        for name in connection.indices.get_alias():
+            if name.startswith("mdn_docs_"):
+                index_name = name
+                break
+            elif name == INDEX_ALIAS_NAME:
+                has_old_index = True
+        else:
+            if not has_old_index:
+                raise IndexAliasError("Unable to find an index called mdn_docs_*")
+
+        document_index = Index(index_name)
+    else:
+        # Confusingly, `._index` is actually not a private API.
+        # It's the documented way you're supposed to reach it.
+        document_index = Document._index
         click.echo(
             "Deleting any possible existing index "
-            f"and creating a new one called {document_index._name}"
+            f"and creating a new one called {document_index._name!r}"
         )
         document_index.delete(ignore=404)
         document_index.create()
 
-    search_prefixes = [None]
-    for prefix in reversed(priority_prefixes):
-        search_prefixes.insert(0, prefix)
-
-    count_by_prefix = defaultdict(int)
-
-    already = set()
-
     skipped = []
 
     def generator():
-        for prefix in search_prefixes:
-            root = Path(buildroot)
-            if prefix:
-                root /= prefix
-            for doc in walk(root):
-                if doc in already:
-                    continue
-                already.add(doc)
-                search_doc = to_search(doc)
-                if search_doc:
-                    count_by_prefix[prefix] += 1
-                    yield search_doc.to_dict(True)
-                else:
-                    # The reason something might be chosen to be skipped is because
-                    # there's logic that kicks in only when the `index.json` file
-                    # has been opened and parsed.
-                    # Keep a count of all of these. It's used to make sure the
-                    # progressbar, if used, ticks as many times as the estimate
-                    # count was.
-                    skipped.append(1)
+        root = Path(buildroot)
+        for doc in walk(root):
+            # The reason for specifying the exact index name is that we might
+            # be doing an update and if you don't specify it, elasticsearch_dsl
+            # will fall back to using whatever Document._meta.Index automatically
+            # becomes in this moment.
+            search_doc = to_search(doc, _index=document_index._name)
+            if search_doc:
+                yield search_doc.to_dict(True)
+            else:
+                # The reason something might be chosen to be skipped is because
+                # there's logic that kicks in only when the `index.json` file
+                # has been opened and parsed.
+                # Keep a count of all of these. It's used to make sure the
+                # progressbar, if used, ticks as many times as the estimate
+                # count was.
+                skipped.append(1)
 
     def get_progressbar():
         if no_progressbar:
@@ -90,7 +97,6 @@ def get_progressbar():
         for success, info in streaming_bulk(
             connection,
             generator(),
-            index=document_index._name,
             # It's an inexact science as to what the perfect chunk_size should be.
             # The default according to
             # https://elasticsearch-py.readthedocs.io/en/v7.12.0/helpers.html#elasticsearch.helpers.streaming_bulk
@@ -122,6 +128,56 @@ def get_progressbar():
         for skip in skipped:
             bar.update(1)
 
+    # Now when the index has been filled, we need to make sure we
+    # correct any previous indexes.
+    if update:
+        # When you do an update, Elasticsearch will internally delete the
+        # previous docs (based on the _id primary key we set).
+        # Normally, Elasticsearch will do this when you restart the cluster
+        # but that's not something we usually do.
+        # See https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-forcemerge.html
+        if not has_old_index:
+            document_index.forcemerge()
+    else:
+        # (Apr 2021) In the olden days, before using aliases, we used to call
+        # the index what is today the index. We have to delete that index
+        # to make for using that name as the alias.
+        # This code can be deleted any time after it's been useful once
+        # in all deployments.
+        legacy_index = Index(INDEX_ALIAS_NAME)
+        if legacy_index.exists():
+            # But `.exists()` will be true if it's an alias as well! It basically
+            # answers: "Yes, it's an index or an alias".
+            # We only want to delete it if it's an index. The test for that
+            # is to see if it does *not* have an alias.
+            if (
+                INDEX_ALIAS_NAME in legacy_index.get_alias()
+                and not legacy_index.get_alias()[INDEX_ALIAS_NAME]["aliases"]
+            ):
+                click.echo(
+                    f"Delete the old {INDEX_ALIAS_NAME!r} index from when it was "
+                    "an actual index."
+                )
+                legacy_index.delete(ignore=404)
+
+        # Now we're going to bundle the change to set the alias to point
+        # to the new index and delete all old indexes.
+        # The reason for doing this together in one update is to make it atomic.
+        alias_updates = [
+            {"add": {"index": document_index._name, "alias": INDEX_ALIAS_NAME}}
+        ]
+        for index_name in connection.indices.get_alias():
+            if index_name.startswith("mdn_docs_"):
+                if index_name != document_index._name:
+                    alias_updates.append({"remove_index": {"index": index_name}})
+                    click.echo(f"Delete old index {index_name!r}")
+
+        connection.indices.update_aliases({"actions": alias_updates})
+        click.echo(
+            f"Reassign the {INDEX_ALIAS_NAME!r} alias from old index "
+            f"to {document_index._name}"
+        )
+
     t1 = time.time()
     took = t1 - t0
     rate = count_done / took
@@ -139,15 +195,6 @@ def get_progressbar():
         for error, count in errors_counter.most_common():
             click.echo(f"{count:,}\t{error[:80]}")
 
-    if priority_prefixes:
-        click.echo("Counts per priority prefixes:")
-        rest = sum(v for v in count_by_prefix.values())
-        for prefix in priority_prefixes:
-            click.echo(f"\t{prefix:<30} {count_by_prefix[prefix]:,}")
-            rest -= count_by_prefix[prefix]
-        prefix = "*rest*"
-        click.echo(f"\t{prefix:<30} {rest:,}")
-
 
 class VoidProgressBar:
     def __enter__(self):
@@ -184,7 +231,7 @@ def walk(root):
             yield path
 
 
-def to_search(file):
+def to_search(file, _index=None):
     with open(file) as f:
         data = json.load(f)
     if "doc" not in data:
@@ -207,7 +254,8 @@ def to_search(file):
         # files.
         return
     locale = locale[1:]
-    return Document(
+    d = Document(
+        _index=_index,
         _id=doc["mdn_url"],
         title=doc["title"],
         # This is confusing. But it's worth hacking around for now until
@@ -268,6 +316,9 @@ def to_search(file):
         slug=slug.lower(),
         locale=locale.lower(),
     )
+    # print(dir(d))
+    # raise Exception
+    return d
 
 
 _display_none_regex = re.compile(r"display:\s*none")
diff --git a/deployer/src/deployer/search/models.py b/deployer/src/deployer/search/models.py
index 980f76d04f7a..fc5f5b51d447 100644
--- a/deployer/src/deployer/search/models.py
+++ b/deployer/src/deployer/search/models.py
@@ -1,3 +1,5 @@
+import datetime
+
 from elasticsearch_dsl import (
     Boolean,
     Document as ESDocument,
@@ -9,6 +11,12 @@
     char_filter,
 )
 
+# Note, this is the name that the Kuma code will use when sending Elasticsearch
+# search queries.
+# We always build an index that is called something based on this name but with
+# the _YYYYMMDDHHMMSS date suffix.
+INDEX_ALIAS_NAME = "mdn_docs"
+
 """
 A great way to debug analyzers is with the `Document._index.analyze()` API which
 is a convenient abstraction for the Elasticsearch Analyze API
@@ -172,4 +180,6 @@ class Document(ESDocument):
     popularity = Float()
 
     class Index:
-        name = "mdn_docs"
+        name = (
+            f'{INDEX_ALIAS_NAME}_{datetime.datetime.utcnow().strftime("%Y%m%d%H%M%S")}'
+        )

From 8f91bd9117d482ee6bde56d5e081b0734978aa85 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Apr 2021 05:49:32 +0000
Subject: [PATCH 182/288] build(deps-dev): bump react-refresh from 0.9.0 to
 0.10.0 (#3521)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3643609dde6f..53d1c8830284 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-is": "^17.0.2",
-    "react-refresh": "0.9",
+    "react-refresh": "0.10",
     "react-router": "6.0.0-beta.0",
     "react-router-dom": "6.0.0-beta.0",
     "react-scripts": "4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 7e935ccaa3bf..f61e6f9e8247 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15742,10 +15742,10 @@ react-popper@^2.2.4:
     react-fast-compare "^3.0.1"
     warning "^4.0.2"
 
-react-refresh@0.9:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.9.0.tgz#71863337adc3e5c2f8a6bfddd12ae3bfe32aafbf"
-  integrity sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ==
+react-refresh@0.10:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.10.0.tgz#2f536c9660c0b9b1d500684d9e52a65e7404f7e3"
+  integrity sha512-PgidR3wST3dDYKr6b4pJoqQFpPGNKDSCDx4cZoshjXipw3LzO7mG1My2pwEzz2JVkF+inx3xRpDeQLFQGH/hsQ==
 
 react-refresh@^0.8.3:
   version "0.8.3"

From bc45f571480fd79701ab755767f7c0417dc98a96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Apr 2021 05:50:22 +0000
Subject: [PATCH 183/288] build(deps): bump http-proxy-middleware from 1.1.1 to
 1.1.2 (#3522)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 53d1c8830284..a96c7b2adced 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "hast-util-is-element": "^1.1.0",
     "hast-util-to-html": "^7.1.2",
     "hast-util-to-text": "^2.0.1",
-    "http-proxy-middleware": "1.1.1",
+    "http-proxy-middleware": "1.1.2",
     "image-size": "0.9.7",
     "image-type": "4.1.0",
     "imagemin": "7.0.1",
diff --git a/yarn.lock b/yarn.lock
index f61e6f9e8247..af403a449a2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10244,10 +10244,10 @@ http-proxy-middleware@0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
-http-proxy-middleware@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.1.1.tgz#48900a68cd9d388c735d1dd97302c919b7e94a13"
-  integrity sha512-FIDg9zPvOwMhQ3XKB2+vdxK6WWbVAH7s5QpqQCif7a1TNL76GNAATWA1sy6q2gSfss8UJ/Nwza3N6QnFkKclpA==
+http-proxy-middleware@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.1.2.tgz#38d062ce4182b2931442efc2d9a0c429cab634f8"
+  integrity sha512-YRFUeOG3q85FJjAaYVJUoNRW9a73SDlOtAyQOS5PHLr18QeZ/vEhxywNoOPiEO8BxCegz4RXzTHcvyLEGB78UA==
   dependencies:
     "@types/http-proxy" "^1.17.5"
     http-proxy "^1.18.1"

From bdcf022b95349a9e67966470df0fbd07013276cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Apr 2021 05:52:47 +0000
Subject: [PATCH 184/288] build(deps): bump js-yaml from 4.0.0 to 4.1.0 (#3523)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a96c7b2adced..c08dcb62c14a 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "imagemin-svgo": "9.0.0",
     "inquirer": "^8.0.0",
     "is-svg": "4.2.2",
-    "js-yaml": "4.0.0",
+    "js-yaml": "4.1.0",
     "loglevel": "^1.7.1",
     "lru-cache": "^6.0.0",
     "mdn-data": "2.0.17",
diff --git a/yarn.lock b/yarn.lock
index af403a449a2e..82f2d8a97db0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11868,10 +11868,10 @@ js-string-escape@^1.0.1:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
-  integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
+js-yaml@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
     argparse "^2.0.1"
 

From f2feb19e7c84d393c4db89b5a1e6bd0ef6833bc3 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 15 Apr 2021 11:18:14 -0400
Subject: [PATCH 185/288] include preferredlocale in 'Change language' event
 (#3520)

Part of #3519
---
 .../src/ui/molecules/language-menu/index.tsx  |  5 +++-
 .../0002_language-preferredcookie-before.md   | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 docs/experiments/0002_language-preferredcookie-before.md

diff --git a/client/src/ui/molecules/language-menu/index.tsx b/client/src/ui/molecules/language-menu/index.tsx
index 9d977d36b275..89a5c3a0d94e 100644
--- a/client/src/ui/molecules/language-menu/index.tsx
+++ b/client/src/ui/molecules/language-menu/index.tsx
@@ -36,6 +36,7 @@ export function LanguageMenu({
         // don't bother redirecting.
         if (preferredLocale !== locale) {
           const localeURL = translateURL(preferredLocale);
+          const cookieValueBefore = document.cookie;
           for (const translation of translations) {
             if (translation.locale === preferredLocale) {
               let cookieValue = `${PREFERRED_LOCALE_COOKIE_NAME}=${
@@ -51,7 +52,9 @@ export function LanguageMenu({
           ga("send", {
             hitType: "event",
             eventCategory: "Language",
-            eventAction: "Change preferred language",
+            eventAction: `Change preferred language (cookie before: ${
+              cookieValueBefore || "none"
+            })`,
             eventLabel: `${window.location.pathname} to ${localeURL}`,
           });
 
diff --git a/docs/experiments/0002_language-preferredcookie-before.md b/docs/experiments/0002_language-preferredcookie-before.md
new file mode 100644
index 000000000000..dd10c6c191ba
--- /dev/null
+++ b/docs/experiments/0002_language-preferredcookie-before.md
@@ -0,0 +1,28 @@
+# Experiment: Change language with or without a `preferredlocale` cookie before
+
+## Issue
+
+<https://github.com/mdn/yari/issues/3519>
+
+## Overview
+
+When someone changes the document language on the document-footer, we record
+a GA event. But unfortunately we don't know, at that event, if they already
+had a cookie before.
+
+## Start date
+
+April 15 2021.
+
+## End date
+
+June 1 2021.
+
+## Details
+
+We just need to change the existing event action `Change preferred language`
+to mention what value for the cookie they _had_.
+
+## Analysis
+
+Look at Google Analytics Events under `Language`.

From be9ebbd64b18a86ffa0c3fa4901f082328503b26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Apr 2021 15:32:06 +0000
Subject: [PATCH 186/288] build(deps-dev): bump @mdn/minimalist from 0.8.0 to
 0.8.1 (#3527)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c08dcb62c14a..8d8882b1e4c4 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
   "devDependencies": {
     "@babel/core": "^7.13.15",
     "@mdn/dinocons": "^0.3.1",
-    "@mdn/minimalist": "^0.8.0",
+    "@mdn/minimalist": "^0.8.1",
     "@storybook/addon-a11y": "^6.2.8",
     "@storybook/addon-actions": "^6.2.8",
     "@storybook/addon-essentials": "^6.2.8",
diff --git a/yarn.lock b/yarn.lock
index 82f2d8a97db0..cbe58f64e949 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2464,10 +2464,10 @@
   resolved "https://registry.yarnpkg.com/@mdn/dinocons/-/dinocons-0.3.1.tgz#c614d5ec2a42bf2ce55a71a0ca5272641a90bee3"
   integrity sha512-K35LQ2fRgAwXptQ87+N/nnm5fADV6vfYsOhhubbJh1xPQGtnXxUlihrA+CeGq2a/gH6kdC6QuDz0hyra/0Bq2Q==
 
-"@mdn/minimalist@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@mdn/minimalist/-/minimalist-0.8.0.tgz#e466fc2f7820eeb00dca1f4b41412f1a7ddf2d4b"
-  integrity sha512-VHKjKieSaXRtnm2UGX85TRUmCQNfRGQrhLATZLNzhfq8JizwFETDM0eNxGI+qPbMGG12Lbx6EAlbjdXT61/axQ==
+"@mdn/minimalist@^0.8.1":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@mdn/minimalist/-/minimalist-0.8.1.tgz#371c0bf78f2969d47e93297b401f49a531aa66de"
+  integrity sha512-+C1f7zJCUt+FO2ajXPan22/r7BKncOLVKbwtobxpL8aEYp0WygmbdF0ejHRucZOPchJMoB38+Xd82+PxfXaMvg==
 
 "@mdx-js/loader@^1.6.22":
   version "1.6.22"

From 1cefcc1fe35a26e8deeb2cc4bdfcf6ea89f047a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Apr 2021 16:19:59 +0000
Subject: [PATCH 187/288] build(deps): bump image-size from 0.9.7 to 1.0.0
 (#3525)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8d8882b1e4c4..61955fe9aa4c 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "hast-util-to-html": "^7.1.2",
     "hast-util-to-text": "^2.0.1",
     "http-proxy-middleware": "1.1.2",
-    "image-size": "0.9.7",
+    "image-size": "1.0.0",
     "image-type": "4.1.0",
     "imagemin": "7.0.1",
     "imagemin-gifsicle": "7.0.0",
diff --git a/yarn.lock b/yarn.lock
index cbe58f64e949..14ff632d2e1e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10371,10 +10371,10 @@ ignore@^5.0.0, ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
-image-size@0.9.7:
-  version "0.9.7"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.9.7.tgz#43b4ead4b1310d5ae310a559d52935a347e47c09"
-  integrity sha512-KRVgLNZkr00YGN0qn9MlIrmlxbRhsCcEb1Byq3WKGnIV4M48iD185cprRtaoK4t5iC+ym2Q5qlArxZ/V1yzDgA==
+image-size@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.0.tgz#58b31fe4743b1cec0a0ac26f5c914d3c5b2f0750"
+  integrity sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==
   dependencies:
     queue "6.0.2"
 

From 20212f8e634b8eddbec630964b4e3878949d496e Mon Sep 17 00:00:00 2001
From: Schalk Neethling <sneethling@mozilla.com>
Date: Thu, 15 Apr 2021 19:55:58 +0200
Subject: [PATCH 188/288] fix: improve AvailableInWorkers macro (#3530)

* fix: improve AvailableInWorkers macro

Allow an optional string to be passed to `AvailableInWorkers`.
Collapse `AvailableInWorkers` to a single macro as opposed to a combination of 4

Fix #2849

* add empty EOL

* add space directly to output
---
 kumascript/macros/AvailableInWorkers.ejs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/kumascript/macros/AvailableInWorkers.ejs b/kumascript/macros/AvailableInWorkers.ejs
index c55f7577b548..19d33fe16300 100644
--- a/kumascript/macros/AvailableInWorkers.ejs
+++ b/kumascript/macros/AvailableInWorkers.ejs
@@ -1,7 +1,17 @@
 <%
 var locale = env.locale;
 
-var text = mdn.localString({
+var note = mdn.localString({
+    "en-US": "Note:",
+    "de": "Hinweis:",
+    "es": "Nota:",
+    "fr": "Note:",
+    "ja": "注:",
+    "ko": "주의:",
+    "ru": "Примечание:",
+});
+
+var defaultText = mdn.localString({
   "en-US": "This feature is available in <a href=\"/" + locale + "/docs/Web/API/Web_Workers_API\">Web Workers</a>.",
   "zh-CN": "此特性在 <a href=\"/" + locale + "/docs/Web/API/Web_Workers_API\">Web Worker</a> 中可用。",
   "de": "Dieses Feature ist in <a href=\"/" + locale + "/docs/Web/API/Web_Workers_API\">Web Workers</a> verfügbar.",
@@ -12,5 +22,10 @@ var text = mdn.localString({
   "ru": "Эта возможность доступна в <a href=\"/ru/docs/Web/API/Web_Workers_API\">Web Workers</a>."
 });
 
+var text = $0 || defaultText;
+
 %>
-<%- await template("Note", [text]) %>
+
+<div class="notecard note">
+  <p><strong><%- note %></strong> <%- text %></p>
+</div>

From b5d12d91ebda2cf031371ca1d7b9656788b5850b Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 15 Apr 2021 19:41:21 -0400
Subject: [PATCH 189/288] switch to parallel_bulk() (#3426)

Fixes #3417
---
 deployer/src/deployer/search/__init__.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/deployer/src/deployer/search/__init__.py b/deployer/src/deployer/search/__init__.py
index 4c6be2e0e28a..c1e405201a78 100644
--- a/deployer/src/deployer/search/__init__.py
+++ b/deployer/src/deployer/search/__init__.py
@@ -5,7 +5,7 @@
 from collections import Counter
 
 import click
-from elasticsearch.helpers import streaming_bulk
+from elasticsearch.helpers import parallel_bulk
 from elasticsearch_dsl import Index
 from elasticsearch_dsl.connections import connections
 from selectolax.parser import HTMLParser
@@ -94,18 +94,9 @@ def get_progressbar():
     errors_counter = Counter()
     t0 = time.time()
     with get_progressbar() as bar:
-        for success, info in streaming_bulk(
+        for success, info in parallel_bulk(
             connection,
             generator(),
-            # It's an inexact science as to what the perfect chunk_size should be.
-            # The default according to
-            # https://elasticsearch-py.readthedocs.io/en/v7.12.0/helpers.html#elasticsearch.helpers.streaming_bulk
-            # is 500.
-            # We've noticed that it works a bit better with a lower number because
-            # sometimes you get a `ReadTimeoutError` and combined with
-            # setting `raise_on_exception=False` you put less strain on each "bulk
-            # block".
-            chunk_size=100,
             # If the bulk indexing failed, it will by default raise a BulkIndexError.
             # Setting this to 'False' will suppress that.
             raise_on_exception=False,

From ddc8dcd02ed75fb8f16ae1dbe15d343854e155fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 05:44:17 +0000
Subject: [PATCH 190/288] build(deps): bump snok/install-poetry from v1.1.2 to
 v1.1.3 (#3531)

---
 .github/workflows/dev-build.yml   | 2 +-
 .github/workflows/pr-deployer.yml | 2 +-
 .github/workflows/prod-build.yml  | 2 +-
 .github/workflows/stage-build.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index cd6ad3863af2..5d0d70246652 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -91,7 +91,7 @@ jobs:
           python-version: "3.8"
 
       - name: Install Python poetry
-        uses: snok/install-poetry@v1.1.2
+        uses: snok/install-poetry@v1.1.3
 
       - name: Install deployer
         run: |
diff --git a/.github/workflows/pr-deployer.yml b/.github/workflows/pr-deployer.yml
index d723cd3f907b..44c3d937012f 100644
--- a/.github/workflows/pr-deployer.yml
+++ b/.github/workflows/pr-deployer.yml
@@ -19,7 +19,7 @@ jobs:
           python-version: "3.8"
 
       - name: Install Python poetry
-        uses: snok/install-poetry@v1.1.2
+        uses: snok/install-poetry@v1.1.3
         with:
           virtualenvs-create: true
           virtualenvs-in-project: true
diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
index c7d3268ddcbf..3aae35ba7028 100644
--- a/.github/workflows/prod-build.yml
+++ b/.github/workflows/prod-build.yml
@@ -116,7 +116,7 @@ jobs:
           python-version: "3.8"
 
       - name: Install Python poetry
-        uses: snok/install-poetry@v1.1.2
+        uses: snok/install-poetry@v1.1.3
 
       - name: Install deployer
         run: |
diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
index f2d22cd80015..748452121d73 100644
--- a/.github/workflows/stage-build.yml
+++ b/.github/workflows/stage-build.yml
@@ -116,7 +116,7 @@ jobs:
           python-version: "3.8"
 
       - name: Install Python poetry
-        uses: snok/install-poetry@v1.1.2
+        uses: snok/install-poetry@v1.1.3
 
       - name: Install deployer
         run: |

From 2e14db83d15e37691638483aba441f8da9722de5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 05:54:00 +0000
Subject: [PATCH 191/288] build(deps): bump @mdn/browser-compat-data from 3.2.4
 to 3.3.0 (#3532)

---
 package.json |  2 +-
 yarn.lock    | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 61955fe9aa4c..e45df738dc08 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
   "dependencies": {
     "@caporal/core": "2.0.2",
     "@fast-csv/parse": "4.3.6",
-    "@mdn/browser-compat-data": "3.2.4",
+    "@mdn/browser-compat-data": "3.3.0",
     "accept-language-parser": "1.5.0",
     "chalk": "4.1.0",
     "cheerio": "1.0.0-rc.6",
diff --git a/yarn.lock b/yarn.lock
index 14ff632d2e1e..406df1b8d078 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2452,12 +2452,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@mdn/browser-compat-data@3.2.4":
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.2.4.tgz#9b015c608eaed5cc47c35bb3d63f6502e5bd88c7"
-  integrity sha512-jEUurwoeiHOB7SceVnsg3ULxNlf9XxqMfcKNM+eJduPgCcoCnbLi/6og+e764fTAZCcBkqGcWUMhLQXwcqpbJQ==
-  dependencies:
-    extend "3.0.2"
+"@mdn/browser-compat-data@3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.3.0.tgz#00259cedef91cd4ea253d861fc68ad49b3d113ec"
+  integrity sha512-VtD1pp8/DaOzvONz/I9RHFKB6/SkFsckDy3+0Zm3zXjqnkOEvvoJlaCxWskoyvEoFapkktx0ghA7Avi49EnEUA==
 
 "@mdn/dinocons@^0.3.1":
   version "0.3.1"
@@ -8486,7 +8484,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@3.0.2, extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
+extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==

From a18a70f1311cc20348bc3188589b3dbd4ba62d9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 05:54:37 +0000
Subject: [PATCH 192/288] build(deps): bump open from 8.0.5 to 8.0.6 (#3533)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e45df738dc08..71accf1b2ba6 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "loglevel": "^1.7.1",
     "lru-cache": "^6.0.0",
     "mdn-data": "2.0.17",
-    "open": "^8.0.5",
+    "open": "^8.0.6",
     "open-editor": "3.0.0",
     "prismjs": "1.23.0",
     "read-chunk": "3.2.0",
diff --git a/yarn.lock b/yarn.lock
index 406df1b8d078..fb60170973d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13756,10 +13756,10 @@ open@^7.0.2, open@^7.0.3, open@^7.3.0:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
 
-open@^8.0.5:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.0.5.tgz#92ee3faafef4ddbe78006f7881572f3e81430b8f"
-  integrity sha512-hkPXCz7gijWp2GoWqsQ4O/5p7F6d5pIQ/+9NyeWG1nABJ4zvLi9kJRv1a44kVf5p13wK0WMoiRA+Xey68yOytA==
+open@^8.0.6:
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.0.6.tgz#bdf94a80b4ef5685d8c7b58fb0fbbe5729b37204"
+  integrity sha512-vDOC0KwGabMPFtIpCO2QOnQeOz0N2rEkbuCuxICwLMUCrpv+A7NHrrzJ2dQReJmVluHhO4pYRh/Pn6s8t7Op6Q==
   dependencies:
     define-lazy-prop "^2.0.0"
     is-docker "^2.1.1"

From d936896f70b5cdf217e1f20f265e4e5c949c4e1f Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 16 Apr 2021 10:15:50 -0400
Subject: [PATCH 193/288] don't broken_links check home page urls with hash
 (#3528)

* don't broken_links check home page urls with hash

Fixes #3515

* findByURL requires URL to contain /docs/
---
 build/flaws.js                                | 29 ++++++++++---------
 content/document.js                           |  8 ++++-
 .../files/en-us/web/homepage_links/index.html |  6 ++++
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/build/flaws.js b/build/flaws.js
index 3d0d2abbbf18..46f9d4c0372c 100644
--- a/build/flaws.js
+++ b/build/flaws.js
@@ -304,6 +304,17 @@ function injectBrokenLinksFlaws(doc, $, { rawContent }, level) {
     // that function knows which match it's referring to.
     checked.set(href, checked.has(href) ? checked.get(href) + 1 : 0);
 
+    // Note, a lot of links are like this:
+    //  <a href="/docs/Learn/Front-end_web_developer">
+    // which means the author wanted the link to work in any language.
+    // When checking it against disk, we'll have to assume a locale.
+    const hrefSplit = href.split("#");
+    let hrefNormalized = hrefSplit[0];
+    if (hrefNormalized.startsWith("/docs/")) {
+      const thisDocumentLocale = doc.mdn_url.split("/")[1];
+      hrefNormalized = `/${thisDocumentLocale}${hrefNormalized}`;
+    }
+
     if (href.startsWith("https://developer.mozilla.org/")) {
       // It might be a working 200 OK link but the link just shouldn't
       // have the full absolute URL part in it.
@@ -314,13 +325,13 @@ function injectBrokenLinksFlaws(doc, $, { rawContent }, level) {
         href,
         absoluteURL.pathname + absoluteURL.search + absoluteURL.hash
       );
-    } else if (isHomepageURL(href)) {
+    } else if (isHomepageURL(hrefNormalized)) {
       // But did you spell it perfectly?
-      const homepageLocale = href.split("/")[1];
+      const homepageLocale = hrefNormalized.split("/")[1];
       if (
-        href !== "/" &&
+        hrefNormalized !== "/" &&
         (VALID_LOCALES.get(homepageLocale.toLowerCase()) !== homepageLocale ||
-          !href.endsWith("/"))
+          !hrefNormalized.endsWith("/"))
       ) {
         addBrokenLink(
           a,
@@ -332,16 +343,6 @@ function injectBrokenLinksFlaws(doc, $, { rawContent }, level) {
     } else if (href.startsWith("/") && !href.startsWith("//")) {
       // Got to fake the domain to sensible extract the .search and .hash
       const absoluteURL = new URL(href, "http://www.example.com");
-      // Note, a lot of links are like this:
-      //  <a href="/docs/Learn/Front-end_web_developer">
-      // which means the author wanted the link to work in any language.
-      // When checking it against disk, we'll have to assume a locale.
-      const hrefSplit = href.split("#");
-      let hrefNormalized = hrefSplit[0];
-      if (hrefNormalized.startsWith("/docs/")) {
-        const thisDocumentLocale = doc.mdn_url.split("/")[1];
-        hrefNormalized = `/${thisDocumentLocale}${hrefNormalized}`;
-      }
       const found = Document.findByURL(hrefNormalized);
       if (!found) {
         // Before we give up, check if it's an image.
diff --git a/content/document.js b/content/document.js
index 72c2be94916f..de51d9551785 100644
--- a/content/document.js
+++ b/content/document.js
@@ -63,7 +63,7 @@ function extractLocale(folder) {
   // locale as we prefer to spell it (e.g. 'pt-BR' not 'Pt-bR')
   if (!locale) {
     throw new Error(
-      `Unable to figure out locale from ${folder} with ${localeFolderName}`
+      `Unable to figure out locale from '${folder}' with '${localeFolderName}'`
     );
   }
   return locale;
@@ -240,6 +240,9 @@ const read = memoize((folder) => {
     CONTENT_ARCHIVED_ROOT && filePath.startsWith(CONTENT_ARCHIVED_ROOT);
 
   const rawContent = fs.readFileSync(filePath, "utf8");
+  if (!rawContent) {
+    throw new Error(`${filePath} is an empty file`);
+  }
 
   // This is very useful in CI where every page gets built. If there's an
   // accidentally unresolved git conflict, that's stuck in the content,
@@ -390,6 +393,9 @@ function update(url, rawBody, metadata) {
 
 function findByURL(url, ...args) {
   const [bareURL, hash = ""] = url.split("#", 2);
+  if (!bareURL.toLowerCase().includes("/docs/")) {
+    return;
+  }
   const doc = read(urlToFolderPath(bareURL), ...args);
   if (doc && hash) {
     return { ...doc, url: `${doc.url}#${hash}` };
diff --git a/testing/content/files/en-us/web/homepage_links/index.html b/testing/content/files/en-us/web/homepage_links/index.html
index 78ef6d7aec3e..4abe47fb3ab3 100644
--- a/testing/content/files/en-us/web/homepage_links/index.html
+++ b/testing/content/files/en-us/web/homepage_links/index.html
@@ -23,3 +23,9 @@
 <p>
   <a href="/notalocale/"><code>/notalocale/</code></a> - not a valid locale
 </p>
+<p>
+  <a href="/#anchor"><code>/#anchor</code></a> - perfect but with hash
+</p>
+<p>
+  <a href="/en-US/#anchor"><code>/en-US/#anchor</code></a> - perfect but with hash
+</p>

From ff9ba008fdf0480c9205582cbb7b3109955b85e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 16:53:45 +0200
Subject: [PATCH 194/288] build(deps-dev): bump stylelint-config-recommended
 from 3.0.0 to 4.0.0 (#3162)

Bumps [stylelint-config-recommended](https://github.com/stylelint/stylelint-config-recommended) from 3.0.0 to 4.0.0.
- [Release notes](https://github.com/stylelint/stylelint-config-recommended/releases)
- [Changelog](https://github.com/stylelint/stylelint-config-recommended/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stylelint/stylelint-config-recommended/compare/3.0.0...4.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[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 71accf1b2ba6..195d13469dd1 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     "stylelint": "^13.12.0",
     "stylelint-a11y": "^1.2.3",
     "stylelint-config-prettier": "^8.0.2",
-    "stylelint-config-recommended": "^3.0.0",
+    "stylelint-config-recommended": "^4.0.0",
     "stylelint-config-sass-guidelines": "^8.0.0",
     "stylelint-prettier": "^1.2.0",
     "stylelint-scss": "^3.19.0",
diff --git a/yarn.lock b/yarn.lock
index fb60170973d1..369b4bd0bde9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17721,10 +17721,10 @@ stylelint-config-prettier@^8.0.2:
   resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-8.0.2.tgz#da9de33da4c56893cbe7e26df239a7374045e14e"
   integrity sha512-TN1l93iVTXpF9NJstlvP7nOu9zY2k+mN0NSFQ/VEGz15ZIP9ohdDZTtCWHs5LjctAhSAzaILULGbgiM0ItId3A==
 
-stylelint-config-recommended@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657"
-  integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==
+stylelint-config-recommended@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-4.0.0.tgz#665a0034065e6704d5032ba51bf4efa37d328ef9"
+  integrity sha512-sgna89Ng+25Hr9kmmaIxpGWt2LStVm1xf1807PdcWasiPDaOTkOHRL61sINw0twky7QMzafCGToGDnHT/kTHtQ==
 
 stylelint-config-sass-guidelines@^8.0.0:
   version "8.0.0"

From 709f5aec941359b3d99e34df3ab0b29e28de6ae1 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 16 Apr 2021 12:31:42 -0400
Subject: [PATCH 195/288] always measure how long gatherTranslations() takes
 (#3536)

---
 content/translations.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/content/translations.js b/content/translations.js
index 0fb1ef757b21..f52ee4d0a65c 100644
--- a/content/translations.js
+++ b/content/translations.js
@@ -36,7 +36,10 @@ function gatherTranslations() {
 
 function translationsOf({ slug, locale: currentLocale }) {
   if (TRANSLATIONS_OF.size === 0) {
+    const label = "Time to gather all translations";
+    console.time(label);
     gatherTranslations();
+    console.timeEnd(label);
   }
   const translations = TRANSLATIONS_OF.get(slug.toLowerCase());
   if (translations && currentLocale) {

From 80ff5c61b9a472f759a4e79dd82876e6f91c489f Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 16 Apr 2021 14:53:39 -0400
Subject: [PATCH 196/288] parse specific cookie vlue first (#3540)

---
 client/src/ui/molecules/language-menu/index.tsx | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/client/src/ui/molecules/language-menu/index.tsx b/client/src/ui/molecules/language-menu/index.tsx
index 89a5c3a0d94e..625175f75beb 100644
--- a/client/src/ui/molecules/language-menu/index.tsx
+++ b/client/src/ui/molecules/language-menu/index.tsx
@@ -36,13 +36,24 @@ export function LanguageMenu({
         // don't bother redirecting.
         if (preferredLocale !== locale) {
           const localeURL = translateURL(preferredLocale);
-          const cookieValueBefore = document.cookie;
+          let cookieValueBefore = document.cookie
+            .split("; ")
+            .find((row) => row.startsWith(`${PREFERRED_LOCALE_COOKIE_NAME}=`));
+          if (cookieValueBefore && cookieValueBefore.includes("=")) {
+            cookieValueBefore = cookieValueBefore.split("=")[1];
+          }
+
           for (const translation of translations) {
             if (translation.locale === preferredLocale) {
               let cookieValue = `${PREFERRED_LOCALE_COOKIE_NAME}=${
                 translation.locale
               };max-age=${60 * 60 * 24 * 365 * 3};path=/`;
-              if (document.location.hostname !== "localhost") {
+              if (
+                !(
+                  document.location.hostname === "localhost" ||
+                  document.location.hostname === "localhost.org"
+                )
+              ) {
                 cookieValue += ";secure";
               }
               document.cookie = cookieValue;

From cb03147540550a013a76be5e3cf06948c40db9fe Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 16 Apr 2021 15:13:41 -0400
Subject: [PATCH 197/288] Ability to control default cache-control in Deployer
 uploads (#3517)

Fixes #3516
---
 deployer/src/deployer/main.py   |  7 +++++
 deployer/src/deployer/upload.py | 51 +++++++++++++++++++++++++++------
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/deployer/src/deployer/main.py b/deployer/src/deployer/main.py
index 4659859641ed..53152ba69091 100644
--- a/deployer/src/deployer/main.py
+++ b/deployer/src/deployer/main.py
@@ -10,6 +10,7 @@
     CONTENT_ARCHIVED_ROOT,
     DEFAULT_BUCKET_NAME,
     DEFAULT_BUCKET_PREFIX,
+    DEFAULT_CACHE_CONTROL,
     DEFAULT_NO_PROGRESSBAR,
     DEFAULT_REPO,
     DEFAULT_GITHUB_TOKEN,
@@ -186,6 +187,12 @@ def whatsdeployed(ctx, directory: Path, output: str):
     default=None,
     callback=validate_optional_file,
 )
+@click.option(
+    "--default-cache-control",
+    help="The default Cache-Control value used when uploading files (0 to disable)",
+    default=DEFAULT_CACHE_CONTROL,
+    show_default=True,
+)
 @click.argument("directory", type=click.Path(), callback=validate_directory)
 @click.pass_context
 def upload(ctx, directory: Path, **kwargs):
diff --git a/deployer/src/deployer/upload.py b/deployer/src/deployer/upload.py
index abfb90b87b15..04ac3b2e141d 100644
--- a/deployer/src/deployer/upload.py
+++ b/deployer/src/deployer/upload.py
@@ -125,13 +125,20 @@ class UploadFileTask(UploadTask):
     Class for file upload tasks.
     """
 
-    def __init__(self, file_path: Path, key: str, dry_run=False):
+    def __init__(
+        self,
+        file_path: Path,
+        key: str,
+        dry_run=False,
+        default_cache_control=DEFAULT_CACHE_CONTROL,
+    ):
         self.key = key
         self.file_path = file_path
         self.dry_run = dry_run
+        self.default_cache_control = default_cache_control
 
     def __repr__(self):
-        return f"UploadFileTask({self.file_path}, {self.key})"
+        return f"{self.__class__.__name__}({self.file_path}, {self.key})"
 
     def __str__(self):
         return self.key
@@ -203,9 +210,12 @@ def cache_control(self):
         if self.is_hashed:
             cache_control_seconds = HASHED_CACHE_CONTROL
         else:
-            cache_control_seconds = DEFAULT_CACHE_CONTROL
+            cache_control_seconds = self.default_cache_control
 
-        return f"max-age={cache_control_seconds}, public"
+        if cache_control_seconds == 0:
+            return "max-age=0, no-cache, no-store, must-revalidate"
+        else:
+            return f"max-age={cache_control_seconds}, public"
 
     def upload(self, bucket_manager):
         if not self.dry_run:
@@ -344,7 +354,13 @@ def get_bucket_objects(self):
                 break
         return result
 
-    def iter_file_tasks(self, build_directory, for_counting_only=False, dry_run=False):
+    def iter_file_tasks(
+        self,
+        build_directory,
+        for_counting_only=False,
+        dry_run=False,
+        default_cache_control=DEFAULT_CACHE_CONTROL,
+    ):
         # The order matters! In particular the order of static assets compared to
         # the HTML files that reference said static assets.
         # If you upload the HTML files before we upload the static assets, what
@@ -378,7 +394,12 @@ def iter_file_tasks(self, build_directory, for_counting_only=False, dry_run=Fals
             if for_counting_only:
                 yield 1
             else:
-                yield UploadFileTask(fp, key, dry_run=dry_run)
+                yield UploadFileTask(
+                    fp,
+                    key,
+                    dry_run=dry_run,
+                    default_cache_control=default_cache_control,
+                )
             done.add(key)
 
         # Prepare a computation of what the root /index.html file would be
@@ -414,7 +435,12 @@ def iter_file_tasks(self, build_directory, for_counting_only=False, dry_run=Fals
             if for_counting_only:
                 yield 1
             else:
-                yield UploadFileTask(fp, key, dry_run=dry_run)
+                yield UploadFileTask(
+                    fp,
+                    key,
+                    dry_run=dry_run,
+                    default_cache_control=default_cache_control,
+                )
 
     def iter_redirect_tasks(
         self, content_roots, for_counting_only=False, dry_run=False
@@ -463,6 +489,7 @@ def upload(
         on_task_complete=None,
         skip_redirects=False,
         dry_run=False,
+        default_cache_control=DEFAULT_CACHE_CONTROL,
     ):
         with concurrent.futures.ThreadPoolExecutor(
             max_workers=MAX_WORKERS_PARALLEL_UPLOADS
@@ -474,7 +501,13 @@ def upload(
                 task_iters.append(
                     self.iter_redirect_tasks(content_roots, dry_run=dry_run)
                 )
-            task_iters.append(self.iter_file_tasks(build_directory, dry_run=dry_run))
+            task_iters.append(
+                self.iter_file_tasks(
+                    build_directory,
+                    dry_run=dry_run,
+                    default_cache_control=default_cache_control,
+                )
+            )
             for task_iter in task_iters:
                 futures = {}
                 for task in task_iter:
@@ -558,6 +591,7 @@ def upload_content(build_directory, content_roots, config):
     upload_redirects = not config["no_redirects"]
     prune = config["prune"]
     archived_txt_file = config["archived_files"]
+    default_cache_control = config["default_cache_control"]
 
     log.info(f"Upload files from: {build_directory}")
     if upload_redirects:
@@ -611,6 +645,7 @@ def on_task_complete(task):
             on_task_complete=on_task_complete,
             skip_redirects=not upload_redirects,
             dry_run=dry_run,
+            default_cache_control=default_cache_control,
         )
 
     if dry_run:

From 5163597bd082119c9e9862910ae503ddd41b576b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 06:31:02 +0000
Subject: [PATCH 198/288] build(deps-dev): bump flake8 from 3.9.0 to 3.9.1 in
 /testing/integration (#3545)

---
 testing/integration/poetry.lock    | 8 ++++----
 testing/integration/pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testing/integration/poetry.lock b/testing/integration/poetry.lock
index f46f913ae1f9..2fc0ad4c9929 100644
--- a/testing/integration/poetry.lock
+++ b/testing/integration/poetry.lock
@@ -100,7 +100,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "flake8"
-version = "3.9.0"
+version = "3.9.1"
 description = "the modular source code checker: pep8 pyflakes and co"
 category = "dev"
 optional = false
@@ -382,7 +382,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "55a196aa28b8f873ea92e1be02308a39924ad41c7e192071bf7f6f1231decd7e"
+content-hash = "a9917261ac018568890dcdcec5d160fd8ff2e3d64b9efaa04a972a46b48f98ed"
 
 [metadata.files]
 appdirs = [
@@ -425,8 +425,8 @@ cssselect = [
     {file = "cssselect-1.1.0.tar.gz", hash = "sha256:f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc"},
 ]
 flake8 = [
-    {file = "flake8-3.9.0-py2.py3-none-any.whl", hash = "sha256:12d05ab02614b6aee8df7c36b97d1a3b2372761222b19b58621355e82acddcff"},
-    {file = "flake8-3.9.0.tar.gz", hash = "sha256:78873e372b12b093da7b5e5ed302e8ad9e988b38b063b61ad937f26ca58fc5f0"},
+    {file = "flake8-3.9.1-py2.py3-none-any.whl", hash = "sha256:3b9f848952dddccf635be78098ca75010f073bfe14d2c6bda867154bea728d2a"},
+    {file = "flake8-3.9.1.tar.gz", hash = "sha256:1aa8990be1e689d96c745c5682b687ea49f2e05a443aff1f8251092b0014e378"},
 ]
 idna = [
     {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
diff --git a/testing/integration/pyproject.toml b/testing/integration/pyproject.toml
index 222034b2c76d..64c56b5228e9 100644
--- a/testing/integration/pyproject.toml
+++ b/testing/integration/pyproject.toml
@@ -18,7 +18,7 @@ braceexpand = "^0.1.6"
 
 [tool.poetry.dev-dependencies]
 black = "^20.8b1"
-flake8 = "^3.9.0"
+flake8 = "^3.9.1"
 
 [build-system]
 requires = ["poetry>=0.12"]

From 47f79c119ca29afa1893bf7defc93064eeb9ff58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 06:37:41 +0000
Subject: [PATCH 199/288] build(deps): bump boto3 from 1.17.49 to 1.17.53 in
 /deployer (#3546)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 088871939401..a5ac6c0c164a 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.49"
+version = "1.17.53"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.49,<1.21.0"
+botocore = ">=1.20.53,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.3.0,<0.4.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.49"
+version = "1.20.53"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -533,7 +533,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "27fb79f47555bbf65374719f40c56bc72f2509e094f230d54b8a7f25f2c813b4"
+content-hash = "64d113fe179efe96b5f04868b74115a975aaf6013cab47ccce9339a13d74b749"
 
 [metadata.files]
 appdirs = [
@@ -552,12 +552,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.49-py2.py3-none-any.whl", hash = "sha256:d5ef160442925f5944e4cde88589f0f195f6c284f05613114fc6bbc35e342fa7"},
-    {file = "boto3-1.17.49.tar.gz", hash = "sha256:a482135c30fa07eaf4370314dd0fb49117222a266d0423b2075aed3835ed1f04"},
+    {file = "boto3-1.17.53-py2.py3-none-any.whl", hash = "sha256:3bf3305571f3c8b738a53e9e7dcff59137dffe94670046c084a17f9fa4599ff3"},
+    {file = "boto3-1.17.53.tar.gz", hash = "sha256:1d26f6e7ae3c940cb07119077ac42485dcf99164350da0ab50d0f5ad345800cd"},
 ]
 botocore = [
-    {file = "botocore-1.20.49-py2.py3-none-any.whl", hash = "sha256:6a672ba41dd00e5c1c1824ca8143d180d88de8736d78c0b1f96b8d3cb0466561"},
-    {file = "botocore-1.20.49.tar.gz", hash = "sha256:f7f103fa0651c69dd360c7d0ecd874854303de5cc0869e0cbc2818a52baacc69"},
+    {file = "botocore-1.20.53-py2.py3-none-any.whl", hash = "sha256:d5e70d17b91c9b5867be7d6de0caa7dde9ed789bed62f03ea9b60718dc9350bf"},
+    {file = "botocore-1.20.53.tar.gz", hash = "sha256:e303500c4e80f6a706602da53daa6f751cfa8f491665c99a24ee732ab6321573"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 05364804b7a2..c2a05a0add81 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.49"
+boto3 = "^1.17.53"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 12f9f883b6b539808c629362e4943f517c2e3ae9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 06:47:57 +0000
Subject: [PATCH 200/288] build(deps): bump snok/install-poetry from v1.1.3 to
 v1.1.4 (#3549)

---
 .github/workflows/dev-build.yml   | 2 +-
 .github/workflows/pr-deployer.yml | 2 +-
 .github/workflows/prod-build.yml  | 2 +-
 .github/workflows/stage-build.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index 5d0d70246652..fbca056160c4 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -91,7 +91,7 @@ jobs:
           python-version: "3.8"
 
       - name: Install Python poetry
-        uses: snok/install-poetry@v1.1.3
+        uses: snok/install-poetry@v1.1.4
 
       - name: Install deployer
         run: |
diff --git a/.github/workflows/pr-deployer.yml b/.github/workflows/pr-deployer.yml
index 44c3d937012f..922fed2ad55e 100644
--- a/.github/workflows/pr-deployer.yml
+++ b/.github/workflows/pr-deployer.yml
@@ -19,7 +19,7 @@ jobs:
           python-version: "3.8"
 
       - name: Install Python poetry
-        uses: snok/install-poetry@v1.1.3
+        uses: snok/install-poetry@v1.1.4
         with:
           virtualenvs-create: true
           virtualenvs-in-project: true
diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
index 3aae35ba7028..53edb6be5c20 100644
--- a/.github/workflows/prod-build.yml
+++ b/.github/workflows/prod-build.yml
@@ -116,7 +116,7 @@ jobs:
           python-version: "3.8"
 
       - name: Install Python poetry
-        uses: snok/install-poetry@v1.1.3
+        uses: snok/install-poetry@v1.1.4
 
       - name: Install deployer
         run: |
diff --git a/.github/workflows/stage-build.yml b/.github/workflows/stage-build.yml
index 748452121d73..31d19922ad4e 100644
--- a/.github/workflows/stage-build.yml
+++ b/.github/workflows/stage-build.yml
@@ -116,7 +116,7 @@ jobs:
           python-version: "3.8"
 
       - name: Install Python poetry
-        uses: snok/install-poetry@v1.1.3
+        uses: snok/install-poetry@v1.1.4
 
       - name: Install deployer
         run: |

From 0825282e683e1eedc49803bbf40880afcddcdeb4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 07:03:44 +0000
Subject: [PATCH 201/288] build(deps-dev): bump html-validate from 4.9.0 to
 4.10.0 (#3551)

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

diff --git a/package.json b/package.json
index 195d13469dd1..03459a159d6c 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "fuzzyjs": "4.0.4",
     "fuzzysearch": "1.0.3",
     "history": "5.0.0",
-    "html-validate": "4.9.0",
+    "html-validate": "4.10.0",
     "husky": "4.3.8",
     "ignore-loader": "^0.1.2",
     "jest-environment-jsdom-sixteen": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index 369b4bd0bde9..d43b70e885e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10099,10 +10099,10 @@ html-tags@^3.1.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
   integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
 
-html-validate@4.9.0:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.9.0.tgz#117b5b96847ac6e6f82a65f2a8cd5e0c7be3da0b"
-  integrity sha512-f/K800iPkwUoylSLbBHwotSgfWGQ0oW1WXZQQ1O/PRHXfyaaycGMHg5yke6CywhYW/NIV4BcXhGdtTwrrWQ1sg==
+html-validate@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.10.0.tgz#001b581ed0026bd4ba84034b968a76c7e95f10fb"
+  integrity sha512-5yFDrUj9mb8r4bv8crKsBDNC97oL1eWg1pEqxR5GfcnlwqBztJma6dQgfbWx7J4hF02Q1IViLdWfjy8//vXvMQ==
   dependencies:
     "@babel/code-frame" "^7.10.0"
     "@html-validate/stylish" "^1.0.0"
@@ -15290,7 +15290,7 @@ promise@^8.1.0:
   dependencies:
     asap "~2.0.6"
 
-prompts@2.4.0, prompts@^2.0.0, prompts@^2.0.1, prompts@^2.3.0:
+prompts@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
   integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==
@@ -15298,7 +15298,7 @@ prompts@2.4.0, prompts@^2.0.0, prompts@^2.0.1, prompts@^2.3.0:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prompts@^2.4.0:
+prompts@^2.0.0, prompts@^2.0.1, prompts@^2.3.0, prompts@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61"
   integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==

From 25d7f1fa600ad75a30de61363c596efb1c69e030 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 07:03:46 +0000
Subject: [PATCH 202/288] build(deps-dev): bump sass from 1.32.8 to 1.32.10
 (#3550)

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

diff --git a/package.json b/package.json
index 03459a159d6c..036eb662d87a 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "react-router-dom": "6.0.0-beta.0",
     "react-scripts": "4.0.3",
     "rough-notation": "0.5.1",
-    "sass": "^1.32.8",
+    "sass": "^1.32.10",
     "stylelint": "^13.12.0",
     "stylelint-a11y": "^1.2.3",
     "stylelint-config-prettier": "^8.0.2",
diff --git a/yarn.lock b/yarn.lock
index d43b70e885e6..234aafb24152 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5878,7 +5878,7 @@ cheerio@1.0.0-rc.6:
     parse5 "^6.0.1"
     parse5-htmlparser2-tree-adapter "^6.0.1"
 
-"chokidar@>=2.0.0 <4.0.0", chokidar@^3.2.2, chokidar@^3.4.1, chokidar@^3.4.2:
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.2.2, chokidar@^3.4.1, chokidar@^3.4.2:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
   integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
@@ -16721,12 +16721,12 @@ sass-loader@^10.0.5:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sass@^1.32.8:
-  version "1.32.8"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc"
-  integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==
+sass@^1.32.10:
+  version "1.32.10"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.10.tgz#d40da4e20031b450359ee1c7e69bc8cc89569241"
+  integrity sha512-Nx0pcWoonAkn7CRp0aE/hket1UP97GiR1IFw3kcjV3pnenhWgZEWUf0ZcfPOV2fK52fnOcK3JdC/YYZ9E47DTQ==
   dependencies:
-    chokidar ">=2.0.0 <4.0.0"
+    chokidar ">=3.0.0 <4.0.0"
 
 sax@~1.2.4:
   version "1.2.4"

From 509ec99cf8e8d1df517ab7d8edae5e40b986d215 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 07:05:18 +0000
Subject: [PATCH 203/288] build(deps): bump http-proxy-middleware from 1.1.2 to
 1.2.0 (#3553)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 036eb662d87a..58c866347dbd 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "hast-util-is-element": "^1.1.0",
     "hast-util-to-html": "^7.1.2",
     "hast-util-to-text": "^2.0.1",
-    "http-proxy-middleware": "1.1.2",
+    "http-proxy-middleware": "1.2.0",
     "image-size": "1.0.0",
     "image-type": "4.1.0",
     "imagemin": "7.0.1",
diff --git a/yarn.lock b/yarn.lock
index 234aafb24152..fa3ae92ef5d4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10242,10 +10242,10 @@ http-proxy-middleware@0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
-http-proxy-middleware@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.1.2.tgz#38d062ce4182b2931442efc2d9a0c429cab634f8"
-  integrity sha512-YRFUeOG3q85FJjAaYVJUoNRW9a73SDlOtAyQOS5PHLr18QeZ/vEhxywNoOPiEO8BxCegz4RXzTHcvyLEGB78UA==
+http-proxy-middleware@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.2.0.tgz#87776ea3d4d8dda3dc2594a076787bbc6fe4d995"
+  integrity sha512-vNw+AxT0+6VTM1rCJw1bpiIaUQ1Ww/vTyIEOUzdW9kNX4yuhhqV3jLSKDJo/Y/lqEIshaKCDujtvEqWiD9Dn6Q==
   dependencies:
     "@types/http-proxy" "^1.17.5"
     http-proxy "^1.18.1"

From 12dbccdee8cf76fb81cbcbbef2680c0066122b46 Mon Sep 17 00:00:00 2001
From: "Michael[tm] Smith" <mike@w3.org>
Date: Mon, 19 Apr 2021 16:17:15 +0900
Subject: [PATCH 204/288] Add the Sensor API to GroupData.json (#3543)

Fixes https://github.com/mdn/content/issues/4091
---
 kumascript/macros/GroupData.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/kumascript/macros/GroupData.json b/kumascript/macros/GroupData.json
index 513e2064c7a1..c116cb48122e 100644
--- a/kumascript/macros/GroupData.json
+++ b/kumascript/macros/GroupData.json
@@ -1255,6 +1255,17 @@
       "methods": ["Document.getSelection()", "Window.getSelection()"],
       "events": ["Document: selectionchange", "Document: selectstart"]
     },
+    "Sensor API": {
+      "overview": ["Sensor APIs"],
+      "interfaces": ["Sensor"],
+      "properties": [
+        "Sensor.activated",
+        "Sensor.hasReading",
+        "Sensor.timestamp"
+      ],
+      "methods": ["Sensor.start()", "Sensor.stop()"],
+      "events": ["Sensor: error", "Sensor: reading", "Sensor: activate"]
+    },
     "Server Sent Events": {
       "overview": ["Server-sent events"],
       "guides": ["/docs/Web/API/Server-sent_events/Using_server-sent_events"],

From 70c51ce7f21e6167898a3ca896968af23d466165 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 10:23:44 +0000
Subject: [PATCH 205/288] build(deps): bump selectolax from 0.2.10 to 0.2.11 in
 /deployer (#3548)

---
 deployer/poetry.lock    | 92 ++++++++++++++++++++---------------------
 deployer/pyproject.toml |  2 +-
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index a5ac6c0c164a..3a3869d7b70b 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -459,7 +459,7 @@ botocore = ">=1.12.36,<2.0a.0"
 
 [[package]]
 name = "selectolax"
-version = "0.2.10"
+version = "0.2.11"
 description = "Fast HTML5 parser with CSS selectors."
 category = "main"
 optional = false
@@ -533,7 +533,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "64d113fe179efe96b5f04868b74115a975aaf6013cab47ccce9339a13d74b749"
+content-hash = "c3b7e62423c98840b20031270acfc2351364c32c27c2286ec536a26e372658d0"
 
 [metadata.files]
 appdirs = [
@@ -776,50 +776,50 @@ s3transfer = [
     {file = "s3transfer-0.3.6.tar.gz", hash = "sha256:c5dadf598762899d8cfaecf68eba649cd25b0ce93b6c954b156aaa3eed160547"},
 ]
 selectolax = [
-    {file = "selectolax-0.2.10-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:a18f75af342476356e5a437fc5215a3b79b58f52b56d9ea6e1a985cc21895952"},
-    {file = "selectolax-0.2.10-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:ecdbad6c95b93256df4c3cb14612215bcd754093415615c55a191bb17fd0ebdc"},
-    {file = "selectolax-0.2.10-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:a36581e0a4f74c5a67d22048fbf34221f9d480bde05acc57702b1cffdcb9ecf5"},
-    {file = "selectolax-0.2.10-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:519335c313c49151e0a282bef88043eab8756732f24eeb42d2a17e68b3ab174e"},
-    {file = "selectolax-0.2.10-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:bba6127957c3209e141e42077d952cb1df4a5dc23c522ca9038c8013509588d8"},
-    {file = "selectolax-0.2.10-cp35-cp35m-win32.whl", hash = "sha256:37cb0fd1d933ad7321caa68773fda490d686286eaf4d77922686ad14506c4a2c"},
-    {file = "selectolax-0.2.10-cp35-cp35m-win_amd64.whl", hash = "sha256:8b85a1356e180d235d9ab92bc3dd90d07e78cab1ef324ae9d12207607c9f26f6"},
-    {file = "selectolax-0.2.10-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f8f8488fa5859b0da7e4a1bd265b5c0bba45dbf8286e6cee17bf95bcb3d5e797"},
-    {file = "selectolax-0.2.10-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:4233599d6507e11a6fab67d9e933d8f445859868b4162eb71c849a832935b575"},
-    {file = "selectolax-0.2.10-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:8d8e3c7c43805628f2112cda81dba0b8f6620912c24ab2d6635f351985097971"},
-    {file = "selectolax-0.2.10-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:4ebb88d954dabffa3bafad6cdd758612a7d3b84ceee692c5818bbf0fa93c5f6b"},
-    {file = "selectolax-0.2.10-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:e6857ac61acbf747ea56f6c8a72968e7a6ba88053a9a2b5b44091bfb97fb1c87"},
-    {file = "selectolax-0.2.10-cp36-cp36m-win32.whl", hash = "sha256:a6724cb313cd7805c7cf4252fdf162e7253cf3a933b7c25ac954feed3edc23ce"},
-    {file = "selectolax-0.2.10-cp36-cp36m-win_amd64.whl", hash = "sha256:38661265f318459cd93b1a87b20d8b7b5adeaa353cc96e2d5087a05eef9ce8a3"},
-    {file = "selectolax-0.2.10-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:f22653fd48a7f835891bab16095c6f983994d68d16925447e537eb6e3ab79fc4"},
-    {file = "selectolax-0.2.10-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f83648e412aa610bdff1259dc412383fb290427c05f54e4fad1419b16aca19fe"},
-    {file = "selectolax-0.2.10-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:804f8e954428a1a325a62a88af39e1fef87c22f0689ee3c3a1d8968ee9648f6e"},
-    {file = "selectolax-0.2.10-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:13e6a6ec4b8fc43ef3f6586e17ba85832bbcdf8074d9a31a159d87dd81bf2627"},
-    {file = "selectolax-0.2.10-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:df57fdbbf772b72993e44cdb326b4937d225e0dd2083cce56100593fe791326a"},
-    {file = "selectolax-0.2.10-cp37-cp37m-win32.whl", hash = "sha256:f6c637636cc3bd0025dc9bd07fde28d482c93a6c21cf2e88b827a06766b2b314"},
-    {file = "selectolax-0.2.10-cp37-cp37m-win_amd64.whl", hash = "sha256:4b9f60a689c0453b6e2a6b92dd2407c82167f3d7624b27184842b2b58d5bc353"},
-    {file = "selectolax-0.2.10-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c49ac91cb291eae5c396aa87725ad066ba2fd9690289f3ffcde0022e4276b56e"},
-    {file = "selectolax-0.2.10-cp38-cp38-manylinux1_i686.whl", hash = "sha256:b8632b165d5da9ecbfb671dbfa879a874cd63d2ea66a8d21b065da1236949947"},
-    {file = "selectolax-0.2.10-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:60ba2ce5060bac7d56dedefe1403602aac1b999a60596294ce3a9520e2c95d71"},
-    {file = "selectolax-0.2.10-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:ec2e3f6e49ee252c2fd0c0f297513150ec04e59c7aa0236baebeaaf21b83ffef"},
-    {file = "selectolax-0.2.10-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:231ce804a5e186afa4e7f1639f3a2fdefc5151c1094746fa09821c7c9f5dbeb6"},
-    {file = "selectolax-0.2.10-cp38-cp38-win32.whl", hash = "sha256:d4144619f88bb94ee2c29cccc23b00a020d6d140d84eda8d7fc4da05dc15f352"},
-    {file = "selectolax-0.2.10-cp38-cp38-win_amd64.whl", hash = "sha256:4714c5e6b18ad0ca9f2919b39f333590025e46cb0bb248ffe973333bbf18a491"},
-    {file = "selectolax-0.2.10-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6f7f7a1a030c5612529c0e9df46d690b54d22416d500095ddf3985527f8fb78f"},
-    {file = "selectolax-0.2.10-cp39-cp39-manylinux1_i686.whl", hash = "sha256:90da202496bb99a0924cd26c471f455f64308ed13a24500852635aef5014a43f"},
-    {file = "selectolax-0.2.10-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:e577ea359151e4df515eabc0c6ea1ddda0577971597c5e9908498a80477befc6"},
-    {file = "selectolax-0.2.10-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4208bfab7c5e14d54104b7959ba1d66f67a51044cb1fccbab62d12c6bd905f02"},
-    {file = "selectolax-0.2.10-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:88cc811bb3f9c4eac303dde5ba3ecde0972dba8cebf2fb8001467e752c888838"},
-    {file = "selectolax-0.2.10-cp39-cp39-win32.whl", hash = "sha256:290b9bc9df879c8538899b5d22e8fa272e07c9edc438396d9b9ad631a7689837"},
-    {file = "selectolax-0.2.10-cp39-cp39-win_amd64.whl", hash = "sha256:2fe935472e9c2c14caf38b65a5ea836f0c3d56081945a8588e14f4136e34ba6b"},
-    {file = "selectolax-0.2.10-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:03e4c0b6d8feb16472482c89a1bf0752335d015172263388c94b8089224ed9e6"},
-    {file = "selectolax-0.2.10-pp36-pypy36_pp73-manylinux1_x86_64.whl", hash = "sha256:5e2fb6a27bc7760d57f8cc53adcf5b300a021a3f4102df0e5dd8abb436041c28"},
-    {file = "selectolax-0.2.10-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:274d70e46a94a7b673585957574e571b1838afb5862b9edc7477f704a2e8be3f"},
-    {file = "selectolax-0.2.10-pp36-pypy36_pp73-win32.whl", hash = "sha256:01b26820667dcd8dc0ec94ed874ffc8e45043f0da70466544a9328a79282ff41"},
-    {file = "selectolax-0.2.10-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:108f0ed757c5e74cd3d15f3ddb615c891711ae9647fb002aca6dbad5c7f0084c"},
-    {file = "selectolax-0.2.10-pp37-pypy37_pp73-manylinux1_x86_64.whl", hash = "sha256:98e8b60fca5ca6e2f0a2a1882f0c1b771612e5016bd6605545e7c20a8baac244"},
-    {file = "selectolax-0.2.10-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:061efe18e01a624e33317d1f98f20d67f025e228f5cf87f198caceadff9e77f5"},
-    {file = "selectolax-0.2.10-pp37-pypy37_pp73-win32.whl", hash = "sha256:c47c7602e8cf8bdce03716b0240d2067eec92f3185cffe34813c60706559ae6a"},
-    {file = "selectolax-0.2.10.tar.gz", hash = "sha256:3b21ba8862be4445482e6954c61562851cebd9c9e5db73b0865ea4729e7c85b0"},
+    {file = "selectolax-0.2.11-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:797f95ed7d2a6e83c0c344ed3110ea8c932b7ab05b8d23f133f10d17f6a91c7e"},
+    {file = "selectolax-0.2.11-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:4908e409c95a0459f8beff957c1f3e67b605ba29afb5a68c2060a6f2d91cee17"},
+    {file = "selectolax-0.2.11-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:0b8296d49bfc89cdad31393a11e9654135cbf43f40a8fb477a9232f5c9b6b110"},
+    {file = "selectolax-0.2.11-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:c675a9d284d863806524c69ff40fc0b13846ee191a872cdeb5cf6bf4aa1a3f17"},
+    {file = "selectolax-0.2.11-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:ee762b09d8690c65e5afc943aaf618e12ec7548f1355e6477255f54805c92000"},
+    {file = "selectolax-0.2.11-cp35-cp35m-win32.whl", hash = "sha256:7517b1758c1735b6e260003df955c7122a014f68cc4d6fe7799e831635374a9a"},
+    {file = "selectolax-0.2.11-cp35-cp35m-win_amd64.whl", hash = "sha256:b06a35cb77b59229b863404e4b318169cfeafd3385ac1bb0589acec3ea749641"},
+    {file = "selectolax-0.2.11-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:935f9880cfe57468a245ef2409d99c90c315be625c6e143776d870bbfd9a111e"},
+    {file = "selectolax-0.2.11-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:02ad48558b164b3f6e3abe52408f21d07647c9811271247335b3ee02cb6b0efd"},
+    {file = "selectolax-0.2.11-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:01cfe1e147cf1786698e9cbd29fb4e7f5ce9356831e7c749d61a35ffedd21090"},
+    {file = "selectolax-0.2.11-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:6ab41766c5290bf564df657ef989b1bc8e7264df2d92547ca57bd163ed217ca1"},
+    {file = "selectolax-0.2.11-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fac4306353927ca01e86953fbcd276065286f37faef7e0a21921fdc9f7f5c85b"},
+    {file = "selectolax-0.2.11-cp36-cp36m-win32.whl", hash = "sha256:13becd752f6dfb79f903aa3bf0225dedc2d364b57c93546e80a9492911f6ae27"},
+    {file = "selectolax-0.2.11-cp36-cp36m-win_amd64.whl", hash = "sha256:317400101b5cc71a85a585edc724628162f000f961ffd955c165e5cbc72ad7ca"},
+    {file = "selectolax-0.2.11-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:652caaee91b3568b781335d8a98f758a5481f899fc589eabb6faeb02651c4641"},
+    {file = "selectolax-0.2.11-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:3792df1b3bc7100339b151f3190eecbd2c14057ca1b7de8a76ce02b902917647"},
+    {file = "selectolax-0.2.11-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:9fa38be81a81b5a312c32587d7a9e7b74e33b6e2bfbce8710538786e1890f75e"},
+    {file = "selectolax-0.2.11-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:a7c09ba6f599053f48495c4d13208df2d535f9635bdf189c3e121042a6b60316"},
+    {file = "selectolax-0.2.11-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:fdb9ae5fc1cce52030d827a4e2d0f2bf02826cb42b741979caf36524ff588fb1"},
+    {file = "selectolax-0.2.11-cp37-cp37m-win32.whl", hash = "sha256:1401197b9bb77864c0e13580d3f54e30244b9026cf550e0a0cb331c7d60acd51"},
+    {file = "selectolax-0.2.11-cp37-cp37m-win_amd64.whl", hash = "sha256:d13cc3b19ff3ec99a4822a9c3069263c2421f4806b0f149700b649b3729e2594"},
+    {file = "selectolax-0.2.11-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:08ca7f4a2c54671c1a28cba816095227a9e7dd8d974f219567ab90ec7c3b1a8b"},
+    {file = "selectolax-0.2.11-cp38-cp38-manylinux1_i686.whl", hash = "sha256:89720dddd7bf5f79395ded553ce421dfd30718b69eb49fa9cdb8dd4cb87013f7"},
+    {file = "selectolax-0.2.11-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:098f9b02661490c092279aba8e8ff51a4b95f2ddeca5c915705c26da4547a448"},
+    {file = "selectolax-0.2.11-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:ec28810375cd14b56514f71df5ad648e6b961b70d3bec406d9b3dca67de9f1c5"},
+    {file = "selectolax-0.2.11-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:57fc84cb699e03e8e4a52c1d3d89b0f03622a4e89305c548077c50997e884747"},
+    {file = "selectolax-0.2.11-cp38-cp38-win32.whl", hash = "sha256:64eb827ea2600c10c2c542521bd73749b3a570825b75ce6c7535167ca66640b7"},
+    {file = "selectolax-0.2.11-cp38-cp38-win_amd64.whl", hash = "sha256:dd4f1ed51e89a2f961d38bbbe7ffa115b9da11703d8c6e1d9a183c8ca10d4c4c"},
+    {file = "selectolax-0.2.11-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:00403ce63e7767a58f5346e59ed189920750d7f3c6f0bf1d74365b70bf2bf0a9"},
+    {file = "selectolax-0.2.11-cp39-cp39-manylinux1_i686.whl", hash = "sha256:24d5ef06d7fda0c6704c7f6c8fd0f99b16fdc76e44d8541a055da4da8ccc0dfb"},
+    {file = "selectolax-0.2.11-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:c20fe66d6517cca3d0b9cf8564029959c30ad58c53795177e0e9ce94070c62ca"},
+    {file = "selectolax-0.2.11-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:63dc1a41488eb577a9617268c79627d936b0cd510e90cd6467af637dca12a29a"},
+    {file = "selectolax-0.2.11-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:c1f3baf13574b135a3fca862a28e8bfe3ca636ea760967b4242a5bbd290e8ebf"},
+    {file = "selectolax-0.2.11-cp39-cp39-win32.whl", hash = "sha256:e512e5fd01fe664515bd18c1768b25583041752622d22b9e4b59c3491c0ca3f2"},
+    {file = "selectolax-0.2.11-cp39-cp39-win_amd64.whl", hash = "sha256:079e569e04a545d7596c9e31db55a9b81bd586a47edfba61e96d5accb886f678"},
+    {file = "selectolax-0.2.11-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5a3a7cf3c7fbec6ace65f77d6fa23e27b0dfd7f1ecd383feff754a398cbec213"},
+    {file = "selectolax-0.2.11-pp36-pypy36_pp73-manylinux1_x86_64.whl", hash = "sha256:26a74309a1bdf352c8cc246dae489af1879bae47abb23fc8cb36c086fc6c1c6d"},
+    {file = "selectolax-0.2.11-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:90758c756b00bf805f6529e9b1de17279c9d2f2dd3450ed35fa604c036636dbb"},
+    {file = "selectolax-0.2.11-pp36-pypy36_pp73-win32.whl", hash = "sha256:41b9249986938b218d6428543f90a8b480f001d30a384538ceb126fc7d23d1c6"},
+    {file = "selectolax-0.2.11-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:e1109e1d46a7af79df74bb21a45c1b632e81f8e03d96a535ae062ae1d1caf550"},
+    {file = "selectolax-0.2.11-pp37-pypy37_pp73-manylinux1_x86_64.whl", hash = "sha256:321ff445fbdf8ab459423ee70d41a4b9024ad0dcf1476f58c97bee6530befda8"},
+    {file = "selectolax-0.2.11-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:c4bf85eece219e6e973b227f4fa47d2c541beda2247e790e566eb21ae93e3a9a"},
+    {file = "selectolax-0.2.11-pp37-pypy37_pp73-win32.whl", hash = "sha256:81ff075b237a1379498609744d6d2e95919704e322df70d79c86bb7201797e47"},
+    {file = "selectolax-0.2.11.tar.gz", hash = "sha256:6d44a19b289f0e505bbbe481a14f24aee8bde488e8780a621c9f8b5b8618f2a9"},
 ]
 six = [
     {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index c2a05a0add81..e0a316ee7810 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -14,7 +14,7 @@ boto3 = "^1.17.53"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"
-selectolax = "^0.2.10"
+selectolax = "^0.2.11"
 PyGithub = "^1.54.1"
 
 [tool.poetry.dev-dependencies]

From 67084f1d868249a10898b2e207079e9d6f797d56 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 10:30:26 +0000
Subject: [PATCH 206/288] build(deps-dev): bump flake8 from 3.9.0 to 3.9.1 in
 /deployer (#3547)

---
 deployer/poetry.lock    | 8 ++++----
 deployer/pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 3a3869d7b70b..94a573dceac6 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -191,7 +191,7 @@ develop = ["mock", "pytest (>=3.0.0)", "pytest-cov", "pytest-mock (<3.0.0)", "py
 
 [[package]]
 name = "flake8"
-version = "3.9.0"
+version = "3.9.1"
 description = "the modular source code checker: pep8 pyflakes and co"
 category = "dev"
 optional = false
@@ -533,7 +533,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "c3b7e62423c98840b20031270acfc2351364c32c27c2286ec536a26e372658d0"
+content-hash = "e128b431424635b5d7b9e26f70adf9c99df3c9e46f5bbf81f7bdf17dde45e87d"
 
 [metadata.files]
 appdirs = [
@@ -641,8 +641,8 @@ elasticsearch-dsl = [
     {file = "elasticsearch_dsl-7.3.0-py2.py3-none-any.whl", hash = "sha256:9390d8e5cf82ebad3505e7f656e407259cf703f5a4035f211cef454127672572"},
 ]
 flake8 = [
-    {file = "flake8-3.9.0-py2.py3-none-any.whl", hash = "sha256:12d05ab02614b6aee8df7c36b97d1a3b2372761222b19b58621355e82acddcff"},
-    {file = "flake8-3.9.0.tar.gz", hash = "sha256:78873e372b12b093da7b5e5ed302e8ad9e988b38b063b61ad937f26ca58fc5f0"},
+    {file = "flake8-3.9.1-py2.py3-none-any.whl", hash = "sha256:3b9f848952dddccf635be78098ca75010f073bfe14d2c6bda867154bea728d2a"},
+    {file = "flake8-3.9.1.tar.gz", hash = "sha256:1aa8990be1e689d96c745c5682b687ea49f2e05a443aff1f8251092b0014e378"},
 ]
 idna = [
     {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index e0a316ee7810..93a10e56a7ac 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -19,7 +19,7 @@ PyGithub = "^1.54.1"
 
 [tool.poetry.dev-dependencies]
 black = "^20.8b1"
-flake8 = "^3.9.0"
+flake8 = "^3.9.1"
 pytest = "^6.2.3"
 
 [tool.poetry.scripts]

From 1b86ea6b05ed25e55ece27ce0800b4ad5acce48b Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 19 Apr 2021 09:46:19 -0400
Subject: [PATCH 207/288] Apple emoji in heading_links Flaw UI after diffs
 (#3559)

Fixes #3558
---
 client/src/document/toolbar/flaws.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/document/toolbar/flaws.tsx b/client/src/document/toolbar/flaws.tsx
index 11fa6fc03fe5..9dd340be043d 100644
--- a/client/src/document/toolbar/flaws.tsx
+++ b/client/src/document/toolbar/flaws.tsx
@@ -1023,7 +1023,7 @@ function HeadingLinks({
               {flaw.suggestion && flaw.before ? (
                 <span>
                   <b>Suggestion:</b>{" "}
-                  <ShowDiff before={flaw.before} after={flaw.suggestion} />
+                  <ShowDiff before={flaw.before} after={flaw.suggestion} />
                 </span>
               ) : (
                 <i>

From b7e3ea7ed56f490c49a390fd99dda7e3c758501f Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 19 Apr 2021 10:08:06 -0400
Subject: [PATCH 208/288] upgrade jest-puppeteer and puppeteer together (#3560)

---
 package.json |   4 +-
 yarn.lock    | 339 +++++++++++++++++++++++++++++++++++----------------
 2 files changed, 234 insertions(+), 109 deletions(-)

diff --git a/package.json b/package.json
index 58c866347dbd..69af3bb26757 100644
--- a/package.json
+++ b/package.json
@@ -136,7 +136,7 @@
     "ignore-loader": "^0.1.2",
     "jest-environment-jsdom-sixteen": "^1.0.3",
     "jest-junit-reporter": "^1.1.0",
-    "jest-puppeteer": "4.4.0",
+    "jest-puppeteer": "5.0.1",
     "jsdom": "^16.5.3",
     "jsesc": "^3.0.2",
     "nodemon": "2.0.7",
@@ -144,7 +144,7 @@
     "prettier": "2.2.1",
     "prettier-plugin-packagejson": "^2.2.10",
     "pretty-quick": "3.1.0",
-    "puppeteer": "2",
+    "puppeteer": "8.0.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-is": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index fa3ae92ef5d4..12876ecef165 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2207,7 +2207,12 @@
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06"
   integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==
 
-"@hapi/joi@^15.0.3", "@hapi/joi@^15.1.0":
+"@hapi/hoek@^9.0.0":
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131"
+  integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==
+
+"@hapi/joi@^15.1.0":
   version "15.1.1"
   resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7"
   integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==
@@ -2224,6 +2229,13 @@
   dependencies:
     "@hapi/hoek" "^8.3.0"
 
+"@hapi/topo@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.0.0.tgz#c19af8577fa393a06e9c77b60995af959be721e7"
+  integrity sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
 "@html-validate/stylish@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@html-validate/stylish/-/stylish-1.0.0.tgz#f8700775d8863e7de50564f8d3e6908a5f40ab9d"
@@ -2612,6 +2624,23 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
+"@sideway/address@^4.1.0":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.1.tgz#9e321e74310963fdf8eebfbee09c7bd69972de4d"
+  integrity sha512-+I5aaQr3m0OAmMr7RQ3fR9zx55sejEYR2BFJaxL+zT3VM2611X0SHvPWIbAUBZVTn/YzYKbV8gJ2oT/QELknfQ==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+
+"@sideway/formula@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c"
+  integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==
+
+"@sideway/pinpoint@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
+  integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
+
 "@sidvind/better-ajv-errors@^0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@sidvind/better-ajv-errors/-/better-ajv-errors-0.8.0.tgz#b173358ad318d42f779b8f7b062115968996796d"
@@ -3756,11 +3785,6 @@
   dependencies:
     "@types/braces" "*"
 
-"@types/mime-types@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73"
-  integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=
-
 "@types/minimatch@*", "@types/minimatch@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -4010,6 +4034,13 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/yauzl@^2.9.1":
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af"
+  integrity sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==
+  dependencies:
+    "@types/node" "*"
+
 "@typescript-eslint/eslint-plugin@^4.5.0":
   version "4.8.2"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.8.2.tgz#cf9102ec800391caa574f589ffe0623cca1d9308"
@@ -4366,10 +4397,12 @@ adjust-sourcemap-loader@3.0.0:
     loader-utils "^2.0.0"
     regex-parser "^2.2.11"
 
-agent-base@5:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
-  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
 
 aggregate-error@^3.0.0:
   version "3.0.1"
@@ -4854,6 +4887,13 @@ axe-core@^4.0.2, axe-core@^4.1.1:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.3.tgz#64a4c85509e0991f5168340edc4bedd1ceea6966"
   integrity sha512-vwPpH4Aj4122EW38mxO/fxhGKtwWTMLDIJfZ1He0Edbtjcfna/R3YB67yVhezUMzqc3Jr3+Ii50KRntlENL4xQ==
 
+axios@^0.21.1:
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
+  dependencies:
+    follow-redirects "^1.10.0"
+
 axobject-query@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
@@ -5129,6 +5169,11 @@ base64-js@^1.0.2:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -5254,6 +5299,15 @@ bl@^1.0.0:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
 
+bl@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 bluebird@^3.3.5, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -5522,6 +5576,14 @@ buffer@^5.2.1:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
+buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
 builtin-modules@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
@@ -6212,7 +6274,7 @@ comma-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
   integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==
 
-commander@^2.11.0, commander@^2.15.1, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1:
+commander@^2.15.1, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -6227,6 +6289,11 @@ commander@^4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
+commander@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+
 commander@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
@@ -6294,7 +6361,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.2:
+concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -6464,7 +6531,7 @@ core-js-pure@^3.8.2:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.10.1.tgz#28642697dfcf02e0fd9f4d9891bd03a22df28ecf"
   integrity sha512-PeyJH2SE0KuxY5eCGNWA+W+CeDpB6M1PN3S7Am7jSv/Ttuxz2SnWbIiVQOn/TDaGaGtxo8CRWHkXwJscbUHtVw==
 
-core-js@^2.4.0, core-js@^2.6.5:
+core-js@^2.4.0:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
@@ -6984,7 +7051,7 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -7308,6 +7375,11 @@ detect-port@^1.3.0:
     address "^1.0.1"
     debug "^2.6.0"
 
+devtools-protocol@0.0.854822:
+  version "0.0.854822"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.854822.tgz#eac3a5260a6b3b4e729a09fdc0c77b0d322e777b"
+  integrity sha512-xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg==
+
 diagnostics@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
@@ -7726,7 +7798,7 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -8394,10 +8466,10 @@ expand-tilde@^1.2.2:
   dependencies:
     os-homedir "^1.0.1"
 
-expect-puppeteer@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/expect-puppeteer/-/expect-puppeteer-4.4.0.tgz#1c948af08acdd6c8cbdb7f90e617f44d86888886"
-  integrity sha512-6Ey4Xy2xvmuQu7z7YQtMsaMV0EHJRpVxIDOd5GRrm04/I3nkTKIutELfECsLp6le+b3SSa3cXhPiw6PgqzxYWA==
+expect-puppeteer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/expect-puppeteer/-/expect-puppeteer-5.0.0.tgz#e4a61bb91e3bba58030d8d66a87e5b67bb2898a9"
+  integrity sha512-yMzVgFfPN0GOD7YMvs9hHsf9YxRg7SrcHqENxkgznoqtRBUZDdSmUte3osJ0LpLIb+9TXP5YUbCbOj7HmCl6EQ==
 
 expect@^26.6.0, expect@^26.6.2:
   version "26.6.2"
@@ -8512,15 +8584,16 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-zip@^1.6.6:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
+extract-zip@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
   dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
+    debug "^4.1.1"
+    get-stream "^5.1.0"
     yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
 
 extsprintf@1.3.0:
   version "1.3.0"
@@ -8834,14 +8907,14 @@ find-pkg@^0.1.2:
   dependencies:
     find-file-up "^0.1.2"
 
-find-process@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/find-process/-/find-process-1.4.3.tgz#25f9105dc32e42abad4636752c37c51cd57dce45"
-  integrity sha512-+IA+AUsQCf3uucawyTwMWcY+2M3FXq3BRvw3S+j5Jvydjk31f/+NPWpYZOJs+JUs2GvxH4Yfr6Wham0ZtRLlPA==
+find-process@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/find-process/-/find-process-1.4.4.tgz#52820561162fda0d1feef9aed5d56b3787f0fd6e"
+  integrity sha512-rRSuT1LE4b+BFK588D2V8/VG9liW0Ark1XJgroxZXI0LtwmQJOb490DvDYvbm+Hek9ETFzTutGfJ90gumITPhQ==
   dependencies:
-    chalk "^2.0.1"
-    commander "^2.11.0"
-    debug "^2.6.8"
+    chalk "^4.0.0"
+    commander "^5.1.0"
+    debug "^4.1.1"
 
 find-root@^1.1.0:
   version "1.1.0"
@@ -8936,6 +9009,11 @@ follow-redirects@^1.0.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
   integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
 
+follow-redirects@^1.10.0:
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267"
+  integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==
+
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@@ -10284,12 +10362,12 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
-  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
   dependencies:
-    agent-base "5"
+    agent-base "6"
     debug "4"
 
 human-signals@^1.1.1:
@@ -11411,18 +11489,18 @@ jest-config@^26.6.3:
     micromatch "^4.0.2"
     pretty-format "^26.6.2"
 
-jest-dev-server@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/jest-dev-server/-/jest-dev-server-4.4.0.tgz#557113faae2877452162696aa94c1e44491ab011"
-  integrity sha512-STEHJ3iPSC8HbrQ3TME0ozGX2KT28lbT4XopPxUm2WimsX3fcB3YOptRh12YphQisMhfqNSNTZUmWyT3HEXS2A==
+jest-dev-server@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/jest-dev-server/-/jest-dev-server-5.0.0.tgz#904ff0525715b8268d817a07d6ce942ce70d06b2"
+  integrity sha512-PUgOwr/XT+KUJG+bMjifSWwswQXhh92wMPGnkFZiHtWkc2IcdCCykRLkoFSKCKWPveuGDOa7ZKVoUgn0+S4wew==
   dependencies:
-    chalk "^3.0.0"
+    chalk "^4.1.0"
     cwd "^0.10.0"
-    find-process "^1.4.3"
-    prompts "^2.3.0"
-    spawnd "^4.4.0"
+    find-process "^1.4.4"
+    prompts "^2.4.1"
+    spawnd "^5.0.0"
     tree-kill "^1.2.2"
-    wait-on "^3.3.0"
+    wait-on "^5.3.0"
 
 jest-diff@^26.0.0, jest-diff@^26.6.2:
   version "26.6.2"
@@ -11487,15 +11565,16 @@ jest-environment-node@^26.6.2:
     jest-mock "^26.6.2"
     jest-util "^26.6.2"
 
-jest-environment-puppeteer@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-puppeteer/-/jest-environment-puppeteer-4.4.0.tgz#d82a37e0e0c51b63cc6b15dea101d53967508860"
-  integrity sha512-iV8S8+6qkdTM6OBR/M9gKywEk8GDSOe05hspCs5D8qKSwtmlUfdtHfB4cakdc68lC6YfK3AUsLirpfgodCHjzQ==
+jest-environment-puppeteer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-puppeteer/-/jest-environment-puppeteer-5.0.1.tgz#dc520fca625de054876181304b57c0f5879372e8"
+  integrity sha512-OtSNz3YOkhEGdQ02AQk1t9EbN9TcU7rbPRkcJeRj9RgwXlm5O9ijZIwi8ASd7tLKxddykdF+s8JPhynyDnLHOg==
   dependencies:
-    chalk "^3.0.0"
+    chalk "^4.1.0"
     cwd "^0.10.0"
-    jest-dev-server "^4.4.0"
-    merge-deep "^3.0.2"
+    jest-dev-server "^5.0.0"
+    jest-environment-node "^26.6.2"
+    merge-deep "^3.0.3"
 
 jest-get-type@^26.3.0:
   version "26.3.0"
@@ -11621,13 +11700,13 @@ jest-pnp-resolver@^1.2.2:
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-puppeteer@4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/jest-puppeteer/-/jest-puppeteer-4.4.0.tgz#4b906e638a5e3782ed865e7b673c82047b85952e"
-  integrity sha512-ZaiCTlPZ07B9HW0erAWNX6cyzBqbXMM7d2ugai4epBDKpKvRDpItlRQC6XjERoJELKZsPziFGS0OhhUvTvQAXA==
+jest-puppeteer@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/jest-puppeteer/-/jest-puppeteer-5.0.1.tgz#eaa2c38024f6e30b715a953b08ceb19960d04af3"
+  integrity sha512-PH0jpKgVoVqDGWZdFRG0vI/lOmsqYU8fjtJw+7U3UL6lOWkY7BNfFmE7fTlevF/IhYrRqJfeg0l1tmUGA9ck/w==
   dependencies:
-    expect-puppeteer "^4.4.0"
-    jest-environment-puppeteer "^4.4.0"
+    expect-puppeteer "^5.0.0"
+    jest-environment-puppeteer "^5.0.1"
 
 jest-regex-util@^26.0.0:
   version "26.0.0"
@@ -11856,6 +11935,17 @@ jest@26.6.0:
     import-local "^3.0.2"
     jest-cli "^26.6.0"
 
+joi@^17.3.0:
+  version "17.4.0"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-17.4.0.tgz#b5c2277c8519e016316e49ababd41a1908d9ef20"
+  integrity sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==
+  dependencies:
+    "@hapi/hoek" "^9.0.0"
+    "@hapi/topo" "^5.0.0"
+    "@sideway/address" "^4.1.0"
+    "@sideway/formula" "^3.0.0"
+    "@sideway/pinpoint" "^2.0.0"
+
 js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -12870,10 +12960,10 @@ meow@^9.0.0:
     type-fest "^0.18.0"
     yargs-parser "^20.2.3"
 
-merge-deep@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.2.tgz#f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2"
-  integrity sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==
+merge-deep@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.3.tgz#1a2b2ae926da8b2ae93a0ac15d90cd1922766003"
+  integrity sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==
   dependencies:
     arr-union "^3.1.0"
     clone-deep "^0.2.4"
@@ -13005,7 +13095,7 @@ mime-db@1.44.0, "mime-db@>= 1.43.0 < 2", mime-db@^1.28.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
   integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
 
-mime-types@^2.1.12, mime-types@^2.1.25, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
   version "2.1.27"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
   integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
@@ -13017,7 +13107,7 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.0.3, mime@^2.4.4:
+mime@^2.4.4:
   version "2.4.6"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
   integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
@@ -13160,7 +13250,12 @@ mixin-object@^2.0.1:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
-mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1:
+mkdirp-classic@^0.5.2:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
+  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
+
+mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -15298,7 +15393,7 @@ prompts@2.4.0:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prompts@^2.0.0, prompts@^2.0.1, prompts@^2.3.0, prompts@^2.4.0:
+prompts@^2.0.0, prompts@^2.0.1, prompts@^2.4.0, prompts@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61"
   integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==
@@ -15335,7 +15430,7 @@ proxy-addr@~2.0.5:
     forwarded "~0.1.2"
     ipaddr.js "1.9.1"
 
-proxy-from-env@^1.0.0:
+proxy-from-env@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
@@ -15419,21 +15514,23 @@ pupa@^2.0.1:
   dependencies:
     escape-goat "^2.0.0"
 
-puppeteer@2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.1.1.tgz#ccde47c2a688f131883b50f2d697bd25189da27e"
-  integrity sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==
+puppeteer@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-8.0.0.tgz#a236669118aa795331c2d0ca19877159e7664705"
+  integrity sha512-D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ==
   dependencies:
-    "@types/mime-types" "^2.1.0"
     debug "^4.1.0"
-    extract-zip "^1.6.6"
-    https-proxy-agent "^4.0.0"
-    mime "^2.0.3"
-    mime-types "^2.1.25"
+    devtools-protocol "0.0.854822"
+    extract-zip "^2.0.0"
+    https-proxy-agent "^5.0.0"
+    node-fetch "^2.6.1"
+    pkg-dir "^4.2.0"
     progress "^2.0.1"
-    proxy-from-env "^1.0.0"
-    rimraf "^2.6.1"
-    ws "^6.1.0"
+    proxy-from-env "^1.1.0"
+    rimraf "^3.0.2"
+    tar-fs "^2.0.0"
+    unbzip2-stream "^1.3.3"
+    ws "^7.2.3"
 
 q@^1.1.2:
   version "1.5.1"
@@ -15943,7 +16040,7 @@ read-pkg@^5.2.0:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.6.0:
+readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -16359,7 +16456,7 @@ request-promise-native@^1.0.9:
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.88.0, request@^2.88.2:
+request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -16560,7 +16657,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -16644,11 +16741,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rx@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
-  integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
-
 rxjs@^6.4.0, rxjs@^6.6.6:
   version "6.6.6"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.6.tgz#14d8417aa5a07c5e633995b525e1e3c0dec03b70"
@@ -16656,6 +16748,13 @@ rxjs@^6.4.0, rxjs@^6.6.6:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.6.3:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@*, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -17242,15 +17341,15 @@ space-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899"
   integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==
 
-spawnd@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/spawnd/-/spawnd-4.4.0.tgz#bb52c5b34a22e3225ae1d3acb873b2cd58af0886"
-  integrity sha512-jLPOfB6QOEgMOQY15Z6+lwZEhH3F5ncXxIaZ7WHPIapwNNLyjrs61okj3VJ3K6tmP5TZ6cO0VAu9rEY4MD4YQg==
+spawnd@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/spawnd/-/spawnd-5.0.0.tgz#ea72200bdc468998e84e1c3e7b914ce85fc1c32c"
+  integrity sha512-28+AJr82moMVWolQvlAIv3JcYDkjkFTEmfDc503wxrF5l2rQ3dFz6DpbXp3kD4zmgGGldfM4xM4v1sFj/ZaIOA==
   dependencies:
     exit "^0.1.2"
-    signal-exit "^3.0.2"
+    signal-exit "^3.0.3"
     tree-kill "^1.2.2"
-    wait-port "^0.2.7"
+    wait-port "^0.2.9"
 
 spdx-correct@^3.0.0:
   version "3.1.1"
@@ -17956,6 +18055,16 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
+tar-fs@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
+  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
+  dependencies:
+    chownr "^1.1.1"
+    mkdirp-classic "^0.5.2"
+    pump "^3.0.0"
+    tar-stream "^2.1.4"
+
 tar-stream@^1.5.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
@@ -17969,6 +18078,17 @@ tar-stream@^1.5.2:
     to-buffer "^1.1.1"
     xtend "^4.0.0"
 
+tar-stream@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
 tar@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.2.tgz#5df17813468a6264ff14f766886c622b84ae2f39"
@@ -18514,7 +18634,7 @@ typescript@^4.2.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
   integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
 
-unbzip2-stream@^1.0.9:
+unbzip2-stream@^1.0.9, unbzip2-stream@^1.3.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
   integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
@@ -19020,18 +19140,18 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
-wait-on@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-3.3.0.tgz#9940981d047a72a9544a97b8b5fca45b2170a082"
-  integrity sha512-97dEuUapx4+Y12aknWZn7D25kkjMk16PbWoYzpSdA8bYpVfS6hpl2a2pOWZ3c+Tyt3/i4/pglyZctG3J4V1hWQ==
+wait-on@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-5.3.0.tgz#584e17d4b3fe7b46ac2b9f8e5e102c005c2776c7"
+  integrity sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==
   dependencies:
-    "@hapi/joi" "^15.0.3"
-    core-js "^2.6.5"
-    minimist "^1.2.0"
-    request "^2.88.0"
-    rx "^4.1.0"
+    axios "^0.21.1"
+    joi "^17.3.0"
+    lodash "^4.17.21"
+    minimist "^1.2.5"
+    rxjs "^6.6.3"
 
-wait-port@^0.2.7:
+wait-port@^0.2.9:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/wait-port/-/wait-port-0.2.9.tgz#3905cf271b5dbe37a85c03b85b418b81cb24ee55"
   integrity sha512-hQ/cVKsNqGZ/UbZB/oakOGFqic00YAMM5/PEj3Bt4vKarv2jWIWzDbqlwT94qMs/exAQAsvMOq99sZblV92zxQ==
@@ -19658,13 +19778,18 @@ write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@^6.1.0, ws@^6.2.1:
+ws@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
   integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
   dependencies:
     async-limiter "~1.0.0"
 
+ws@^7.2.3:
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
+  integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
+
 ws@^7.4.4:
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz#383bc9742cb202292c9077ceab6f6047b17f2d59"

From 27c91e9503756fc3de91451da0e510d7f6bbfc98 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 19 Apr 2021 19:32:27 -0400
Subject: [PATCH 209/288] Remove <p class="hidden"> from the interactive
 examples (#3566)

Fixes #3563
---
 kumascript/macros/EmbedInteractiveExample.ejs |  2 --
 .../macros/EmbedInteractiveExample.test.js    | 26 +++++--------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/kumascript/macros/EmbedInteractiveExample.ejs b/kumascript/macros/EmbedInteractiveExample.ejs
index f0086e872fff..dcd70c775c31 100644
--- a/kumascript/macros/EmbedInteractiveExample.ejs
+++ b/kumascript/macros/EmbedInteractiveExample.ejs
@@ -21,5 +21,3 @@ if ($1) {
 
 %>
 <iframe class="<%= iClass %>" width="100%" height="250" src="<%= url %>" title="MDN Web Docs Interactive Example"></iframe>
-
-<p class="hidden">The source for this interactive example is stored in a GitHub repository. If you'd like to contribute to the interactive examples project, please clone <a href="https://github.com/mdn/interactive-examples">https://github.com/mdn/interactive-examples</a> and send us a pull request.</p>
diff --git a/kumascript/tests/macros/EmbedInteractiveExample.test.js b/kumascript/tests/macros/EmbedInteractiveExample.test.js
index 5e4a04c3c040..3c96e3570bd1 100644
--- a/kumascript/tests/macros/EmbedInteractiveExample.test.js
+++ b/kumascript/tests/macros/EmbedInteractiveExample.test.js
@@ -3,8 +3,6 @@
  */
 const { assert, itMacro, describeMacro } = require("./utils");
 
-const extraHiddenTag = `<p class="hidden">The source for this interactive example is stored in a GitHub repository. If you'd like to contribute to the interactive examples project, please clone <a href="https://github.com/mdn/interactive-examples">https://github.com/mdn/interactive-examples</a> and send us a pull request.</p>`;
-
 describeMacro("EmbedInteractiveExample", function () {
   itMacro("Typical settings and argument", function (macro) {
     macro.ctx.env.interactive_examples = {
@@ -12,9 +10,7 @@ describeMacro("EmbedInteractiveExample", function () {
     };
     return assert.eventually.equal(
       macro.call("pages/css/animation.html"),
-      `<iframe class="interactive" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/css/animation.html" title="MDN Web Docs Interactive Example"></iframe>
-
-${extraHiddenTag}`
+      '<iframe class="interactive" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/css/animation.html" title="MDN Web Docs Interactive Example"></iframe>'
     );
   });
   itMacro("Changes in settings and argument are reflected", function (macro) {
@@ -23,9 +19,7 @@ ${extraHiddenTag}`
     };
     return assert.eventually.equal(
       macro.call("pages/http/headers.html"),
-      `<iframe class="interactive" width="100%" height="250" src="https://www.fleetwood-mac.com/pages/http/headers.html" title="MDN Web Docs Interactive Example"></iframe>
-
-${extraHiddenTag}`
+      '<iframe class="interactive" width="100%" height="250" src="https://www.fleetwood-mac.com/pages/http/headers.html" title="MDN Web Docs Interactive Example"></iframe>'
     );
   });
   itMacro(
@@ -36,9 +30,7 @@ ${extraHiddenTag}`
       };
       return assert.eventually.equal(
         macro.call("/pages/css/animation.html"),
-        `<iframe class="interactive" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/css/animation.html" title="MDN Web Docs Interactive Example"></iframe>
-
-${extraHiddenTag}`
+        '<iframe class="interactive" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/css/animation.html" title="MDN Web Docs Interactive Example"></iframe>'
       );
     }
   );
@@ -48,9 +40,7 @@ ${extraHiddenTag}`
     };
     return assert.eventually.equal(
       macro.call("pages/js/expressions-conditionaloperators.html"),
-      `<iframe class="interactive interactive-js" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/js/expressions-conditionaloperators.html" title="MDN Web Docs Interactive Example"></iframe>
-
-${extraHiddenTag}`
+      '<iframe class="interactive interactive-js" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/js/expressions-conditionaloperators.html" title="MDN Web Docs Interactive Example"></iframe>'
     );
   });
   itMacro("An extra class can be passed as an argument", function (macro) {
@@ -59,9 +49,7 @@ ${extraHiddenTag}`
     };
     return assert.eventually.equal(
       macro.call("pages/http/headers.html", "extra"),
-      `<iframe class="interactive extra" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/http/headers.html" title="MDN Web Docs Interactive Example"></iframe>
-
-${extraHiddenTag}`
+      '<iframe class="interactive extra" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/http/headers.html" title="MDN Web Docs Interactive Example"></iframe>'
     );
   });
   itMacro("Javascript pages can also add an extra class", function (macro) {
@@ -70,9 +58,7 @@ ${extraHiddenTag}`
     };
     return assert.eventually.equal(
       macro.call("pages/js/expressions-conditionaloperators.html", "bigger"),
-      `<iframe class="interactive interactive-js bigger" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/js/expressions-conditionaloperators.html" title="MDN Web Docs Interactive Example"></iframe>
-
-${extraHiddenTag}`
+      '<iframe class="interactive interactive-js bigger" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/js/expressions-conditionaloperators.html" title="MDN Web Docs Interactive Example"></iframe>'
     );
   });
 });

From 50f0b2812cebc413a543312d1c33cca2f4eb2c49 Mon Sep 17 00:00:00 2001
From: potappo <potappo@gmail.com>
Date: Tue, 20 Apr 2021 09:00:31 +0900
Subject: [PATCH 210/288] fix locale part in Glossaly macro (#3542)

* fix locale part in Glossaly macro

* use web.smartLink() in Glossary macro

* Update kumascript/macros/Glossary.ejs

let to const

Co-authored-by: Ryan Johnson <escattone@gmail.com>

Co-authored-by: Ryan Johnson <escattone@gmail.com>
---
 kumascript/macros/Glossary.ejs | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/kumascript/macros/Glossary.ejs b/kumascript/macros/Glossary.ejs
index 6219e81bf761..01f081130de0 100644
--- a/kumascript/macros/Glossary.ejs
+++ b/kumascript/macros/Glossary.ejs
@@ -8,18 +8,7 @@
 
 let str = $1 || $0;
 
-let URL = "/en-US/docs/Glossary/";
-URL += $0.replace(/\s+/g,'_');
-
-if (env.locale !== "en-US") {
-    let page = await wiki.getPage(URL);
-    if (page && page.translations) {
-        for(let translation of page.translations) {
-            if (translation.locale === env.locale) {
-                URL = translation.url;
-            }
-        }
-    }
-}
-
-%><a href="<%- URL %>"><%= str %></a>
+const basePath = `/${env.locale}/docs/Glossary/`;
+const subPath = $0.replace(/\s+/g,'_');
+const link = web.smartLink(basePath + subPath, null, str, subPath, basePath);
+%><%- link %>

From 85addc49b46c15a2e339643bf102eeb7cc9b35df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 05:45:27 +0000
Subject: [PATCH 211/288] build(deps-dev): bump sass from 1.32.10 to 1.32.11
 (#3568)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 69af3bb26757..4a4bdc28e345 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "react-router-dom": "6.0.0-beta.0",
     "react-scripts": "4.0.3",
     "rough-notation": "0.5.1",
-    "sass": "^1.32.10",
+    "sass": "^1.32.11",
     "stylelint": "^13.12.0",
     "stylelint-a11y": "^1.2.3",
     "stylelint-config-prettier": "^8.0.2",
diff --git a/yarn.lock b/yarn.lock
index 12876ecef165..18fc2f178c2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16820,10 +16820,10 @@ sass-loader@^10.0.5:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sass@^1.32.10:
-  version "1.32.10"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.10.tgz#d40da4e20031b450359ee1c7e69bc8cc89569241"
-  integrity sha512-Nx0pcWoonAkn7CRp0aE/hket1UP97GiR1IFw3kcjV3pnenhWgZEWUf0ZcfPOV2fK52fnOcK3JdC/YYZ9E47DTQ==
+sass@^1.32.11:
+  version "1.32.11"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.11.tgz#b236b3ea55c76602c2ef2bd0445f0db581baa218"
+  integrity sha512-O9tRcob/fegUVSIV1ihLLZcftIOh0AF1VpKgusUfLqnb2jQ0GLDwI5ivv1FYWivGv8eZ/AwntTyTzjcHu0c/qw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
 

From 44c583f5ff1d40f244cc9c1c2d27f15ea537da99 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 20 Apr 2021 08:20:28 -0400
Subject: [PATCH 212/288] refactor the Document.findAll() function (#3537)

* refactor the Document.findAll() function

* more refactoring

* cleaning up

* adding a very simply unit test

* adding .withErrors() to avoid error swallowing

* feedbacked
---
 content/document.js      | 171 ++++++++++++++++++++++++---------------
 content/document.test.js |  58 +++++++++++++
 package.json             |   2 +
 yarn.lock                |  20 ++++-
 4 files changed, 184 insertions(+), 67 deletions(-)
 create mode 100644 content/document.test.js

diff --git a/content/document.js b/content/document.js
index de51d9551785..981a08fb5dba 100644
--- a/content/document.js
+++ b/content/document.js
@@ -4,6 +4,7 @@ const path = require("path");
 const fm = require("front-matter");
 const glob = require("glob");
 const yaml = require("js-yaml");
+const { fdir } = require("fdir");
 
 const {
   CONTENT_ARCHIVED_ROOT,
@@ -197,32 +198,66 @@ function unarchive(document, move) {
   return created;
 }
 
-const read = memoize((folder) => {
+const read = memoize((folderOrFilePath) => {
   let filePath = null;
+  let folder = null;
   let root = null;
   let isMarkdown = false;
+  let locale = null;
 
-  for (const possibleRoot of ROOTS) {
-    const possibleHTMLFilePath = path.join(possibleRoot, getHTMLPath(folder));
-    if (fs.existsSync(possibleHTMLFilePath)) {
-      root = possibleRoot;
-      filePath = possibleHTMLFilePath;
-      break;
+  if (fs.existsSync(folderOrFilePath)) {
+    filePath = folderOrFilePath;
+
+    // It exists, but it is sane?
+    if (
+      !(
+        filePath.endsWith(HTML_FILENAME) || filePath.endsWith(MARKDOWN_FILENAME)
+      )
+    ) {
+      throw new Error(`'${filePath}' is not a HTML or Markdown file.`);
     }
-    const possibleMarkdownFilePath = path.join(
-      possibleRoot,
-      getMarkdownPath(folder)
-    );
-    if (fs.existsSync(possibleMarkdownFilePath)) {
-      root = possibleRoot;
-      filePath = possibleMarkdownFilePath;
-      isMarkdown = true;
-      break;
+
+    root = ROOTS.find((possibleRoot) => filePath.startsWith(possibleRoot));
+    if (root) {
+      folder = filePath
+        .replace(root + path.sep, "")
+        .replace(path.sep + HTML_FILENAME, "")
+        .replace(path.sep + MARKDOWN_FILENAME, "");
+      locale = extractLocale(filePath.replace(root + path.sep, ""));
+    } else {
+      // The file exists but it doesn't appear to belong to any of our roots.
+      // That could happen if you pass in a file that is something completely
+      // different not a valid file anyway.
+      throw new Error(
+        `'${filePath}' does not appear to exist in any known content roots.`
+      );
     }
+  } else {
+    folder = folderOrFilePath;
+    for (const possibleRoot of ROOTS) {
+      const possibleHTMLFilePath = path.join(possibleRoot, getHTMLPath(folder));
+      if (fs.existsSync(possibleHTMLFilePath)) {
+        root = possibleRoot;
+        filePath = possibleHTMLFilePath;
+        break;
+      }
+      const possibleMarkdownFilePath = path.join(
+        possibleRoot,
+        getMarkdownPath(folder)
+      );
+      if (fs.existsSync(possibleMarkdownFilePath)) {
+        root = possibleRoot;
+        filePath = possibleMarkdownFilePath;
+        isMarkdown = true;
+        break;
+      }
+    }
+    if (!filePath) {
+      return;
+    }
+    locale = extractLocale(folder);
   }
-  if (!filePath) {
-    return;
-  }
+
   if (filePath.includes(" ")) {
     throw new Error("Folder contains whitespace which is not allowed.");
   }
@@ -263,7 +298,6 @@ const read = memoize((folder) => {
     bodyBegin: frontMatterOffset,
   } = fm(rawContent);
 
-  const locale = extractLocale(folder);
   const url = `/${locale}/docs/${metadata.slug}`;
 
   const isActive = !isArchive && ACTIVE_LOCALES.has(locale.toLowerCase());
@@ -408,9 +442,13 @@ function findAll({
   folderSearch = null,
   locales = new Map(),
 } = {}) {
-  if (!(files instanceof Set)) throw new TypeError("'files' not a Set");
-  if (folderSearch && typeof folderSearch !== "string")
+  if (!(files instanceof Set)) {
+    throw new TypeError("'files' not a Set");
+  }
+  if (folderSearch && typeof folderSearch !== "string") {
     throw new TypeError("'folderSearch' not a string");
+  }
+  const folderSearchRegExp = folderSearch ? new RegExp(folderSearch) : null;
 
   const filePaths = [];
   const roots = [];
@@ -422,54 +460,55 @@ function findAll({
   }
   roots.push(CONTENT_ROOT);
   for (const root of roots) {
-    const searchPattern = [""];
-    if (locales.size) {
-      const localePrefixes = [];
-      for (const [locale, include] of locales) {
-        if (!include) {
-          throw new Error("ability to exclude locales is not supported yet");
+    const api = new fdir()
+      .withFullPaths()
+      .withErrors()
+      .filter((filePath) => {
+        // Exit early if it's not a sane kind of file we expect
+        if (
+          !(
+            filePath.endsWith(HTML_FILENAME) ||
+            filePath.endsWith(MARKDOWN_FILENAME)
+          )
+        ) {
+          return false;
         }
-        localePrefixes.push(locale);
-      }
-      searchPattern.push(`+(${localePrefixes.join("|")})`);
-    }
-    searchPattern.push("**");
-    searchPattern.push("index.{html,md}");
-    filePaths.push(
-      ...glob
-        .sync(searchPattern.join(path.sep), { root })
-        .filter((filePath) => {
-          // The 'files' set is either a list of absolute full paths or a
-          // list of endings.
-          // Why endings? Because it's highly useful when you use git and the
-          // filepath might be relative to the git repo root.
-          if (files.size) {
-            if (files.has(filePath)) {
-              return true;
-            }
-            for (const fp of files) {
-              if (filePath.endsWith(fp)) {
-                return true;
-              }
-            }
+
+        if (locales.size) {
+          const locale = filePath.replace(root, "").split("/")[1];
+          if (!locales.get(locale)) {
             return false;
           }
-          if (folderSearch) {
-            return (
-              filePath
-                .replace(CONTENT_ROOT, "")
-                .replace(CONTENT_TRANSLATED_ROOT, "")
-                .replace(HTML_FILENAME, "")
-                .replace(MARKDOWN_FILENAME, "")
-                .search(new RegExp(folderSearch)) !== -1
-            );
+        }
+
+        // The 'files' set is either a list of absolute full paths or a
+        // list of endings.
+        // Why endings? Because it's highly useful when you use git and the
+        // filepath might be relative to the git repo root.
+        if (files.size) {
+          if (files.has(filePath)) {
+            return true;
           }
-          return true;
-        })
-        .map((filePath) => {
-          return path.relative(root, path.dirname(filePath));
-        })
-    );
+          for (const fp of files) {
+            if (filePath.endsWith(fp)) {
+              return true;
+            }
+          }
+          return false;
+        }
+
+        if (folderSearchRegExp) {
+          const pure = filePath
+            .replace(root + path.sep, "")
+            .replace(HTML_FILENAME, "")
+            .replace(MARKDOWN_FILENAME, "");
+          return pure.search(folderSearchRegExp) !== -1;
+        }
+
+        return true;
+      })
+      .crawl(root);
+    filePaths.push(...api.sync());
   }
   return {
     count: filePaths.length,
diff --git a/content/document.test.js b/content/document.test.js
new file mode 100644
index 000000000000..e8a63ddce1aa
--- /dev/null
+++ b/content/document.test.js
@@ -0,0 +1,58 @@
+const fs = require("fs");
+const path = require("path");
+
+const Document = require("./document");
+
+describe("Document.findAll()", () => {
+  it("should always return files that exist", () => {
+    const filePaths = [...Document.findAll().iter({ pathOnly: true })];
+    expect(filePaths.every((value) => fs.existsSync(value))).toBeTruthy();
+  });
+
+  it("all files should be either index.html or index.md", () => {
+    const filePaths = [...Document.findAll().iter({ pathOnly: true })];
+    expect(
+      filePaths.every(
+        (value) => value.endsWith("index.html") || value.endsWith("index.md")
+      )
+    ).toBeTruthy();
+  });
+
+  it("searching by specific file", () => {
+    const filePaths = [...Document.findAll().iter({ pathOnly: true })];
+    const randomFile = filePaths[Math.floor(Math.random() * filePaths.length)];
+    const specificFilePaths = [
+      ...Document.findAll({ files: new Set([randomFile]) }).iter({
+        pathOnly: true,
+      }),
+    ];
+    expect(specificFilePaths.length).toBe(1);
+    expect(specificFilePaths[0]).toBe(randomFile);
+  });
+
+  it("searching by specific locales", () => {
+    const specificFilePaths = [
+      ...Document.findAll({ locales: new Map([["fr", true]]) }).iter({
+        pathOnly: true,
+      }),
+    ];
+    expect(
+      specificFilePaths.every((filePath) =>
+        filePath.includes(`${path.sep}fr${path.sep}`)
+      )
+    ).toBeTruthy();
+  });
+
+  it("searching by specific folders", () => {
+    const specificFilePaths = [
+      ...Document.findAll({ folderSearch: "/foo/" }).iter({
+        pathOnly: true,
+      }),
+    ];
+    expect(
+      specificFilePaths.every((filePath) =>
+        filePath.includes(`${path.sep}foo${path.sep}`)
+      )
+    ).toBeTruthy();
+  });
+});
diff --git a/package.json b/package.json
index 4a4bdc28e345..81bed0e54c68 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "ejs": "3.1.6",
     "express": "4.17.1",
     "fast-xml-parser": "3.19.0",
+    "fdir": "5.0.0",
     "file-type": "16.3.0",
     "front-matter": "^4.0.2",
     "fs-extra": "9.1.0",
@@ -117,6 +118,7 @@
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.3",
     "babel-loader": "8.1.0",
+    "benchmark": "2.1.4",
     "braces": "^3.0.2",
     "cross-env": "^7.0.3",
     "diff": "^5.0.0",
diff --git a/yarn.lock b/yarn.lock
index 18fc2f178c2a..24a0381a27d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5204,6 +5204,14 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+benchmark@2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629"
+  integrity sha1-CfPeMckWQl1JjMLuVloOvzwqVik=
+  dependencies:
+    lodash "^4.17.4"
+    platform "^1.3.3"
+
 better-opn@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-2.1.1.tgz#94a55b4695dc79288f31d7d0e5f658320759f7c6"
@@ -8704,6 +8712,11 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
+fdir@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-5.0.0.tgz#a40b5d9adfb530daeca55558e8ad87ec14a44769"
+  integrity sha512-cteqwWMA43lEmgwOg5HSdvhVFD39vHjQDhZkRMlKmeoNPtSSgUw1nUypydiY2upMdGiBFBZvNBDbnoBh0yCzaQ==
+
 fecha@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.0.tgz#3ffb6395453e3f3efff850404f0a59b6747f5f41"
@@ -12465,7 +12478,7 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.15, "lodash@>=3.5 <5", lodash@>=4.17.15, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.7.0:
+lodash@4.17.15, "lodash@>=3.5 <5", lodash@>=4.17.15, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.0:
   version "4.17.19"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
   integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
@@ -14458,6 +14471,11 @@ pkg-up@3.1.0:
   dependencies:
     find-up "^3.0.0"
 
+platform@^1.3.3:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
+  integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
+
 please-upgrade-node@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"

From bede4bcf390a24af2f602cb8560e7dd864f2b204 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 20 Apr 2021 09:08:30 -0400
Subject: [PATCH 213/288] Remove injectInPageCallout() (#3570)

Fixes #3569
---
 build/index.js | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/build/index.js b/build/index.js
index bba30844ba4a..53d67b61d38a 100644
--- a/build/index.js
+++ b/build/index.js
@@ -154,17 +154,6 @@ function postProcessSmallerHeadingIDs($) {
   });
 }
 
-/**
- * Find all `in-page-callout` div elements and rewrite
- * to be just `callout`, no more need to mark them as `webdev`
- * @param {Cheerio document instance} $
- */
-function injectInPageCallout($) {
-  $("div.in-page-callout")
-    .addClass("callout")
-    .removeClass("in-page-callout webdev");
-}
-
 /**
  * Find all `<div class="warning">` and turn them into `<div class="warning notecard">`
  * and keep in mind that if it was already been manually fixed so, you
@@ -453,14 +442,6 @@ async function buildDocument(document, documentOptions = {}) {
   // the old
   postProcessSmallerHeadingIDs($);
 
-  // All content that uses `<div class="in-page-callout">` needs to
-  // become `<div class="callout">`
-  // Some day, we can hopefully do a mass search-and-replace so we never
-  // need to do this code here.
-  // We might want to delete this injection in 2021 some time when all content's
-  // raw HTML has been fixed to always have it in there already.
-  injectInPageCallout($);
-
   // All content that uses `<div class="warning">` needs to become
   // `<div class="warning notecard">` instead.
   // Some day, we can hopefully do a mass search-and-replace so we never

From 170321f987794da096977affa76eb20b5bdbc73e Mon Sep 17 00:00:00 2001
From: Gregor <gregorwbr@gmail.com>
Date: Tue, 20 Apr 2021 16:26:16 +0200
Subject: [PATCH 214/288] Separate flaw checks and small refactorings (#3555)

* separate flaw checks and minor refactorings

* feedbacked

* move out section flaws
---
 build/flaws.js                 | 938 ---------------------------------
 build/flaws/bad-bcd-queries.js |  28 +
 build/flaws/broken-links.js    | 250 +++++++++
 build/flaws/heading-links.js   |  62 +++
 build/flaws/index.js           | 360 +++++++++++++
 build/flaws/pre-tags.js        | 105 ++++
 build/flaws/sections.js        |  19 +
 build/flaws/unsafe-html.js     | 110 ++++
 8 files changed, 934 insertions(+), 938 deletions(-)
 delete mode 100644 build/flaws.js
 create mode 100644 build/flaws/bad-bcd-queries.js
 create mode 100644 build/flaws/broken-links.js
 create mode 100644 build/flaws/heading-links.js
 create mode 100644 build/flaws/index.js
 create mode 100644 build/flaws/pre-tags.js
 create mode 100644 build/flaws/sections.js
 create mode 100644 build/flaws/unsafe-html.js

diff --git a/build/flaws.js b/build/flaws.js
deleted file mode 100644
index 46f9d4c0372c..000000000000
--- a/build/flaws.js
+++ /dev/null
@@ -1,938 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-
-const chalk = require("chalk");
-const got = require("got");
-const FileType = require("file-type");
-const imagemin = require("imagemin");
-const imageminPngquant = require("imagemin-pngquant");
-const imageminMozjpeg = require("imagemin-mozjpeg");
-const imageminGifsicle = require("imagemin-gifsicle");
-const imageminSvgo = require("imagemin-svgo");
-const sanitizeFilename = require("sanitize-filename");
-
-const { Archive, Document, Redirect, Image } = require("../content");
-const { FLAW_LEVELS, VALID_FLAW_CHECKS } = require("./constants");
-const {
-  INTERACTIVE_EXAMPLES_BASE_URL,
-  LIVE_SAMPLES_BASE_URL,
-} = require("../kumascript/src/constants");
-const { packageBCD } = require("./resolve-bcd");
-const {
-  findMatchesInText,
-  getFirstMatchInText,
-  replaceMatchesInText,
-} = require("./matches-in-text");
-const { humanFileSize } = require("./utils");
-const { VALID_MIME_TYPES } = require("../filecheck/constants");
-const { DEFAULT_LOCALE, VALID_LOCALES } = require("../libs/constants");
-
-function injectFlaws(doc, $, options, document) {
-  if (doc.isArchive) return;
-
-  const flawChecks = [
-    ["unsafe_html", injectUnsafeHTMLFlaws, false],
-    ["broken_links", injectBrokenLinksFlaws, true],
-    ["bad_bcd_queries", injectBadBCDQueriesFlaws, false],
-    ["bad_pre_tags", injectPreTagFlaws, false],
-    ["heading_links", injectHeadingLinksFlaws, false],
-  ];
-
-  // Note that some flaw checking functions need to always run. Even if we're not
-  // recording the flaws, the checks that it does are important for regular
-  // building.
-
-  for (const [flawName, func, alwaysRun] of flawChecks) {
-    // Sanity check the list of flaw names that they're all recognized.
-    // Basically a cheap enum check.
-    if (!VALID_FLAW_CHECKS.has(flawName)) {
-      throw new Error(`'${flawName}' is not a valid flaw check name`);
-    }
-
-    const level = options.flawLevels.get(flawName);
-    if (!alwaysRun && level === FLAW_LEVELS.IGNORE) {
-      continue;
-    }
-
-    // The flaw injection function will mutate the `doc.flaws` object.
-    func(doc, $, document, level);
-
-    if (
-      level === FLAW_LEVELS.ERROR &&
-      doc.flaws[flawName] &&
-      doc.flaws[flawName].length > 0
-    ) {
-      // To make the stdout output a bit more user-friendly, print one warning
-      // for each explanation
-      doc.flaws[flawName].forEach((flaw, i) => {
-        console.warn(
-          i + 1,
-          chalk.yellow(`${chalk.bold(flawName)} flaw: ${flaw.explanation}`)
-        );
-      });
-      throw new Error(`${doc.flaws[flawName].length} ${flawName} flaws`);
-    }
-  }
-}
-
-function injectUnsafeHTMLFlaws(doc, $, { rawContent, fileInfo }) {
-  function addFlaw(element, explanation) {
-    if (!("unsafe_html" in doc.flaws)) {
-      doc.flaws.unsafe_html = [];
-    }
-    const id = `unsafe_html${doc.flaws.unsafe_html.length + 1}`;
-    let html = $.html($(element));
-    $(element).replaceWith($("<code>").addClass("unsafe-html").text(html));
-    // Some nasty tags are so broken they can make the HTML become more or less
-    // the whole page. E.g. `<script\x20type="text/javascript">`.
-    if (html.length > 100) {
-      html = html.slice(0, Math.min(html.indexOf("\n"), 100)) + "…";
-    }
-    // Perhaps in the future we can make it possibly fixable to delete it.
-    const fixable = false;
-    const suggestion = null;
-
-    const flaw = {
-      explanation,
-      id,
-      fixable,
-      html,
-      suggestion,
-    };
-    for (const { line, column } of findMatchesInText(html, rawContent)) {
-      // This might not find anything because the HTML might have mutated
-      // slightly because of how cheerio parses it. But it doesn't hurt to try.
-      flaw.line = line;
-      flaw.column = column;
-    }
-
-    doc.flaws.unsafe_html.push(flaw);
-  }
-
-  const safeIFrameSrcs = [
-    // EmbedGHLiveSample.ejs
-    "https://mdn.github.io",
-    // EmbedYouTube.ejs
-    "https://www.youtube-nocookie.com",
-    // JSFiddleEmbed.ejs
-    "https://jsfiddle.net",
-    // EmbedTest262ReportResultsTable.ejs
-    "https://test262.report",
-  ];
-  if (LIVE_SAMPLES_BASE_URL) {
-    safeIFrameSrcs.push(LIVE_SAMPLES_BASE_URL.toLowerCase());
-  }
-  if (INTERACTIVE_EXAMPLES_BASE_URL) {
-    safeIFrameSrcs.push(INTERACTIVE_EXAMPLES_BASE_URL.toLowerCase());
-  }
-
-  $("script, embed, object, iframe").each((i, element) => {
-    const { tagName } = element;
-    if (tagName === "iframe") {
-      // For iframes we only check the 'src' value
-      const src = $(element).attr("src");
-      if (!src) {
-        console.warn(
-          `${fileInfo.path} has an iframe without a 'src' attribute`
-        );
-        return;
-      }
-      // Local URLs are always safe.
-      if (!(src.startsWith("//") || src.includes("://"))) {
-        return;
-      }
-      if (!safeIFrameSrcs.find((s) => src.toLowerCase().startsWith(s))) {
-        addFlaw(element, `Unsafe <iframe> 'src' value (${src})`);
-      }
-    } else {
-      addFlaw(element, `<${tagName}> tag found`);
-    }
-  });
-
-  $("*").each((i, element) => {
-    const { tagName } = element;
-    // E.g. `<script\x20type="text/javascript">javascript:alert(1);</script>`
-    if (tagName.startsWith("script")) {
-      addFlaw(element, `possible <script> tag`);
-    }
-
-    const checkValueAttributes = new Set(["style", "href"]);
-    for (const key in element.attribs) {
-      // No need to lowercase the `key` because it's already always lowercased
-      // by cheerio.
-      // This regex will match on `\xa0onload` and `onmousover` but
-      // not `fond` or `stompon`.
-      if (/(\\x[a-f0-9]{2}|\b)on\w+/.test(key)) {
-        addFlaw(element, `'${key}' on-handler found in ${tagName}`);
-      } else if (checkValueAttributes.has(key)) {
-        const value = element.attribs[key];
-        if (value && /(^|\\x[a-f0-9]{2})javascript:/i.test(value)) {
-          addFlaw(
-            element,
-            `'javascript:' expression found inside 'style' attribute in ${tagName}`
-          );
-        }
-      }
-    }
-  });
-}
-
-function injectSectionFlaws(doc, flaws, options) {
-  if (doc.isArchive || !flaws.length) {
-    return;
-  }
-
-  const level = options.flawLevels.get("sectioning");
-  if (level === FLAW_LEVELS.ERROR) {
-    throw new Error(flaws.join(" "));
-  } else if (level === FLAW_LEVELS.WARN) {
-    doc.flaws.sectioning = flaws.map((explanation, i) => {
-      const id = `sectioning${i + 1}`;
-      return { id, explanation };
-    });
-  }
-}
-
-// The 'broken_links' flaw check looks for internal links that
-// link to a document that's going to fail with a 404 Not Found.
-function injectBrokenLinksFlaws(doc, $, { rawContent }, level) {
-  // This is needed because the same href can occur multiple time.
-  // For example:
-  //    <a href="/foo/bar">
-  //    <a href="/foo/other">
-  //    <a href="/foo/bar">  (again!)
-  // In this case, when we call `addBrokenLink()` that third time, we know
-  // this refers to the second time it appears. That's important for the
-  // sake of finding which match, in the original source (rawContent),
-  // it belongs to.
-  const checked = new Map();
-
-  // Our cache for looking things up by `href`. This basically protects
-  // us from calling `findMatchesInText()` more than once.
-  const matches = new Map();
-
-  function mutateLink($element, suggestion, enUSFallback) {
-    if (suggestion) {
-      $element.attr("href", suggestion);
-    } else if (enUSFallback) {
-      $element.attr("href", enUSFallback);
-      // This functionality here should match what we do inside
-      // the `web.smartLink()` function in kumascript rendering.
-      $element.text(`${$element.text()} (${DEFAULT_LOCALE})`);
-      $element.addClass("only-in-en-us");
-      $element.attr("title", "Currently only available in English (US)");
-    } else {
-      throw new Error("Don't use this function if neither is true");
-    }
-  }
-
-  // A closure function to help making it easier to append flaws
-  function addBrokenLink(
-    $element,
-    index,
-    href,
-    suggestion = null,
-    explanation = null,
-    enUSFallback = null
-  ) {
-    if (level === FLAW_LEVELS.IGNORE) {
-      // Note, even if not interested in flaws, we still need to apply the
-      // suggestion. For example, in production builds, we don't care about
-      // logging flaws, but because not all `broken_links` flaws have been
-      // manually fixed at the source.
-      if (suggestion || enUSFallback) {
-        mutateLink($element, suggestion, enUSFallback);
-      }
-      return;
-    }
-    explanation = explanation || `Can't resolve ${href}`;
-
-    if (!matches.has(href)) {
-      matches.set(
-        href,
-        Array.from(
-          findMatchesInText(href, rawContent, {
-            attribute: "href",
-          })
-        )
-      );
-    }
-    // findMatchesInText() is a generator function so use `Array.from()`
-    // to turn it into an array so we can use `.forEach()` because that
-    // gives us an `i` for every loop.
-    matches.get(href).forEach((match, i) => {
-      if (i !== index) {
-        return;
-      }
-      if (!("broken_links" in doc.flaws)) {
-        doc.flaws.broken_links = [];
-      }
-      const id = `link${doc.flaws.broken_links.length + 1}`;
-      const fixable = !!suggestion;
-      if (suggestion || enUSFallback) {
-        mutateLink($element, suggestion, enUSFallback);
-      }
-      $element.attr("data-flaw", id);
-      doc.flaws.broken_links.push(
-        Object.assign({ explanation, id, href, suggestion, fixable }, match)
-      );
-    });
-  }
-
-  function isHomepageURL(url) {
-    // Return true if the URL is something like `/` or `/en-US` or `/fr/`
-    if (url === "/") {
-      return true;
-    }
-    if (!url.endsWith("/")) {
-      url += "/";
-    }
-    const split = url.split("/");
-    if (split.length === 3 && VALID_LOCALES.has(split[1].toLowerCase())) {
-      return true;
-    }
-    return false;
-  }
-
-  $("a[href]").each((i, element) => {
-    const a = $(element);
-    const href = a.attr("href");
-
-    // This gives us insight into how many times this exact `href`
-    // has been encountered in the doc.
-    // Then, when we call addBrokenLink() we can include an index so that
-    // that function knows which match it's referring to.
-    checked.set(href, checked.has(href) ? checked.get(href) + 1 : 0);
-
-    // Note, a lot of links are like this:
-    //  <a href="/docs/Learn/Front-end_web_developer">
-    // which means the author wanted the link to work in any language.
-    // When checking it against disk, we'll have to assume a locale.
-    const hrefSplit = href.split("#");
-    let hrefNormalized = hrefSplit[0];
-    if (hrefNormalized.startsWith("/docs/")) {
-      const thisDocumentLocale = doc.mdn_url.split("/")[1];
-      hrefNormalized = `/${thisDocumentLocale}${hrefNormalized}`;
-    }
-
-    if (href.startsWith("https://developer.mozilla.org/")) {
-      // It might be a working 200 OK link but the link just shouldn't
-      // have the full absolute URL part in it.
-      const absoluteURL = new URL(href);
-      addBrokenLink(
-        a,
-        checked.get(href),
-        href,
-        absoluteURL.pathname + absoluteURL.search + absoluteURL.hash
-      );
-    } else if (isHomepageURL(hrefNormalized)) {
-      // But did you spell it perfectly?
-      const homepageLocale = hrefNormalized.split("/")[1];
-      if (
-        hrefNormalized !== "/" &&
-        (VALID_LOCALES.get(homepageLocale.toLowerCase()) !== homepageLocale ||
-          !hrefNormalized.endsWith("/"))
-      ) {
-        addBrokenLink(
-          a,
-          checked.get(href),
-          href,
-          `/${VALID_LOCALES.get(homepageLocale.toLowerCase())}/`
-        );
-      }
-    } else if (href.startsWith("/") && !href.startsWith("//")) {
-      // Got to fake the domain to sensible extract the .search and .hash
-      const absoluteURL = new URL(href, "http://www.example.com");
-      const found = Document.findByURL(hrefNormalized);
-      if (!found) {
-        // Before we give up, check if it's an image.
-        if (
-          !Image.findByURL(hrefNormalized) &&
-          !Archive.isArchivedURL(hrefNormalized)
-        ) {
-          // Even if it's a redirect, it's still a flaw, but it'll be nice to
-          // know what it *should* be.
-          const resolved = Redirect.resolve(hrefNormalized);
-          if (resolved !== hrefNormalized) {
-            addBrokenLink(
-              a,
-              checked.get(href),
-              href,
-              resolved + absoluteURL.search + absoluteURL.hash.toLowerCase()
-            );
-          } else {
-            let enUSFallbackURL = null;
-            // Test if the document is a translated document and the link isn't
-            // to an en-US URL. We know the link is broken (in this locale!)
-            // but it might be "salvageable" if we link the en-US equivalent.
-            // This is, by the way, the same trick the `web.smartLink()` utility
-            // function does in kumascript rendering.
-            if (
-              doc.locale !== DEFAULT_LOCALE &&
-              href.startsWith(`/${doc.locale}/`)
-            ) {
-              // What if you swich to the English link; would th link work
-              // better then?
-              const enUSHrefNormalized = hrefNormalized.replace(
-                `/${doc.locale}/`,
-                `/${DEFAULT_LOCALE}/`
-              );
-              let enUSFound = Document.findByURL(enUSHrefNormalized);
-              if (enUSFound) {
-                enUSFallbackURL = enUSFound.url;
-              } else {
-                const enUSResolved = Redirect.resolve(enUSHrefNormalized);
-                if (enUSResolved !== enUSHrefNormalized) {
-                  enUSFallbackURL =
-                    enUSResolved +
-                    absoluteURL.search +
-                    absoluteURL.hash.toLowerCase();
-                }
-              }
-            }
-            addBrokenLink(
-              a,
-              checked.get(href),
-              href,
-              null,
-              enUSFallbackURL
-                ? "Can use the English (en-US) link as a fallback"
-                : null,
-              enUSFallbackURL
-            );
-          }
-        }
-        // But does it have the correct case?!
-      } else if (found.url !== href.split("#")[0]) {
-        // Inconsistent case.
-        addBrokenLink(
-          a,
-          checked.get(href),
-          href,
-          found.url + absoluteURL.search + absoluteURL.hash.toLowerCase()
-        );
-      } else if (
-        hrefSplit.length > 1 &&
-        hrefSplit[1] !== hrefSplit[1].toLowerCase()
-      ) {
-        const hash = hrefSplit[1];
-        addBrokenLink(
-          a,
-          checked.get(href),
-          href,
-          href.replace(`#${hash}`, `#${hash.toLowerCase()}`),
-          "Anchor not lowercase"
-        );
-      }
-    } else if (href.startsWith("#")) {
-      const hash = href.split("#")[1];
-      if (hash !== hash.toLowerCase()) {
-        addBrokenLink(
-          a,
-          checked.get(href),
-          href,
-          href.replace(`#${hash}`, `#${hash.toLowerCase()}`),
-          "Anchor not lowercase"
-        );
-      }
-    }
-  });
-}
-
-// Bad BCD queries are when the `<div class="bc-data">` tags have an
-// ID (or even lack the `id` attribute) that don't match anything in the
-// @mdn/browser-compat-data package. E.g. Something like this:
-//
-//    <div class="bc-data" id="bcd:never.ever.heard.of">
-//
-function injectBadBCDQueriesFlaws(doc, $) {
-  $("div.bc-data").each((i, element) => {
-    const dataQuery = $(element).attr("id");
-    if (!dataQuery) {
-      if (!("bad_bcd_queries" in doc.flaws)) {
-        doc.flaws.bad_bcd_queries = [];
-      }
-      doc.flaws.bad_bcd_queries.push({
-        id: `bad_bcd_queries${doc.flaws.bad_bcd_queries.length}`,
-        explanation: "BCD table without an ID",
-        suggestion: null,
-      });
-    } else {
-      const query = dataQuery.replace(/^bcd:/, "");
-      const { data } = packageBCD(query);
-      if (!data) {
-        if (!("bad_bcd_queries" in doc.flaws)) {
-          doc.flaws.bad_bcd_queries = [];
-        }
-        doc.flaws.bad_bcd_queries.push({
-          id: `bad_bcd_queries${doc.flaws.bad_bcd_queries.length}`,
-          explanation: `No BCD data for query: ${query}`,
-          suggestion: null,
-        });
-      }
-    }
-  });
-}
-
-function injectPreTagFlaws(doc, $, { rawContent }) {
-  function escapeHTML(s) {
-    return s
-      .replace(/&/g, "&amp;")
-      .replace(/"/g, "&quot;")
-      .replace(/</g, "&lt;")
-      .replace(/>/g, "&gt;");
-  }
-
-  // Over the years, we've accumulated a lot of Kuma-HTML where the <pre> tags
-  // are actually full of HTML. Almost exclusively we've observed <pre> tags whose
-  // content is the HTML produced by Prism in the browser. Instead, in these cases,
-  // we should just have the code that it will syntax highlight.
-  // Note! Having HTML in a <pre> tag is nothing weird or wrong. But if you have
-  //
-  //  <pre class="language-js">
-  //    <code class="language-js">
-  //     <span class="keyword">foo</span>
-  //   </code>
-  //  </pre>
-  //
-  // It's better just have the text itself inside the <pre> block:
-  //  <pre class="language-js">
-  //    foo
-  //  </pre>
-  //
-  // This makes it easier to edit the code in raw form. It also makes it less
-  // heavy because any HTML will be replaced with Prism HTML anyway.
-  function addCodeTagFlaw($pre) {
-    if (!("bad_pre_tags" in doc.flaws)) {
-      doc.flaws.bad_pre_tags = [];
-    }
-
-    const id = `bad_pre_tags${doc.flaws.bad_pre_tags.length + 1}`;
-    const type = "pre_with_html";
-    const explanation = `<pre><code>CODE can be just <pre>CODE`;
-    const suggestion = escapeHTML($pre.text());
-
-    let fixable = false;
-    let html = $pre.html();
-    if (rawContent.includes(html)) {
-      fixable = true;
-    } else {
-      // Many times, the HTML found in the sources is what Cheerio would
-      // serialize as HTML but with the small difference that some entities
-      // are unnecessarily HTML encoded as entities. So, we try to ignore
-      // that and see if we can match it as serialized.
-      const htmlFixed = html.replace(/&apos;/g, "'");
-      if (rawContent.includes(htmlFixed)) {
-        html = htmlFixed;
-        fixable = true;
-      }
-    }
-
-    const flaw = { explanation, id, fixable, html, suggestion, type };
-    if (fixable) {
-      // Only if it's fixable, is the `html` perfectly findable in the raw content.
-      const { line, column } = getFirstMatchInText(html, rawContent);
-      flaw.line = line;
-      flaw.column = column;
-    }
-
-    // Actually mutate the cheerio instance so we benefit from the
-    // flaw detection immediately.
-    // Note that `$pre.text()` might contain unescaped HTML, but Cheerio will
-    // take care of that.
-    $pre.html(suggestion); // strips all other HTML but preserves whitespace
-    $pre.attr("data-flaw", id);
-
-    doc.flaws.bad_pre_tags.push(flaw);
-  }
-
-  // Matches all <code> that are preceded by
-  // a <pre class="...brush...">
-  // Note, when we (in Node) syntax highlight code, the first thing
-  // we look for is the `$("pre[class*=brush]")` selector.
-  // Note, in jQuery you can do `$("pre + code")` which means it only selects
-  // the `<code>` tags that are *immediately preceeding*. This is not supported
-  // in Cheerio :( but the `>` operator works. And since we're only looking
-  // at a specific classname on the <pre> the chances of picking up the wrong
-  // selectors is small.
-  $("pre[class*=brush] > code").each((i, element) => {
-    const $pre = $(element).parent();
-    // Because Cheerio doesn't support selectors like `pre + code` we have to
-    // manually (double) check that the parent really is a `<pre>` tag.
-    if ($pre.length && $pre.get(0).tagName === "pre") {
-      addCodeTagFlaw($pre);
-    }
-  });
-
-  // TODO: Add other <pre> tag flaws underneath.
-  // We report only a single kind of fixable flaw at a time, since
-  // flaws are fixed by replacing raw HTML strings (so fixing the first
-  // fixable flaw might prevent fixing the second fixable flaw)
-  // For details see:
-  //   https://github.com/mdn/yari/pull/2144#issuecomment-748346489
-  //
-  // Also, make sure iterate over the document synchroneously,
-  // e.g., with $().each(), or await for all Promises before moving on to the next flaw.
-  function noFixablePreTagFlawsYet() {
-    const flaws = doc.flaws.bad_pre_tags;
-    const numFixableFlaws =
-      flaws && flaws.filter((flaw) => !flaw.fixable).length;
-    return !numFixableFlaws;
-  }
-
-  if (noFixablePreTagFlawsYet()) {
-    // one more flaw check here
-  }
-
-  if (noFixablePreTagFlawsYet()) {
-    // another flaw check here
-  }
-}
-
-// You're not allowed to have `<a>` elements inside `<h2>` or `<h3>` elements
-// because those will be rendered out as "links to themselves".
-// I.e. a source of `<h2 id="foo">Foo</h2>` renders out as:
-// `<h2 id="foo"><a href="#foo">Foo</a></h2>` in the final HTML. That makes
-// it easy to (perma)link to specific headings in the document.
-function injectHeadingLinksFlaws(doc, $, { rawContent }) {
-  function addFlaw($heading) {
-    if (!("heading_links" in doc.flaws)) {
-      doc.flaws.heading_links = [];
-    }
-    const id = `heading_links${doc.flaws.heading_links.length + 1}`;
-    const explanation = `${
-      $heading.get(0).tagName
-    } heading contains an <a> tag`;
-    const before = $heading.html();
-    let suggestion = null;
-    // If the only element within the heading's HTML is 1 single <a>
-    // then, we can simply replace the whole heading's HTML with the text of it.
-    if ($("a", $heading).length === 1 && $("*", $heading).length === 1) {
-      suggestion = $heading.text();
-    }
-    let line = null;
-    let column = null;
-    // If the heading has an ID we can search for it in the rawContent.
-    for (const { line: foundLine, column: foundColumn } of findMatchesInText(
-      before,
-      rawContent
-    )) {
-      line = foundLine;
-      column = foundColumn;
-      // This makes sure the column is *after* the ID value (plus quotation mark)
-      if ($heading.attr("id")) {
-        column += $heading.attr("id").length + 2;
-      }
-    }
-    // It's never fixable because it's too hard to find in the raw HTML.
-    const fixable = false;
-    const html = $.html($heading);
-    const flaw = {
-      explanation,
-      id,
-      before,
-      fixable,
-      html,
-      suggestion,
-      line,
-      column,
-    };
-    if (suggestion) {
-      $heading.html(suggestion);
-    }
-    doc.flaws.heading_links.push(flaw);
-  }
-
-  $("h2 a, h3 a").each((i, element) => {
-    addFlaw($(element).parent());
-  });
-}
-
-async function fixFixableFlaws(doc, options, document) {
-  if (!options.fixFlaws || document.isArchive) return;
-
-  const { rawBody, isMarkdown } = document;
-  if (isMarkdown) {
-    throw new Error("Fixing flaws in Markdown is not implemented yet");
-  }
-  // String copy so we can mutate it
-  let newRawBody = rawBody;
-
-  const phrasing = options.fixFlawsDryRun ? "Would fix" : "Fixed";
-
-  const loud = options.fixFlawsDryRun || options.fixFlawsVerbose;
-
-  // Any 'macros' of type "MacroRedirectedLinkError" or "MacroDeprecatedError"...
-  for (const flaw of doc.flaws.macros || []) {
-    if (flaw.fixable) {
-      // Sanity check that our understanding of flaws, filepaths, and sources
-      // work as expected.
-      if (!newRawBody.includes(flaw.macroSource)) {
-        throw new Error(
-          `rawBody doesn't contain macroSource (${flaw.macroSource})`
-        );
-      }
-      const newMacroSource = flaw.suggestion;
-      // Remember, in JavaScript only the first occurrence will be replaced.
-      newRawBody = newRawBody.replace(flaw.macroSource, newMacroSource);
-      if (loud) {
-        console.log(
-          chalk.grey(
-            `${phrasing} (${flaw.id}) macro ${chalk.white.bold(
-              flaw.macroSource
-            )} to ${chalk.white.bold(newMacroSource)}`
-          )
-        );
-      }
-    }
-  }
-
-  // Any 'broken_links' with a suggestion...
-  for (const flaw of doc.flaws.broken_links || []) {
-    if (!flaw.suggestion) {
-      continue;
-    }
-    // XXX MARKDOWN
-    // The reason we're not using the parse HTML, as a cheerio object `$`
-    // is because the raw HTML we're dealing with isn't actually proper
-    // HTML. It's only proper HTML when the kumascript macros have been
-    // expanded.
-    newRawBody = replaceMatchesInText(flaw.href, newRawBody, flaw.suggestion, {
-      inAttribute: "href",
-    });
-    if (loud) {
-      console.log(
-        chalk.grey(
-          `${phrasing} (${flaw.id}) broken_link ${chalk.white.bold(
-            flaw.href
-          )} to ${chalk.white.bold(flaw.suggestion)}`
-        )
-      );
-    }
-  }
-
-  // Any 'bad_pre_tags' with a suggestion...
-  for (const flaw of doc.flaws.bad_pre_tags || []) {
-    if (!flaw.suggestion || !flaw.fixable) {
-      continue;
-    }
-
-    if (!newRawBody.includes(flaw.html)) {
-      throw new Error(`rawBody doesn't contain flaw HTML (${flaw.html})`);
-    }
-    // It's not feasible to pin point exactly which `<pre>` tag this
-    // refers to, so do the same query we use when we find the
-    // flaw, but this time actually make the mutation.
-    newRawBody = newRawBody.replace(flaw.html, flaw.suggestion);
-    if (loud) {
-      console.log(chalk.grey(`${phrasing} (${flaw.id}) bad_pre_tags`));
-    }
-  }
-
-  // We have a lot of images that *should* be external, at least for the sake
-  // of cleaning up, but aren't. E.g. `/@api/deki/files/247/=HTMLBlinkElement.gif`
-  // These get logged as external images by the flaw detection, but to actually
-  // be able to process them and fix the problem we need to "temporarily"
-  // pretend they were hosted on a remote working full domain.
-  // See https://github.com/mdn/yari/issues/1103
-  function forceExternalURL(url) {
-    if (url.startsWith("/")) {
-      return `https://mdn.mozillademos.org${url}`;
-    }
-    return url;
-  }
-
-  // Any 'images' flaws with a suggestion or external image...
-  for (const flaw of doc.flaws.images || []) {
-    if (!(flaw.suggestion || flaw.externalImage)) {
-      continue;
-    }
-    // The reason we're not using the parse HTML, as a cheerio object `$`
-    // is because the raw HTML we're dealing with isn't actually proper
-    // HTML. It's only proper HTML when the kumascript macros have been
-    // expanded.
-    let newSrc;
-    if (flaw.suggestion) {
-      newSrc = flaw.suggestion;
-    } else {
-      // Sanity check that it's an external image
-      const url = new URL(forceExternalURL(flaw.src));
-      if (url.protocol !== "https:") {
-        throw new Error(`Insecure image URL ${flaw.src}`);
-      }
-      try {
-        const imageResponse = await got(forceExternalURL(flaw.src), {
-          responseType: "buffer",
-          timeout: 10000,
-          retry: 3,
-        });
-        const imageBuffer = imageResponse.body;
-        let fileType = await FileType.fromBuffer(imageBuffer);
-        if (
-          !fileType &&
-          flaw.src.toLowerCase().endsWith(".svg") &&
-          imageResponse.headers["content-type"]
-            .toLowerCase()
-            .startsWith("image/svg+xml")
-        ) {
-          // If the SVG doesn't have the `<?xml version="1.0" encoding="UTF-8"?>`
-          // and/or the `<!DOCTYPE svg PUBLIC ...` in the first couple of bytes
-          // the FileType.fromBuffer will fail.
-          // But if the image URL and the response Content-Type are sane, we
-          // can safely assumes it's an SVG file.
-          fileType = {
-            ext: "xml",
-            mime: "application/xml",
-          };
-        }
-        if (!fileType) {
-          throw new Error(
-            `No file type could be extracted from ${flaw.src} at all. Probably not going to be a valid image file.`
-          );
-        }
-        const isSVG =
-          fileType.mime === "application/xml" &&
-          flaw.src.toLowerCase().endsWith(".svg");
-
-        if (!(VALID_MIME_TYPES.has(fileType.mime) || isSVG)) {
-          throw new Error(
-            `${flaw.src} has an unrecognized mime type: ${fileType.mime}`
-          );
-        }
-        // Otherwise FileType would make it `.xml`
-        const imageExtension = isSVG ? "svg" : fileType.ext;
-        const decodedPathname = decodeURI(url.pathname).replace(/\s+/g, "_");
-        const imageBasename = sanitizeFilename(
-          `${path.basename(
-            decodedPathname,
-            path.extname(decodedPathname)
-          )}.${imageExtension}`
-        );
-        const destination = path.join(
-          Document.getFolderPath(document.metadata),
-          path
-            .basename(imageBasename)
-            // Names like `screenshot-(1).png` are annoying because the `(` often
-            // has to be escaped when working on the command line.
-            .replace(/[()]/g, "")
-            .replace(/\s+/g, "_")
-            // From legacy we have a lot of images that are named like
-            // `/@api/deki/files/247/=HTMLBlinkElement.gif` for example.
-            // Take this opportunity to clean that odd looking leading `=`.
-            .replace(/^=/, "")
-            .toLowerCase()
-        );
-        // Before writing to disk, run it through the same imagemin
-        // compression we do in the filecheck CLI.
-        const compressedImageBuffer = await imagemin.buffer(imageBuffer, {
-          plugins: [getImageminPlugin(url.pathname)],
-        });
-        if (compressedImageBuffer.length < imageBuffer.length) {
-          console.log(
-            `Raw image size: ${humanFileSize(
-              imageBuffer.length
-            )} Compressed: ${humanFileSize(compressedImageBuffer.length)}`
-          );
-          fs.writeFileSync(destination, compressedImageBuffer);
-        } else {
-          console.log(`Raw image size: ${humanFileSize(imageBuffer.length)}`);
-          fs.writeFileSync(destination, imageBuffer);
-        }
-        console.log(`Downloaded ${flaw.src} to ${destination}`);
-        newSrc = path.basename(destination);
-      } catch (error) {
-        const { response } = error;
-        if (response && response.statusCode === 404) {
-          console.log(chalk.yellow(`Skipping ${flaw.src} (404)`));
-          continue;
-        } else if (error.code === "ETIMEDOUT" || error.code === "ENOTFOUND") {
-          console.log(chalk.yellow(`Skipping ${flaw.src} (${error.code})`));
-          continue;
-        } else {
-          console.error(error);
-          throw error;
-        }
-      }
-    }
-    newRawBody = replaceMatchesInText(flaw.src, newRawBody, newSrc, {
-      inAttribute: "src",
-    });
-    if (loud) {
-      console.log(
-        chalk.grey(
-          `${phrasing} (${flaw.id}) image ${chalk.white.bold(
-            flaw.src
-          )} to ${chalk.white.bold(newSrc)}`
-        )
-      );
-    }
-  }
-
-  // Any 'image_widths' flaws with a suggestion
-  for (const flaw of doc.flaws.image_widths || []) {
-    if (!flaw.fixable) {
-      continue;
-    }
-    newRawBody = replaceMatchesInText(flaw.style, newRawBody, flaw.suggestion, {
-      inAttribute: "style",
-      removeEntireAttribute: flaw.suggestion === "",
-    });
-    if (loud) {
-      console.log(
-        flaw.suggestion === ""
-          ? chalk.grey(
-              `${phrasing} (${flaw.id}) image_widths ${chalk.white.bold(
-                "remove entire 'style' attribute"
-              )}`
-            )
-          : chalk.grey(
-              `${phrasing} (${flaw.id}) image_widths style="${chalk.white.bold(
-                flaw.style
-              )}" to style="${chalk.white.bold(flaw.suggestion)}"`
-            )
-      );
-    }
-  }
-
-  // Finally, summarized what happened...
-  if (newRawBody !== rawBody) {
-    // It changed the raw HTML of the source. So deal with this.
-    if (options.fixFlawsDryRun && options.fixFlawsVerbose) {
-      console.log(
-        chalk.yellow(
-          `Would modify "${document.fileInfo.path}" from fixable flaws.`
-        )
-      );
-    } else {
-      Document.update(document.url, newRawBody, document.metadata, isMarkdown);
-      if (options.fixFlawsVerbose) {
-        console.log(
-          chalk.green(
-            `Modified "${chalk.bold(
-              document.fileInfo.path
-            )}" from fixable flaws.`
-          )
-        );
-      }
-    }
-  }
-}
-
-function getImageminPlugin(fileName) {
-  const extension = path.extname(fileName).toLowerCase();
-  if (extension === ".jpg" || extension === ".jpeg") {
-    return imageminMozjpeg();
-  }
-  if (extension === ".png") {
-    return imageminPngquant();
-  }
-  if (extension === ".gif") {
-    return imageminGifsicle();
-  }
-  if (extension === ".svg") {
-    return imageminSvgo();
-  }
-  throw new Error(`No imagemin plugin for ${extension}`);
-}
-
-module.exports = { injectFlaws, injectSectionFlaws, fixFixableFlaws };
diff --git a/build/flaws/bad-bcd-queries.js b/build/flaws/bad-bcd-queries.js
new file mode 100644
index 000000000000..346b84ae6190
--- /dev/null
+++ b/build/flaws/bad-bcd-queries.js
@@ -0,0 +1,28 @@
+const { packageBCD } = require("../resolve-bcd");
+
+// Bad BCD queries are when the `<div class="bc-data">` tags have an
+// ID (or even lack the `id` attribute) that don't match anything in the
+// @mdn/browser-compat-data package. E.g. Something like this:
+//
+//    <div class="bc-data" id="bcd:never.ever.heard.of">
+
+function getBadBCDQueriesFlaws(doc, $) {
+  return $("div.bc-data")
+    .map((i, element) => {
+      const dataQuery = $(element).attr("id");
+      if (!dataQuery) {
+        return "BCD table without an ID";
+      }
+      const query = dataQuery.replace(/^bcd:/, "");
+      return !packageBCD(query).data && `No BCD data for query: ${query}`;
+    })
+    .get()
+    .filter((explanation) => !!explanation)
+    .map((explanation, i) => ({
+      id: `bad_bcd_queries${i + 1}`,
+      explanation,
+      suggestion: null,
+    }));
+}
+
+module.exports = { getBadBCDQueriesFlaws };
diff --git a/build/flaws/broken-links.js b/build/flaws/broken-links.js
new file mode 100644
index 000000000000..0ef5f59e8e0e
--- /dev/null
+++ b/build/flaws/broken-links.js
@@ -0,0 +1,250 @@
+const { Archive, Document, Redirect, Image } = require("../../content");
+const { FLAW_LEVELS } = require("../constants");
+const { findMatchesInText } = require("../matches-in-text");
+const { DEFAULT_LOCALE, VALID_LOCALES } = require("../../libs/constants");
+
+function isHomepageURL(url) {
+  // Return true if the URL is something like `/` or `/en-US` or `/fr/`
+  if (url === "/") {
+    return true;
+  }
+  if (!url.endsWith("/")) {
+    url += "/";
+  }
+  const split = url.split("/");
+  return split.length === 3 && VALID_LOCALES.has(split[1].toLowerCase());
+}
+
+// The 'broken_links' flaw check looks for internal links that
+// link to a document that's going to fail with a 404 Not Found.
+function getBrokenLinksFlaws(doc, $, { rawContent }, level) {
+  const flaws = [];
+
+  // This is needed because the same href can occur multiple time.
+  // For example:
+  //    <a href="/foo/bar">
+  //    <a href="/foo/other">
+  //    <a href="/foo/bar">  (again!)
+  // In this case, when we call `addBrokenLink()` that third time, we know
+  // this refers to the second time it appears. That's important for the
+  // sake of finding which match, in the original source (rawContent),
+  // it belongs to.
+  const checked = new Map();
+
+  // Our cache for looking things up by `href`. This basically protects
+  // us from calling `findMatchesInText()` more than once.
+  const matches = new Map();
+
+  function mutateLink($element, suggestion, enUSFallback) {
+    if (suggestion) {
+      $element.attr("href", suggestion);
+    } else if (enUSFallback) {
+      $element.attr("href", enUSFallback);
+      // This functionality here should match what we do inside
+      // the `web.smartLink()` function in kumascript rendering.
+      $element.text(`${$element.text()} (${DEFAULT_LOCALE})`);
+      $element.addClass("only-in-en-us");
+      $element.attr("title", "Currently only available in English (US)");
+    } else {
+      throw new Error("Don't use this function if neither is true");
+    }
+  }
+
+  // A closure function to help making it easier to append flaws
+  function addBrokenLink(
+    $element,
+    index,
+    href,
+    suggestion = null,
+    explanation = null,
+    enUSFallback = null
+  ) {
+    if (level === FLAW_LEVELS.IGNORE) {
+      // Note, even if not interested in flaws, we still need to apply the
+      // suggestion. For example, in production builds, we don't care about
+      // logging flaws, but because not all `broken_links` flaws have been
+      // manually fixed at the source.
+      if (suggestion || enUSFallback) {
+        mutateLink($element, suggestion, enUSFallback);
+      }
+      return;
+    }
+    explanation = explanation || `Can't resolve ${href}`;
+
+    if (!matches.has(href)) {
+      matches.set(
+        href,
+        Array.from(
+          findMatchesInText(href, rawContent, {
+            attribute: "href",
+          })
+        )
+      );
+    }
+    // findMatchesInText() is a generator function so use `Array.from()`
+    // to turn it into an array so we can use `.forEach()` because that
+    // gives us an `i` for every loop.
+    matches.get(href).forEach((match, i) => {
+      if (i !== index) {
+        return;
+      }
+      const id = `link${flaws.length + 1}`;
+      const fixable = !!suggestion;
+      if (suggestion || enUSFallback) {
+        mutateLink($element, suggestion, enUSFallback);
+      }
+      $element.attr("data-flaw", id);
+      flaws.push(
+        Object.assign({ explanation, id, href, suggestion, fixable }, match)
+      );
+    });
+  }
+
+  $("a[href]").each((i, element) => {
+    const a = $(element);
+    const href = a.attr("href");
+
+    // This gives us insight into how many times this exact `href`
+    // has been encountered in the doc.
+    // Then, when we call addBrokenLink() we can include an index so that
+    // that function knows which match it's referring to.
+    checked.set(href, checked.has(href) ? checked.get(href) + 1 : 0);
+
+    // Note, a lot of links are like this:
+    //  <a href="/docs/Learn/Front-end_web_developer">
+    // which means the author wanted the link to work in any language.
+    // When checking it against disk, we'll have to assume a locale.
+    const hrefSplit = href.split("#");
+    let hrefNormalized = hrefSplit[0];
+    if (hrefNormalized.startsWith("/docs/")) {
+      const thisDocumentLocale = doc.mdn_url.split("/")[1];
+      hrefNormalized = `/${thisDocumentLocale}${hrefNormalized}`;
+    }
+
+    if (href.startsWith("https://developer.mozilla.org/")) {
+      // It might be a working 200 OK link but the link just shouldn't
+      // have the full absolute URL part in it.
+      const absoluteURL = new URL(href);
+      addBrokenLink(
+        a,
+        checked.get(href),
+        href,
+        absoluteURL.pathname + absoluteURL.search + absoluteURL.hash
+      );
+    } else if (isHomepageURL(hrefNormalized)) {
+      // But did you spell it perfectly?
+      const homepageLocale = hrefNormalized.split("/")[1];
+      if (
+        hrefNormalized !== "/" &&
+        (VALID_LOCALES.get(homepageLocale.toLowerCase()) !== homepageLocale ||
+          !hrefNormalized.endsWith("/"))
+      ) {
+        addBrokenLink(
+          a,
+          checked.get(href),
+          href,
+          `/${VALID_LOCALES.get(homepageLocale.toLowerCase())}/`
+        );
+      }
+    } else if (href.startsWith("/") && !href.startsWith("//")) {
+      // Got to fake the domain to sensible extract the .search and .hash
+      const absoluteURL = new URL(href, "http://www.example.com");
+      const found = Document.findByURL(hrefNormalized);
+      if (!found) {
+        // Before we give up, check if it's an image.
+        if (
+          !Image.findByURL(hrefNormalized) &&
+          !Archive.isArchivedURL(hrefNormalized)
+        ) {
+          // Even if it's a redirect, it's still a flaw, but it'll be nice to
+          // know what it *should* be.
+          const resolved = Redirect.resolve(hrefNormalized);
+          if (resolved !== hrefNormalized) {
+            addBrokenLink(
+              a,
+              checked.get(href),
+              href,
+              resolved + absoluteURL.search + absoluteURL.hash.toLowerCase()
+            );
+          } else {
+            let enUSFallbackURL = null;
+            // Test if the document is a translated document and the link isn't
+            // to an en-US URL. We know the link is broken (in this locale!)
+            // but it might be "salvageable" if we link the en-US equivalent.
+            // This is, by the way, the same trick the `web.smartLink()` utility
+            // function does in kumascript rendering.
+            if (
+              doc.locale !== DEFAULT_LOCALE &&
+              href.startsWith(`/${doc.locale}/`)
+            ) {
+              // What if you swich to the English link; would th link work
+              // better then?
+              const enUSHrefNormalized = hrefNormalized.replace(
+                `/${doc.locale}/`,
+                `/${DEFAULT_LOCALE}/`
+              );
+              let enUSFound = Document.findByURL(enUSHrefNormalized);
+              if (enUSFound) {
+                enUSFallbackURL = enUSFound.url;
+              } else {
+                const enUSResolved = Redirect.resolve(enUSHrefNormalized);
+                if (enUSResolved !== enUSHrefNormalized) {
+                  enUSFallbackURL =
+                    enUSResolved +
+                    absoluteURL.search +
+                    absoluteURL.hash.toLowerCase();
+                }
+              }
+            }
+            addBrokenLink(
+              a,
+              checked.get(href),
+              href,
+              null,
+              enUSFallbackURL
+                ? "Can use the English (en-US) link as a fallback"
+                : null,
+              enUSFallbackURL
+            );
+          }
+        }
+        // But does it have the correct case?!
+      } else if (found.url !== href.split("#")[0]) {
+        // Inconsistent case.
+        addBrokenLink(
+          a,
+          checked.get(href),
+          href,
+          found.url + absoluteURL.search + absoluteURL.hash.toLowerCase()
+        );
+      } else if (
+        hrefSplit.length > 1 &&
+        hrefSplit[1] !== hrefSplit[1].toLowerCase()
+      ) {
+        const hash = hrefSplit[1];
+        addBrokenLink(
+          a,
+          checked.get(href),
+          href,
+          href.replace(`#${hash}`, `#${hash.toLowerCase()}`),
+          "Anchor not lowercase"
+        );
+      }
+    } else if (href.startsWith("#")) {
+      const hash = href.split("#")[1];
+      if (hash !== hash.toLowerCase()) {
+        addBrokenLink(
+          a,
+          checked.get(href),
+          href,
+          href.replace(`#${hash}`, `#${hash.toLowerCase()}`),
+          "Anchor not lowercase"
+        );
+      }
+    }
+  });
+
+  return flaws;
+}
+
+module.exports = { getBrokenLinksFlaws };
diff --git a/build/flaws/heading-links.js b/build/flaws/heading-links.js
new file mode 100644
index 000000000000..babf1c33a2fe
--- /dev/null
+++ b/build/flaws/heading-links.js
@@ -0,0 +1,62 @@
+const { findMatchesInText } = require("../matches-in-text");
+
+// You're not allowed to have `<a>` elements inside `<h2>` or `<h3>` elements
+// because those will be rendered out as "links to themselves".
+// I.e. a source of `<h2 id="foo">Foo</h2>` renders out as:
+// `<h2 id="foo"><a href="#foo">Foo</a></h2>` in the final HTML. That makes
+// it easy to (perma)link to specific headings in the document.
+function getHeadingLinksFlaws(doc, $, { rawContent }) {
+  const flaws = [];
+
+  $("h2 a, h3 a").each((i, element) => {
+    const id = `heading_links${flaws.length + 1}`;
+    const explanation = `${
+      $(element).parent().get(0).tagName
+    } heading contains an <a> tag`;
+    const before = $(element).parent().html();
+    let suggestion = null;
+    // If the only element within the heading's HTML is 1 single <a>
+    // then, we can simply replace the whole heading's HTML with the text of it.
+    if (
+      $("a", $(element).parent()).length === 1 &&
+      $("*", $(element).parent()).length === 1
+    ) {
+      suggestion = $(element).parent().text();
+    }
+    let line = null;
+    let column = null;
+    // If the heading has an ID we can search for it in the rawContent.
+    for (const { line: foundLine, column: foundColumn } of findMatchesInText(
+      before,
+      rawContent
+    )) {
+      line = foundLine;
+      column = foundColumn;
+      // This makes sure the column is *after* the ID value (plus quotation mark)
+      if ($(element).parent().attr("id")) {
+        column += $(element).parent().attr("id").length + 2;
+      }
+    }
+    // It's never fixable because it's too hard to find in the raw HTML.
+    const fixable = false;
+    const html = $.html($(element).parent());
+    const flaw = {
+      explanation,
+      id,
+      before,
+      fixable,
+      html,
+      suggestion,
+      line,
+      column,
+    };
+    if (suggestion) {
+      $(element).parent().html(suggestion);
+    }
+    flaws.push(flaw);
+  });
+
+  return flaws;
+}
+
+module.exports = { getHeadingLinksFlaws };
diff --git a/build/flaws/index.js b/build/flaws/index.js
new file mode 100644
index 000000000000..9ea46f9f082d
--- /dev/null
+++ b/build/flaws/index.js
@@ -0,0 +1,360 @@
+const fs = require("fs");
+const path = require("path");
+
+const chalk = require("chalk");
+const got = require("got");
+const FileType = require("file-type");
+const imagemin = require("imagemin");
+const imageminPngquant = require("imagemin-pngquant");
+const imageminMozjpeg = require("imagemin-mozjpeg");
+const imageminGifsicle = require("imagemin-gifsicle");
+const imageminSvgo = require("imagemin-svgo");
+const sanitizeFilename = require("sanitize-filename");
+
+const { Document } = require("../../content");
+const { FLAW_LEVELS, VALID_FLAW_CHECKS } = require("../constants");
+const { replaceMatchesInText } = require("../matches-in-text");
+const { humanFileSize } = require("../utils");
+const { VALID_MIME_TYPES } = require("../../filecheck/constants");
+const { getBadBCDQueriesFlaws } = require("./bad-bcd-queries");
+const { getBrokenLinksFlaws } = require("./broken-links");
+const { getHeadingLinksFlaws } = require("./heading-links");
+const { getPreTagFlaws } = require("./pre-tags");
+const { injectSectionFlaws } = require("./sections");
+const { getUnsafeHTMLFlaws } = require("./unsafe-html");
+
+function injectFlaws(doc, $, options, document) {
+  if (doc.isArchive) return;
+
+  const flawChecks = [
+    ["unsafe_html", getUnsafeHTMLFlaws, false],
+    ["broken_links", getBrokenLinksFlaws, true],
+    ["bad_bcd_queries", getBadBCDQueriesFlaws, false],
+    ["bad_pre_tags", getPreTagFlaws, false],
+    ["heading_links", getHeadingLinksFlaws, false],
+  ];
+
+  // Note that some flaw checking functions need to always run. Even if we're not
+  // recording the flaws, the checks that it does are important for regular
+  // building.
+
+  for (const [flawName, func, alwaysRun] of flawChecks) {
+    // Sanity check the list of flaw names that they're all recognized.
+    // Basically a cheap enum check.
+    if (!VALID_FLAW_CHECKS.has(flawName)) {
+      throw new Error(`'${flawName}' is not a valid flaw check name`);
+    }
+
+    const level = options.flawLevels.get(flawName);
+    if (!alwaysRun && level === FLAW_LEVELS.IGNORE) {
+      continue;
+    }
+
+    // The flaw injection function will mutate the `doc.flaws` object.
+    const flaws = func(doc, $, document, level);
+    if (flaws.length > 0) {
+      doc.flaws[flawName] = flaws;
+    }
+
+    if (level === FLAW_LEVELS.ERROR && flaws.length > 0) {
+      // To make the stdout output a bit more user-friendly, print one warning
+      // for each explanation
+      flaws.forEach((flaw, i) => {
+        console.warn(
+          i + 1,
+          chalk.yellow(`${chalk.bold(flawName)} flaw: ${flaw.explanation}`)
+        );
+      });
+      throw new Error(`${doc.flaws[flawName].length} ${flawName} flaws`);
+    }
+  }
+}
+
+async function fixFixableFlaws(doc, options, document) {
+  if (!options.fixFlaws || document.isArchive) return;
+
+  const { rawBody, isMarkdown } = document;
+  if (isMarkdown) {
+    throw new Error("Fixing flaws in Markdown is not implemented yet");
+  }
+  // String copy so we can mutate it
+  let newRawBody = rawBody;
+
+  const phrasing = options.fixFlawsDryRun ? "Would fix" : "Fixed";
+
+  const loud = options.fixFlawsDryRun || options.fixFlawsVerbose;
+
+  // Any 'macros' of type "MacroRedirectedLinkError" or "MacroDeprecatedError"...
+  for (const flaw of doc.flaws.macros || []) {
+    if (flaw.fixable) {
+      // Sanity check that our understanding of flaws, filepaths, and sources
+      // work as expected.
+      if (!newRawBody.includes(flaw.macroSource)) {
+        throw new Error(
+          `rawBody doesn't contain macroSource (${flaw.macroSource})`
+        );
+      }
+      const newMacroSource = flaw.suggestion;
+      // Remember, in JavaScript only the first occurrence will be replaced.
+      newRawBody = newRawBody.replace(flaw.macroSource, newMacroSource);
+      if (loud) {
+        console.log(
+          chalk.grey(
+            `${phrasing} (${flaw.id}) macro ${chalk.white.bold(
+              flaw.macroSource
+            )} to ${chalk.white.bold(newMacroSource)}`
+          )
+        );
+      }
+    }
+  }
+
+  // Any 'broken_links' with a suggestion...
+  for (const flaw of doc.flaws.broken_links || []) {
+    if (!flaw.suggestion) {
+      continue;
+    }
+    // XXX MARKDOWN
+    // The reason we're not using the parse HTML, as a cheerio object `$`
+    // is because the raw HTML we're dealing with isn't actually proper
+    // HTML. It's only proper HTML when the kumascript macros have been
+    // expanded.
+    newRawBody = replaceMatchesInText(flaw.href, newRawBody, flaw.suggestion, {
+      inAttribute: "href",
+    });
+    if (loud) {
+      console.log(
+        chalk.grey(
+          `${phrasing} (${flaw.id}) broken_link ${chalk.white.bold(
+            flaw.href
+          )} to ${chalk.white.bold(flaw.suggestion)}`
+        )
+      );
+    }
+  }
+
+  // Any 'bad_pre_tags' with a suggestion...
+  for (const flaw of doc.flaws.bad_pre_tags || []) {
+    if (!flaw.suggestion || !flaw.fixable) {
+      continue;
+    }
+
+    if (!newRawBody.includes(flaw.html)) {
+      throw new Error(`rawBody doesn't contain flaw HTML (${flaw.html})`);
+    }
+    // It's not feasible to pin point exactly which `<pre>` tag this
+    // refers to, so do the same query we use when we find the
+    // flaw, but this time actually make the mutation.
+    newRawBody = newRawBody.replace(flaw.html, flaw.suggestion);
+    if (loud) {
+      console.log(chalk.grey(`${phrasing} (${flaw.id}) bad_pre_tags`));
+    }
+  }
+
+  // We have a lot of images that *should* be external, at least for the sake
+  // of cleaning up, but aren't. E.g. `/@api/deki/files/247/=HTMLBlinkElement.gif`
+  // These get logged as external images by the flaw detection, but to actually
+  // be able to process them and fix the problem we need to "temporarily"
+  // pretend they were hosted on a remote working full domain.
+  // See https://github.com/mdn/yari/issues/1103
+  function forceExternalURL(url) {
+    if (url.startsWith("/")) {
+      return `https://mdn.mozillademos.org${url}`;
+    }
+    return url;
+  }
+
+  // Any 'images' flaws with a suggestion or external image...
+  for (const flaw of doc.flaws.images || []) {
+    if (!(flaw.suggestion || flaw.externalImage)) {
+      continue;
+    }
+    // The reason we're not using the parse HTML, as a cheerio object `$`
+    // is because the raw HTML we're dealing with isn't actually proper
+    // HTML. It's only proper HTML when the kumascript macros have been
+    // expanded.
+    let newSrc;
+    if (flaw.suggestion) {
+      newSrc = flaw.suggestion;
+    } else {
+      // Sanity check that it's an external image
+      const url = new URL(forceExternalURL(flaw.src));
+      if (url.protocol !== "https:") {
+        throw new Error(`Insecure image URL ${flaw.src}`);
+      }
+      try {
+        const imageResponse = await got(forceExternalURL(flaw.src), {
+          responseType: "buffer",
+          timeout: 10000,
+          retry: 3,
+        });
+        const imageBuffer = imageResponse.body;
+        let fileType = await FileType.fromBuffer(imageBuffer);
+        if (
+          !fileType &&
+          flaw.src.toLowerCase().endsWith(".svg") &&
+          imageResponse.headers["content-type"]
+            .toLowerCase()
+            .startsWith("image/svg+xml")
+        ) {
+          // If the SVG doesn't have the `<?xml version="1.0" encoding="UTF-8"?>`
+          // and/or the `<!DOCTYPE svg PUBLIC ...` in the first couple of bytes
+          // the FileType.fromBuffer will fail.
+          // But if the image URL and the response Content-Type are sane, we
+          // can safely assumes it's an SVG file.
+          fileType = {
+            ext: "xml",
+            mime: "application/xml",
+          };
+        }
+        if (!fileType) {
+          throw new Error(
+            `No file type could be extracted from ${flaw.src} at all. Probably not going to be a valid image file.`
+          );
+        }
+        const isSVG =
+          fileType.mime === "application/xml" &&
+          flaw.src.toLowerCase().endsWith(".svg");
+
+        if (!(VALID_MIME_TYPES.has(fileType.mime) || isSVG)) {
+          throw new Error(
+            `${flaw.src} has an unrecognized mime type: ${fileType.mime}`
+          );
+        }
+        // Otherwise FileType would make it `.xml`
+        const imageExtension = isSVG ? "svg" : fileType.ext;
+        const decodedPathname = decodeURI(url.pathname).replace(/\s+/g, "_");
+        const imageBasename = sanitizeFilename(
+          `${path.basename(
+            decodedPathname,
+            path.extname(decodedPathname)
+          )}.${imageExtension}`
+        );
+        const destination = path.join(
+          Document.getFolderPath(document.metadata),
+          path
+            .basename(imageBasename)
+            // Names like `screenshot-(1).png` are annoying because the `(` often
+            // has to be escaped when working on the command line.
+            .replace(/[()]/g, "")
+            .replace(/\s+/g, "_")
+            // From legacy we have a lot of images that are named like
+            // `/@api/deki/files/247/=HTMLBlinkElement.gif` for example.
+            // Take this opportunity to clean that odd looking leading `=`.
+            .replace(/^=/, "")
+            .toLowerCase()
+        );
+        // Before writing to disk, run it through the same imagemin
+        // compression we do in the filecheck CLI.
+        const compressedImageBuffer = await imagemin.buffer(imageBuffer, {
+          plugins: [getImageminPlugin(url.pathname)],
+        });
+        if (compressedImageBuffer.length < imageBuffer.length) {
+          console.log(
+            `Raw image size: ${humanFileSize(
+              imageBuffer.length
+            )} Compressed: ${humanFileSize(compressedImageBuffer.length)}`
+          );
+          fs.writeFileSync(destination, compressedImageBuffer);
+        } else {
+          console.log(`Raw image size: ${humanFileSize(imageBuffer.length)}`);
+          fs.writeFileSync(destination, imageBuffer);
+        }
+        console.log(`Downloaded ${flaw.src} to ${destination}`);
+        newSrc = path.basename(destination);
+      } catch (error) {
+        const { response } = error;
+        if (response && response.statusCode === 404) {
+          console.log(chalk.yellow(`Skipping ${flaw.src} (404)`));
+          continue;
+        } else if (error.code === "ETIMEDOUT" || error.code === "ENOTFOUND") {
+          console.log(chalk.yellow(`Skipping ${flaw.src} (${error.code})`));
+          continue;
+        } else {
+          console.error(error);
+          throw error;
+        }
+      }
+    }
+    newRawBody = replaceMatchesInText(flaw.src, newRawBody, newSrc, {
+      inAttribute: "src",
+    });
+    if (loud) {
+      console.log(
+        chalk.grey(
+          `${phrasing} (${flaw.id}) image ${chalk.white.bold(
+            flaw.src
+          )} to ${chalk.white.bold(newSrc)}`
+        )
+      );
+    }
+  }
+
+  // Any 'image_widths' flaws with a suggestion
+  for (const flaw of doc.flaws.image_widths || []) {
+    if (!flaw.fixable) {
+      continue;
+    }
+    newRawBody = replaceMatchesInText(flaw.style, newRawBody, flaw.suggestion, {
+      inAttribute: "style",
+      removeEntireAttribute: flaw.suggestion === "",
+    });
+    if (loud) {
+      console.log(
+        flaw.suggestion === ""
+          ? chalk.grey(
+              `${phrasing} (${flaw.id}) image_widths ${chalk.white.bold(
+                "remove entire 'style' attribute"
+              )}`
+            )
+          : chalk.grey(
+              `${phrasing} (${flaw.id}) image_widths style="${chalk.white.bold(
+                flaw.style
+              )}" to style="${chalk.white.bold(flaw.suggestion)}"`
+            )
+      );
+    }
+  }
+
+  // Finally, summarized what happened...
+  if (newRawBody !== rawBody) {
+    // It changed the raw HTML of the source. So deal with this.
+    if (options.fixFlawsDryRun && options.fixFlawsVerbose) {
+      console.log(
+        chalk.yellow(
+          `Would modify "${document.fileInfo.path}" from fixable flaws.`
+        )
+      );
+    } else {
+      Document.update(document.url, newRawBody, document.metadata, isMarkdown);
+      if (options.fixFlawsVerbose) {
+        console.log(
+          chalk.green(
+            `Modified "${chalk.bold(
+              document.fileInfo.path
+            )}" from fixable flaws.`
+          )
+        );
+      }
+    }
+  }
+}
+
+function getImageminPlugin(fileName) {
+  const extension = path.extname(fileName).toLowerCase();
+  if (extension === ".jpg" || extension === ".jpeg") {
+    return imageminMozjpeg();
+  }
+  if (extension === ".png") {
+    return imageminPngquant();
+  }
+  if (extension === ".gif") {
+    return imageminGifsicle();
+  }
+  if (extension === ".svg") {
+    return imageminSvgo();
+  }
+  throw new Error(`No imagemin plugin for ${extension}`);
+}
+
+module.exports = { injectFlaws, injectSectionFlaws, fixFixableFlaws };
diff --git a/build/flaws/pre-tags.js b/build/flaws/pre-tags.js
new file mode 100644
index 000000000000..df5e9ba4ed59
--- /dev/null
+++ b/build/flaws/pre-tags.js
@@ -0,0 +1,105 @@
+const { getFirstMatchInText } = require("../matches-in-text");
+const escapeHTML = (s) =>
+  s
+    .replace(/&/g, "&amp;")
+    .replace(/"/g, "&quot;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;");
+
+function getPreTagFlaws(doc, $, { rawContent }) {
+  const flaws = [];
+
+  // Over the years, we've accumulated a lot of Kuma-HTML where the <pre> tags
+  // are actually full of HTML. Almost exclusively we've observed <pre> tags whose
+  // content is the HTML produced by Prism in the browser. Instead, in these cases,
+  // we should just have the code that it will syntax highlight.
+  // Note! Having HTML in a <pre> tag is nothing weird or wrong. But if you have
+  //
+  //  <pre class="language-js">
+  //    <code class="language-js">
+  //     <span class="keyword">foo</span>
+  //   </code>
+  //  </pre>
+  //
+  // It's better just have the text itself inside the <pre> block:
+  //  <pre class="language-js">
+  //    foo
+  //  </pre>
+  //
+  // This makes it easier to edit the code in raw form. It also makes it less
+  // heavy because any HTML will be replaced with Prism HTML anyway.
+  function addCodeTagFlaw($pre) {
+    const id = `bad_pre_tags${flaws.length + 1}`;
+    const type = "pre_with_html";
+    const explanation = `<pre><code>CODE can be just <pre>CODE`;
+    const suggestion = escapeHTML($pre.text());
+
+    let fixable = false;
+    let html = $pre.html();
+    if (rawContent.includes(html)) {
+      fixable = true;
+    } else {
+      // Many times, the HTML found in the sources is what Cheerio would
+      // serialize as HTML but with the small difference that some entities
+      // are unnecessarily HTML encoded as entities. So, we try to ignore
+      // that and see if we can match it as serialized.
+      const htmlFixed = html.replace(/&apos;/g, "'");
+      if (rawContent.includes(htmlFixed)) {
+        html = htmlFixed;
+        fixable = true;
+      }
+    }
+
+    const flaw = { explanation, id, fixable, html, suggestion, type };
+    if (fixable) {
+      // Only if it's fixable, is the `html` perfectly findable in the raw content.
+      const { line, column } = getFirstMatchInText(html, rawContent);
+      flaw.line = line;
+      flaw.column = column;
+    }
+
+    // Actually mutate the cheerio instance so we benefit from the
+    // flaw detection immediately.
+    // Note that `$pre.text()` might contain unescaped HTML, but Cheerio will
+    // take care of that.
+    $pre.html(suggestion); // strips all other HTML but preserves whitespace
+    $pre.attr("data-flaw", id);
+
+    flaws.push(flaw);
+  }
+
+  // Matches all <code> that are preceded by
+  // a <pre class="...brush...">
+  // Note, when we (in Node) syntax highlight code, the first thing
+  // we look for is the `$("pre[class*=brush]")` selector.
+  // Note, in jQuery you can do `$("pre + code")` which means it only selects
+  // the `<code>` tags that are *immediately preceeding*. This is not supported
+  // in Cheerio :( but the `>` operator works. And since we're only looking
+  // at a specific classname on the <pre> the chances of picking up the wrong
+  // selectors is small.
+  $("pre[class*=brush] > code").each((i, element) => {
+    const $pre = $(element).parent();
+    // Because Cheerio doesn't support selectors like `pre + code` we have to
+    // manually (double) check that the parent really is a `<pre>` tag.
+    if ($pre.length && $pre.get(0).tagName === "pre") {
+      addCodeTagFlaw($pre);
+    }
+  });
+
+  // TODO: Add other <pre> tag flaws underneath.
+  // We report only a single kind of fixable flaw at a time, since
+  // flaws are fixed by replacing raw HTML strings (so fixing the first
+  // fixable flaw might prevent fixing the second fixable flaw)
+  // For details see:
+  //   https://github.com/mdn/yari/pull/2144#issuecomment-748346489
+  //
+  // Also, make sure iterate over the document synchroneously,
+  // e.g., with $().each(), or await for all Promises before moving on to the next flaw.
+  if (flaws.some((flaw) => !flaw.fixable)) {
+    // one more flaw check here
+  }
+
+  return flaws;
+}
+
+module.exports = { getPreTagFlaws };
diff --git a/build/flaws/sections.js b/build/flaws/sections.js
new file mode 100644
index 000000000000..31906b9a4516
--- /dev/null
+++ b/build/flaws/sections.js
@@ -0,0 +1,19 @@
+const { FLAW_LEVELS } = require("../constants");
+
+function injectSectionFlaws(doc, flaws, options) {
+  if (doc.isArchive || !flaws.length) {
+    return;
+  }
+
+  const level = options.flawLevels.get("sectioning");
+  if (level === FLAW_LEVELS.ERROR) {
+    throw new Error(flaws.join(" "));
+  } else if (level === FLAW_LEVELS.WARN) {
+    doc.flaws.sectioning = flaws.map((explanation, i) => {
+      const id = `sectioning${i + 1}`;
+      return { id, explanation };
+    });
+  }
+}
+
+module.exports = { injectSectionFlaws };
diff --git a/build/flaws/unsafe-html.js b/build/flaws/unsafe-html.js
new file mode 100644
index 000000000000..9df27d676cbb
--- /dev/null
+++ b/build/flaws/unsafe-html.js
@@ -0,0 +1,110 @@
+const {
+  INTERACTIVE_EXAMPLES_BASE_URL,
+  LIVE_SAMPLES_BASE_URL,
+} = require("../../kumascript/src/constants");
+const { findMatchesInText } = require("../matches-in-text");
+
+const safeIFrameSrcs = [
+  // EmbedGHLiveSample.ejs
+  "https://mdn.github.io",
+  // EmbedYouTube.ejs
+  "https://www.youtube-nocookie.com",
+  // JSFiddleEmbed.ejs
+  "https://jsfiddle.net",
+  // EmbedTest262ReportResultsTable.ejs
+  "https://test262.report",
+];
+if (LIVE_SAMPLES_BASE_URL) {
+  safeIFrameSrcs.push(LIVE_SAMPLES_BASE_URL.toLowerCase());
+}
+if (INTERACTIVE_EXAMPLES_BASE_URL) {
+  safeIFrameSrcs.push(INTERACTIVE_EXAMPLES_BASE_URL.toLowerCase());
+}
+
+function getAndMarkupUnsafeHTMLFlaws(doc, $, { rawContent, fileInfo }) {
+  const flaws = [];
+
+  function addFlaw(element, explanation) {
+    const id = `unsafe_html${flaws.length + 1}`;
+    let html = $.html($(element));
+    $(element).replaceWith($("<code>").addClass("unsafe-html").text(html));
+    // Some nasty tags are so broken they can make the HTML become more or less
+    // the whole page. E.g. `<script\x20type="text/javascript">`.
+    if (html.length > 100) {
+      html = html.slice(0, Math.min(html.indexOf("\n"), 100)) + "…";
+    }
+    // Perhaps in the future we can make it possibly fixable to delete it.
+    const fixable = false;
+    const suggestion = null;
+
+    const flaw = {
+      explanation,
+      id,
+      fixable,
+      html,
+      suggestion,
+    };
+    for (const { line, column } of findMatchesInText(html, rawContent)) {
+      // This might not find anything because the HTML might have mutated
+      // slightly because of how cheerio parses it. But it doesn't hurt to try.
+      flaw.line = line;
+      flaw.column = column;
+    }
+
+    flaws.push(flaw);
+  }
+
+  $("script, embed, object, iframe").each((i, element) => {
+    const { tagName } = element;
+    if (tagName === "iframe") {
+      // For iframes we only check the 'src' value
+      const src = $(element).attr("src");
+      if (!src) {
+        console.warn(
+          `${fileInfo.path} has an iframe without a 'src' attribute`
+        );
+        return;
+      }
+      // Local URLs are always safe.
+      if (!(src.startsWith("//") || src.includes("://"))) {
+        return;
+      }
+      if (!safeIFrameSrcs.find((s) => src.toLowerCase().startsWith(s))) {
+        addFlaw(element, `Unsafe <iframe> 'src' value (${src})`);
+      }
+    } else {
+      addFlaw(element, `<${tagName}> tag found`);
+    }
+  });
+
+  $("*").each((i, element) => {
+    const { tagName } = element;
+    // E.g. `<script\x20type="text/javascript">javascript:alert(1);</script>`
+    if (tagName.startsWith("script")) {
+      addFlaw(element, `possible <script> tag`);
+    }
+
+    const checkValueAttributes = new Set(["style", "href"]);
+    for (const key in element.attribs) {
+      // No need to lowercase the `key` because it's already always lowercased
+      // by cheerio.
+      // This regex will match on `\xa0onload` and `onmousover` but
+      // not `fond` or `stompon`.
+      if (/(\\x[a-f0-9]{2}|\b)on\w+/.test(key)) {
+        addFlaw(element, `'${key}' on-handler found in ${tagName}`);
+      } else if (checkValueAttributes.has(key)) {
+        const value = element.attribs[key];
+        if (value && /(^|\\x[a-f0-9]{2})javascript:/i.test(value)) {
+          addFlaw(
+            element,
+            `'javascript:' expression found inside 'style' attribute in ${tagName}`
+          );
+        }
+      }
+    }
+  });
+
+  return flaws;
+}
+
+module.exports = { getUnsafeHTMLFlaws: getAndMarkupUnsafeHTMLFlaws };

From 6d1458048757caf519c79ab50eba746b1d3ffa98 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 20 Apr 2021 13:01:01 -0400
Subject: [PATCH 215/288] Live samples should have a border (#3573)

Fixes #3260
---
 client/src/document/index.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/document/index.scss b/client/src/document/index.scss
index ef6188a51d42..9be093d9b900 100644
--- a/client/src/document/index.scss
+++ b/client/src/document/index.scss
@@ -182,7 +182,7 @@ a.new {
     columns: 300px;
   }
 
-  iframe {
+  iframe:not(.sample-code-frame) {
     border: 0;
   }
 }

From 934c3cbf2893be7174b74f14848a66a663f6ae86 Mon Sep 17 00:00:00 2001
From: Gregor <gregorwbr@gmail.com>
Date: Tue, 20 Apr 2021 21:18:48 +0200
Subject: [PATCH 216/288] Add missing proxy-login info to docs

---
 docs/proxying.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/proxying.md b/docs/proxying.md
index d53e63e55468..0418e60335e6 100644
--- a/docs/proxying.md
+++ b/docs/proxying.md
@@ -5,9 +5,10 @@
 Suppose you're working on a feature, in Yari, where you want to make use
 of API responses in a local Kuma. The quickest way to accomplish this is as follows:
 
-1. Start `cd /path/to/kuma && docker-compose up` in a separate terminal
-1. Edit the root `.env` file and...
-
+1. In one terminal `cd /path/to/kuma` to your Kuma directory
+    1. Open `.env` and append this line: `ADDITIONAL_NEXT_URL_ALLOWED_HOSTS=localhost.org:3000`
+    1. Start `docker-compose up`
+1. In another terminal, edit the root `.env` file and...
    - put in the line: `HOST=localhost.org`
    - put in the line: `REACT_APP_KUMA_HOST=localhost.org:8000`
 

From e4b1bc2051a5e42abedf38451402803487046b63 Mon Sep 17 00:00:00 2001
From: Gregor <gregorwbr@gmail.com>
Date: Tue, 20 Apr 2021 21:23:08 +0200
Subject: [PATCH 217/288] run prettier on proxying.md

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

diff --git a/docs/proxying.md b/docs/proxying.md
index 0418e60335e6..4661af592b07 100644
--- a/docs/proxying.md
+++ b/docs/proxying.md
@@ -6,12 +6,11 @@ Suppose you're working on a feature, in Yari, where you want to make use
 of API responses in a local Kuma. The quickest way to accomplish this is as follows:
 
 1. In one terminal `cd /path/to/kuma` to your Kuma directory
-    1. Open `.env` and append this line: `ADDITIONAL_NEXT_URL_ALLOWED_HOSTS=localhost.org:3000`
-    1. Start `docker-compose up`
+   1. Open `.env` and append this line: `ADDITIONAL_NEXT_URL_ALLOWED_HOSTS=localhost.org:3000`
+   1. Start `docker-compose up`
 1. In another terminal, edit the root `.env` file and...
    - put in the line: `HOST=localhost.org`
    - put in the line: `REACT_APP_KUMA_HOST=localhost.org:8000`
-
 1. Now use <http://localhost.org:3000>
 
 **Note!** You have to use <http://localhost.org:3000> (note the extra `.org`)

From ef61bdfc64469f070dfa401a2f160ed29781676c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 05:43:38 +0000
Subject: [PATCH 218/288] build(deps-dev): bump @babel/core from 7.13.15 to
 7.13.16 (#3578)

---
 package.json |   2 +-
 yarn.lock    | 107 +++++++++++++++++++++------------------------------
 2 files changed, 44 insertions(+), 65 deletions(-)

diff --git a/package.json b/package.json
index 81bed0e54c68..9fc37824bd5a 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "unist-util-visit": "2.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.15",
+    "@babel/core": "^7.13.16",
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.1",
     "@storybook/addon-a11y": "^6.2.8",
diff --git a/yarn.lock b/yarn.lock
index 24a0381a27d7..924e25098144 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -26,11 +26,6 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
   integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==
 
-"@babel/compat-data@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1"
-  integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==
-
 "@babel/core@7.12.3":
   version "7.12.3"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
@@ -75,20 +70,20 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.15", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.15.tgz#a6d40917df027487b54312202a06812c4f7792d0"
-  integrity sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ==
+"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.16.tgz#7756ab24396cc9675f1c3fcd5b79fcce192ea96a"
+  integrity sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-compilation-targets" "^7.13.13"
+    "@babel/generator" "^7.13.16"
+    "@babel/helper-compilation-targets" "^7.13.16"
     "@babel/helper-module-transforms" "^7.13.14"
-    "@babel/helpers" "^7.13.10"
-    "@babel/parser" "^7.13.15"
+    "@babel/helpers" "^7.13.16"
+    "@babel/parser" "^7.13.16"
     "@babel/template" "^7.12.13"
     "@babel/traverse" "^7.13.15"
-    "@babel/types" "^7.13.14"
+    "@babel/types" "^7.13.16"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -96,12 +91,12 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.1", "@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.13.9":
-  version "7.13.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
-  integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
+"@babel/generator@^7.12.1", "@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14"
+  integrity sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==
   dependencies:
-    "@babel/types" "^7.13.0"
+    "@babel/types" "^7.13.16"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
@@ -152,12 +147,12 @@
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.13", "@babel/helper-compilation-targets@^7.13.8":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5"
-  integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==
+"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.12.5", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.13", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.13.8":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
+  integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==
   dependencies:
-    "@babel/compat-data" "^7.13.12"
+    "@babel/compat-data" "^7.13.15"
     "@babel/helper-validator-option" "^7.12.17"
     browserslist "^4.14.5"
     semver "^6.3.0"
@@ -520,14 +515,14 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.0"
 
-"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.5", "@babel/helpers@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
-  integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
+"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.5", "@babel/helpers@^7.13.16":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.17.tgz#b497c7a00e9719d5b613b8982bda6ed3ee94caf6"
+  integrity sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg==
   dependencies:
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
+    "@babel/traverse" "^7.13.17"
+    "@babel/types" "^7.13.17"
 
 "@babel/highlight@^7.10.4":
   version "7.10.4"
@@ -547,10 +542,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7", "@babel/parser@^7.13.15", "@babel/parser@^7.7.0":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.15.tgz#8e66775fb523599acb6a289e12929fa5ab0954d8"
-  integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7", "@babel/parser@^7.13.16", "@babel/parser@^7.7.0":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"
+  integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==
 
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
   version "7.13.12"
@@ -1986,27 +1981,26 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.7.0":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.15.tgz#c38bf7679334ddd4028e8e1f7b3aa5019f0dada7"
-  integrity sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.13.17", "@babel/traverse@^7.7.0":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3"
+  integrity sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
+    "@babel/generator" "^7.13.16"
     "@babel/helper-function-name" "^7.12.13"
     "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.15"
-    "@babel/types" "^7.13.14"
+    "@babel/parser" "^7.13.16"
+    "@babel/types" "^7.13.17"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
-  integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.13.16", "@babel/types@^7.13.17", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
+  integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==
   dependencies:
     "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
 "@base2/pretty-print-object@1.0.0":
@@ -10862,7 +10856,7 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.0.0, is-core-module@^2.1.0:
+is-core-module@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
   integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
@@ -12103,14 +12097,7 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
-  dependencies:
-    minimist "^1.2.5"
-
-json5@^2.1.3:
+json5@^2.1.2, json5@^2.1.3:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
   integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
@@ -16591,15 +16578,7 @@ resolve@1.18.1:
     is-core-module "^2.0.0"
     path-parse "^1.0.6"
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.8.1, resolve@^1.9.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
-  dependencies:
-    is-core-module "^2.1.0"
-    path-parse "^1.0.6"
-
-resolve@^1.19.0:
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.3.2, resolve@^1.8.1, resolve@^1.9.0:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==

From ec1ff0f54e98939e2bc4d3e5f6ec2b5e67473e06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 05:45:06 +0000
Subject: [PATCH 219/288] build(deps-dev): bump downshift from 6.1.2 to 6.1.3
 (#3579)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9fc37824bd5a..2431edc7314d 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "braces": "^3.0.2",
     "cross-env": "^7.0.3",
     "diff": "^5.0.0",
-    "downshift": "^6.1.2",
+    "downshift": "^6.1.3",
     "eslint": "^7.18.0",
     "eslint-gitignore": "^0.1.0",
     "eslint-plugin-jest": "24.3.5",
diff --git a/yarn.lock b/yarn.lock
index 924e25098144..76be626f75a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7654,10 +7654,10 @@ download@^7.1.0:
     p-event "^2.1.0"
     pify "^3.0.0"
 
-downshift@^6.0.15, downshift@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.1.2.tgz#99d9a03d4da4bf369df766effc3b70f7e789950e"
-  integrity sha512-WnPoQ6miic4+uEzPEfqgeen0t5YREOUabMopU/Juo/UYDMZl0ZACkO6ykWCRg48dlEUmEt6zfaJlj1x7kEy78g==
+downshift@^6.0.15, downshift@^6.1.3:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.1.3.tgz#e794b7805d24810968f21e81ad6bdd9f3fdc40da"
+  integrity sha512-RA1MuaNcTbt0j+sVLhSs8R2oZbBXYAtdQP/V+uHhT3DoDteZzJPjlC+LQVm9T07Wpvo84QXaZtUCePLDTDwGXg==
   dependencies:
     "@babel/runtime" "^7.13.10"
     compute-scroll-into-view "^1.0.17"

From e0d0f00edb0a5c70c689a4be2c687e536b9636b2 Mon Sep 17 00:00:00 2001
From: Chris Mills <cmills@mozilla.com>
Date: Wed, 21 Apr 2021 14:11:56 +0100
Subject: [PATCH 220/288] activate Korean locale (#3581)

---
 libs/constants/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/libs/constants/index.js b/libs/constants/index.js
index 5e792969be50..79781a519221 100644
--- a/libs/constants/index.js
+++ b/libs/constants/index.js
@@ -51,7 +51,15 @@ const LOCALE_ALIASES = new Map([
 // This must match what we do in `language-menu/index.tsx` where the cookie
 // gets set in the client!
 const PREFERRED_LOCALE_COOKIE_NAME = "preferredlocale";
-const ACTIVE_LOCALES = new Set(["en-us", "fr", "ja", "ru", "zh-cn", "zh-tw"]);
+const ACTIVE_LOCALES = new Set([
+  "en-us",
+  "fr",
+  "ja",
+  "ko",
+  "ru",
+  "zh-cn",
+  "zh-tw",
+]);
 
 module.exports = {
   ACTIVE_LOCALES,

From ce67d66ecd57752801745e9e4d77944925a85c5e Mon Sep 17 00:00:00 2001
From: Schalk Neethling <sneethling@mozilla.com>
Date: Wed, 21 Apr 2021 16:55:55 +0200
Subject: [PATCH 221/288] fix: user menu ui bug fixes (#3574)

Small overrides for the user menu and user menu dropdown

Fix #3415
---
 client/src/ui/molecules/dropdown/index.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/src/ui/molecules/dropdown/index.scss b/client/src/ui/molecules/dropdown/index.scss
index 06042e3463ac..d4d9df45bb53 100644
--- a/client/src/ui/molecules/dropdown/index.scss
+++ b/client/src/ui/molecules/dropdown/index.scss
@@ -17,6 +17,10 @@ $menu-border-radius: 4px;
     font-weight: bold;
     padding: 0;
     white-space: nowrap;
+
+    &:active {
+      background-color: transparent;
+    }
   }
 
   .dropdown-menu-items {
@@ -52,6 +56,10 @@ $menu-border-radius: 4px;
         text-decoration: none;
       }
     }
+
+    .signout-button {
+      text-decoration: none;
+    }
   }
 
   .show {

From b95e5e810026786f2ee1336dc6d9b082ac88609c Mon Sep 17 00:00:00 2001
From: LuckyWind_sck <luckywindsck@gmail.com>
Date: Thu, 22 Apr 2021 05:33:10 +0900
Subject: [PATCH 222/288] fix link in REVIEWING.md (#3585)

---
 docs/REVIEWING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/REVIEWING.md b/docs/REVIEWING.md
index 0d7f0969209a..9a5db5a46a78 100644
--- a/docs/REVIEWING.md
+++ b/docs/REVIEWING.md
@@ -5,7 +5,7 @@ This document provides information on how to review changes to the Yari repo.
 ## Before you start
 
 Set up the Yari repo and the corresponding [content repo](https://github.com/mdn/content)
-locally, as described in the [Yari quickstart](README.md#quickstart) guide. Once
+locally, as described in the [Yari quickstart](../README.md#quickstart) guide. Once
 you've got them successfully set up, run the `yarn` and `yarn dev` commands to
 update your fork with the latest packages and start the MDN test server running
 locally on `localhost:3000`.

From fa57fed51edba71fc1ce7e7d22094bd32d58fab8 Mon Sep 17 00:00:00 2001
From: Rachel Andrew <rachel.andrew@edgeofmyseat.com>
Date: Wed, 21 Apr 2021 21:54:14 +0100
Subject: [PATCH 223/288] adds level 5 CSS fonts spec (#3582)

---
 kumascript/macros/SpecData.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kumascript/macros/SpecData.json b/kumascript/macros/SpecData.json
index ad3e4a2f3e46..b5e9aa23d3f8 100644
--- a/kumascript/macros/SpecData.json
+++ b/kumascript/macros/SpecData.json
@@ -504,6 +504,11 @@
     "url": "https://drafts.csswg.org/css-color-5/",
     "status": "WD"
   },
+  "CSS5 Fonts": {
+    "name": "CSS Fonts Module Level&nbsp;5",
+    "url": "https://drafts.csswg.org/css-fonts-5/",
+    "status": "WD"
+  },
   "CSS5 Media Queries": {
     "name": "Media Queries Level&nbsp;5",
     "url": "https://drafts.csswg.org/mediaqueries-5/",

From 1b1fc1c620018c23b4661ffa08d24c8a8b33b9bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 05:49:45 +0000
Subject: [PATCH 224/288] build(deps-dev): bump jest-puppeteer from 5.0.1 to
 5.0.2 (#3591)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2431edc7314d..86802e76a30b 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "ignore-loader": "^0.1.2",
     "jest-environment-jsdom-sixteen": "^1.0.3",
     "jest-junit-reporter": "^1.1.0",
-    "jest-puppeteer": "5.0.1",
+    "jest-puppeteer": "5.0.2",
     "jsdom": "^16.5.3",
     "jsesc": "^3.0.2",
     "nodemon": "2.0.7",
diff --git a/yarn.lock b/yarn.lock
index 76be626f75a0..c40293e9c45b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11707,10 +11707,10 @@ jest-pnp-resolver@^1.2.2:
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-puppeteer@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/jest-puppeteer/-/jest-puppeteer-5.0.1.tgz#eaa2c38024f6e30b715a953b08ceb19960d04af3"
-  integrity sha512-PH0jpKgVoVqDGWZdFRG0vI/lOmsqYU8fjtJw+7U3UL6lOWkY7BNfFmE7fTlevF/IhYrRqJfeg0l1tmUGA9ck/w==
+jest-puppeteer@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/jest-puppeteer/-/jest-puppeteer-5.0.2.tgz#33607a4785fde3bd8e18ee1c8365d77a718008bc"
+  integrity sha512-qrUVlFQivA9G3zRZho/fZ33RZl7pOOz2ITYgf7ly0sV2mdJA2Sy4966c9n9RuOzKADdg65mwV9zlFTsNVRVt4w==
   dependencies:
     expect-puppeteer "^5.0.0"
     jest-environment-puppeteer "^5.0.1"

From 794bc9ef828d2c31ac8c21e973ddbf3f5179be7a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 05:50:49 +0000
Subject: [PATCH 225/288] build(deps): bump chalk from 4.1.0 to 4.1.1 (#3593)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 86802e76a30b..ec86597edd4a 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@fast-csv/parse": "4.3.6",
     "@mdn/browser-compat-data": "3.3.0",
     "accept-language-parser": "1.5.0",
-    "chalk": "4.1.0",
+    "chalk": "4.1.1",
     "cheerio": "1.0.0-rc.6",
     "cli-progress": "^3.9.0",
     "compression": "1.7.4",
diff --git a/yarn.lock b/yarn.lock
index c40293e9c45b..cefab08a9f5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5865,10 +5865,10 @@ chalk@3.0.0, chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@4.1.0, chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+chalk@4.1.1, chalk@^4.0.0, chalk@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
+  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"

From bb48cd822042b78ea1a9acbb28382f0eac5304c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 05:53:03 +0000
Subject: [PATCH 226/288] build(deps): bump mdn-data from 2.0.17 to 2.0.18
 (#3594)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ec86597edd4a..0538398f3e2c 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "js-yaml": "4.1.0",
     "loglevel": "^1.7.1",
     "lru-cache": "^6.0.0",
-    "mdn-data": "2.0.17",
+    "mdn-data": "2.0.18",
     "open": "^8.0.6",
     "open-editor": "3.0.0",
     "prismjs": "1.23.0",
diff --git a/yarn.lock b/yarn.lock
index cefab08a9f5b..0d33af4b9f27 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12871,10 +12871,10 @@ mdn-data@2.0.14:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
-mdn-data@2.0.17:
-  version "2.0.17"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.17.tgz#8618b37fd552270a5c917ab79cf962adea4eb3b6"
-  integrity sha512-3hZJh85oEm88+uWhoutFhoHA/Rjq/Tf8fsPxpYYLYOJei5uofjR23EOVJwA4qYCF2L21PXLN/o67KVAS7LGxLg==
+mdn-data@2.0.18:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.18.tgz#7c82cb9478545cae34c3d2d7a133c02030fbdcdf"
+  integrity sha512-IeEPegFtPhAMl+Un8cUGHHdw59R1tfogShfv9c/OSRwQmKM05emvQNtH8mO6iRpoj2VpvBsRQW4YZYil5nd7eg==
 
 mdn-data@2.0.4:
   version "2.0.4"

From ed030eb77b8716295e699264c2a01fb8cb9ddadd Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 22 Apr 2021 12:40:35 -0400
Subject: [PATCH 227/288] EmbedLiveSample errors should probably be fatal
 (#3576)

* EmbedLiveSample errors should probably be fatal

Fixes #2489

* make it fatal only for en-US at the moment
---
 build/cli.js   |  4 ++++
 build/index.js | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/build/cli.js b/build/cli.js
index 9b6c03fcaf03..c24907bd7519 100644
--- a/build/cli.js
+++ b/build/cli.js
@@ -35,6 +35,10 @@ async function buildDocumentInteractive(
       ? Document.read(documentPath, Document.MEMOIZE_INVALIDATE)
       : Document.read(documentPath);
 
+    if (!document) {
+      throw new Error(`${documentPath} could not be read`);
+    }
+
     if (!interactive) {
       const translations = translationsOf(document.metadata);
       if (translations && translations.length > 0) {
diff --git a/build/index.js b/build/index.js
index 53d67b61d38a..41e328c6e375 100644
--- a/build/index.js
+++ b/build/index.js
@@ -289,7 +289,24 @@ async function buildDocument(document, documentOptions = {}) {
         sampleIdObject
       );
       if (liveSamplePage.flaw) {
-        flaws.push(liveSamplePage.flaw.updateFileInfo(fileInfo));
+        const flaw = liveSamplePage.flaw.updateFileInfo(fileInfo);
+        if (flaw.name === "MacroLiveSampleError") {
+          // As of April 2021 there are 0 pages in mdn/content that trigger
+          // a MacroLiveSampleError. So we can be a lot more strict with en-US
+          // until the translated-content has had a chance to clean up all
+          // their live sample errors.
+          // See https://github.com/mdn/yari/issues/2489
+          if (document.metadata.locale === "en-US") {
+            throw new Error(
+              `MacroLiveSampleError within ${flaw.filepath}, line ${flaw.line} column ${flaw.column} (${flaw.error.message})`
+            );
+          } else {
+            console.warn(
+              `MacroLiveSampleError within ${flaw.filepath}, line ${flaw.line} column ${flaw.column} (${flaw.error.message})`
+            );
+          }
+        }
+        flaws.push(flaw);
         continue;
       }
       liveSamples.push({

From 2c644475651c5e8f86ed291c7e764dbc0b5acc6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 16:48:14 +0000
Subject: [PATCH 228/288] build(deps-dev): bump puppeteer from 8.0.0 to 9.0.0
 (#3597)

---
 package.json |  2 +-
 yarn.lock    | 25 ++++++++++---------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 0538398f3e2c..c9fffe116720 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "prettier": "2.2.1",
     "prettier-plugin-packagejson": "^2.2.10",
     "pretty-quick": "3.1.0",
-    "puppeteer": "8.0.0",
+    "puppeteer": "9.0.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-is": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 0d33af4b9f27..c92a371d6ff8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7377,10 +7377,10 @@ detect-port@^1.3.0:
     address "^1.0.1"
     debug "^2.6.0"
 
-devtools-protocol@0.0.854822:
-  version "0.0.854822"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.854822.tgz#eac3a5260a6b3b4e729a09fdc0c77b0d322e777b"
-  integrity sha512-xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg==
+devtools-protocol@0.0.869402:
+  version "0.0.869402"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.869402.tgz#03ade701761742e43ae4de5dc188bcd80f156d8d"
+  integrity sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==
 
 diagnostics@^1.1.1:
   version "1.1.1"
@@ -15519,13 +15519,13 @@ pupa@^2.0.1:
   dependencies:
     escape-goat "^2.0.0"
 
-puppeteer@8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-8.0.0.tgz#a236669118aa795331c2d0ca19877159e7664705"
-  integrity sha512-D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ==
+puppeteer@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-9.0.0.tgz#b476e17ceb3e33a6667bf682d66dde9898f9c031"
+  integrity sha512-Avu8SKWQRC1JKNMgfpH7d4KzzHOL/A65jRYrjNU46hxnOYGwqe4zZp/JW8qulaH0Pnbm5qyO3EbSKvqBUlfvkg==
   dependencies:
     debug "^4.1.0"
-    devtools-protocol "0.0.854822"
+    devtools-protocol "0.0.869402"
     extract-zip "^2.0.0"
     https-proxy-agent "^5.0.0"
     node-fetch "^2.6.1"
@@ -19782,16 +19782,11 @@ ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.2.3:
+ws@^7.2.3, ws@^7.4.4:
   version "7.4.5"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
   integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
 
-ws@^7.4.4:
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz#383bc9742cb202292c9077ceab6f6047b17f2d59"
-  integrity sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==
-
 xdg-basedir@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"

From d44b167511eb21cd16e85f3d926103b295915074 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 17:39:04 +0000
Subject: [PATCH 229/288] build(deps-dev): bump webpack-node-externals from
 2.5.2 to 3.0.0 (#3592)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c9fffe116720..cbbe66f9bc1e 100644
--- a/package.json
+++ b/package.json
@@ -169,7 +169,7 @@
     "use-debounce": "^5.2.1",
     "webpack": "^4.44.2",
     "webpack-cli": "^4.6.0",
-    "webpack-node-externals": "^2.5.2"
+    "webpack-node-externals": "^3.0.0"
   },
   "engines": {
     "node": ">=12.11"
diff --git a/yarn.lock b/yarn.lock
index c92a371d6ff8..059164830eb3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19343,10 +19343,10 @@ webpack-merge@^5.7.3:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
-webpack-node-externals@^2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-2.5.2.tgz#178e017a24fec6015bc9e672c77958a6afac861d"
-  integrity sha512-aHdl/y2N7PW2Sx7K+r3AxpJO+aDMcYzMQd60Qxefq3+EwhewSbTBqNumOsCE1JsCUNoyfGj5465N0sSf6hc/5w==
+webpack-node-externals@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz#1a3407c158d547a9feb4229a9e3385b7b60c9917"
+  integrity sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ==
 
 webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
   version "1.4.3"

From 3d819ffe85ecebcbaca4932da64a6b719b52d938 Mon Sep 17 00:00:00 2001
From: Rachel Andrew <rachel.andrew@edgeofmyseat.com>
Date: Thu, 22 Apr 2021 19:17:06 +0100
Subject: [PATCH 230/288] adds WebHID spec (#3599)

---
 kumascript/macros/SpecData.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kumascript/macros/SpecData.json b/kumascript/macros/SpecData.json
index b5e9aa23d3f8..ed7f4eed3f70 100644
--- a/kumascript/macros/SpecData.json
+++ b/kumascript/macros/SpecData.json
@@ -1644,6 +1644,11 @@
     "url": "https://www.khronos.org/registry/webgl/specs/latest/2.0/",
     "status": "ED"
   },
+  "WebHID": {
+    "name": "WebHID API",
+    "url": "https://wicg.github.io/webhid/",
+    "status": "Draft"
+  },
   "Web NFC": {
     "name": "Web NFC",
     "url": "https://w3c.github.io/web-nfc/",

From 8fa67dcdbe7356d47d4f98da8120a602ddd3f81f Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 22 Apr 2021 14:26:19 -0400
Subject: [PATCH 231/288] Flaw check that docs don't link to themselves?
 (#3575)

* Flaw check that docs don't link to themselves?

Fixes #2974

* feedbacked

* fix tests
---
 build/flaws/broken-links.js                    | 18 ++++++++++++++++++
 .../files/en-us/web/brokenlinks/index.html     |  6 ++++++
 testing/tests/index.test.js                    | 11 ++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/build/flaws/broken-links.js b/build/flaws/broken-links.js
index 0ef5f59e8e0e..e939f66a2c95 100644
--- a/build/flaws/broken-links.js
+++ b/build/flaws/broken-links.js
@@ -146,6 +146,24 @@ function getBrokenLinksFlaws(doc, $, { rawContent }, level) {
           `/${VALID_LOCALES.get(homepageLocale.toLowerCase())}/`
         );
       }
+    } else if (hrefNormalized === doc.mdn_url) {
+      if (hrefSplit.length > 1) {
+        addBrokenLink(
+          a,
+          checked.get(href),
+          href,
+          `#${hrefSplit[1]}`,
+          "No need for the pathname in anchor links if it's the same page"
+        );
+      } else {
+        addBrokenLink(
+          a,
+          checked.get(href),
+          href,
+          null,
+          "Link points to the page it's already on"
+        );
+      }
     } else if (href.startsWith("/") && !href.startsWith("//")) {
       // Got to fake the domain to sensible extract the .search and .hash
       const absoluteURL = new URL(href, "http://www.example.com");
diff --git a/testing/content/files/en-us/web/brokenlinks/index.html b/testing/content/files/en-us/web/brokenlinks/index.html
index 203f1bfc22d3..26c6f8aac76e 100644
--- a/testing/content/files/en-us/web/brokenlinks/index.html
+++ b/testing/content/files/en-us/web/brokenlinks/index.html
@@ -26,3 +26,9 @@
 <p><a href='/en-US/docs/Hopeless/Case'>Will not have a suggestion</></p>
 
 <p><a href="//www.peterbe.com">Leave me alone! I'm actually external</a></p>
+
+<p>
+  <a href="/en-US/docs/Web/BrokenLinks">Link to itself (bad)</a><br>
+  <a href="/en-US/docs/Web/BrokenLinks#anchor">Link to itself for anchor (good)</a><br>
+  <a href="#anchor">Link to itself for anchor (good)</a>
+</p>
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 782baeb74965..b2f07bdbaef3 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -521,7 +521,7 @@ test("broken links flaws", () => {
   const { flaws } = doc;
   // You have to be intimately familiar with the fixture to understand
   // why these flaws come out as they do.
-  expect(flaws.broken_links.length).toBe(9);
+  expect(flaws.broken_links.length).toBe(11);
   // Map them by 'href'
   const map = new Map(flaws.broken_links.map((x) => [x.href, x]));
   expect(map.get("/en-US/docs/Hopeless/Case").suggestion).toBeNull();
@@ -547,6 +547,15 @@ test("broken links flaws", () => {
   expect(
     map.get("/en-US/docs/glossary/bézier_curve#identifier").suggestion
   ).toBe("/en-US/docs/Glossary/Bézier_curve#identifier");
+  expect(map.get("/en-US/docs/Web/BrokenLinks").explanation).toBe(
+    "Link points to the page it's already on"
+  );
+  expect(map.get("/en-US/docs/Web/BrokenLinks#anchor").explanation).toBe(
+    "No need for the pathname in anchor links if it's the same page"
+  );
+  expect(map.get("/en-US/docs/Web/BrokenLinks#anchor").suggestion).toBe(
+    "#anchor"
+  );
 });
 
 test("repeated broken links flaws", () => {

From 7cd9b6c32f9ee16d1dce837a84ccc332aa66d7f1 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 22 Apr 2021 16:39:39 -0400
Subject: [PATCH 232/288] contributors URL's are incorrectly considered broken
 (#3604)

* contributors URL's are incorrectly considered broken

Fixes #3446

* feedbacked
---
 build/flaws/broken-links.js                            | 9 +++++++++
 testing/content/files/en-us/web/brokenlinks/index.html | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/build/flaws/broken-links.js b/build/flaws/broken-links.js
index e939f66a2c95..f8fca8c194dd 100644
--- a/build/flaws/broken-links.js
+++ b/build/flaws/broken-links.js
@@ -121,6 +121,15 @@ function getBrokenLinksFlaws(doc, $, { rawContent }, level) {
       hrefNormalized = `/${thisDocumentLocale}${hrefNormalized}`;
     }
 
+    if (
+      hrefNormalized.endsWith("/contributors.txt") &&
+      hrefNormalized.startsWith("/") &&
+      !href.startsWith("//")
+    ) {
+      // Do nothing. The /contributors.txt URLs are special Yari URLs.
+      return;
+    }
+
     if (href.startsWith("https://developer.mozilla.org/")) {
       // It might be a working 200 OK link but the link just shouldn't
       // have the full absolute URL part in it.
diff --git a/testing/content/files/en-us/web/brokenlinks/index.html b/testing/content/files/en-us/web/brokenlinks/index.html
index 26c6f8aac76e..bcdef0d44ddb 100644
--- a/testing/content/files/en-us/web/brokenlinks/index.html
+++ b/testing/content/files/en-us/web/brokenlinks/index.html
@@ -32,3 +32,7 @@
   <a href="/en-US/docs/Web/BrokenLinks#anchor">Link to itself for anchor (good)</a><br>
   <a href="#anchor">Link to itself for anchor (good)</a>
 </p>
+
+<p>
+  <a href="/en-US/docs/Web/BrokenLinks/contributors.txt">Link to <code>/contributors.txt</code></a> (not a flaw)
+</p>

From a75b4d13a813aac9ee8f6cd906ac4bed3467f108 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 22 Apr 2021 17:30:01 -0400
Subject: [PATCH 233/288] edit/update comment for pr review (#3609)

* Edit/Update comment for PR review

Part of #3487

* Edit/Update comment for PR review

Fixes #3487
---
 deployer/src/deployer/analyze_pr.py | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/deployer/src/deployer/analyze_pr.py b/deployer/src/deployer/analyze_pr.py
index 4cc7643b7c36..7e316dbc7400 100644
--- a/deployer/src/deployer/analyze_pr.py
+++ b/deployer/src/deployer/analyze_pr.py
@@ -1,6 +1,7 @@
 import datetime
 import hashlib
 import json
+import re
 from collections import defaultdict
 from pathlib import Path
 
@@ -9,6 +10,10 @@
 
 from .utils import log
 
+comment_hidden_comment = re.compile(
+    r"<!-- build_hash: ([a-f0-9]+) date: ([\d:\.\- ]+) -->"
+)
+
 
 def analyze_pr(build_directory: Path, config):
     """Given a directory of documents built from a PR, look through it and
@@ -37,10 +42,10 @@ def analyze_pr(build_directory: Path, config):
 
     # The build_hash can potentially be used if we want to find an existing comment
     # that's already been made about this exact set of build files.
-    combined_comment = (
-        f"<!-- build_hash: {build_hash} date: {datetime.datetime.utcnow()} -->\n\n"
-        f"{combined_comment}"
+    hidden_comment = (
+        f"<!-- build_hash: {build_hash} date: {datetime.datetime.utcnow()} -->"
     )
+    combined_comment = f"{hidden_comment}\n\n{combined_comment}"
 
     if not config["repo"]:
         print("Warning! No 'repo' config")
@@ -58,7 +63,19 @@ def analyze_pr(build_directory: Path, config):
             github = Github(config["github_token"])
             github_repo = github.get_repo(config["repo"])
             github_issue = github_repo.get_issue(number=int(config["pr_number"]))
-            github_issue.create_comment(combined_comment)
+            for comment in github_issue.get_comments():
+                if comment.user.login == "github-actions[bot]":
+                    if comment_hidden_comment.findall(comment.body):
+                        new_body = comment_hidden_comment.sub(
+                            hidden_comment, comment.body
+                        )
+                        new_body += f"\n\n*(this comment was updated {datetime.datetime.utcnow()})*"
+                        comment.edit(body=new_body)
+                        print(f"Updating existing comment ({comment})")
+                        break
+
+            else:
+                github_issue.create_comment(combined_comment)
 
     return combined_comment
 

From a5d6d04964982400fe4c07c48dcc185891d143ce Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 22 Apr 2021 19:20:02 -0400
Subject: [PATCH 234/288] don't list documents with 0 flaws (#3610)

* don't list documents with 0 flaws

Part of #3499

* fix tests
---
 deployer/src/deployer/analyze_pr.py      | 50 ++++++++++++++----------
 deployer/src/deployer/test_analyze_pr.py |  4 +-
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/deployer/src/deployer/analyze_pr.py b/deployer/src/deployer/analyze_pr.py
index 7e316dbc7400..a98375f55939 100644
--- a/deployer/src/deployer/analyze_pr.py
+++ b/deployer/src/deployer/analyze_pr.py
@@ -163,31 +163,33 @@ def post_about_flaws(build_directory: Path, **config):
 
     MAX_FLAW_EXPLANATION = 5
 
+    docs_with_zero_flaws = 0
+
     for doc in get_built_docs(build_directory):
         if not doc.get("flaws"):
-            comments.append((doc, "No flaws! 🎉"))
+            docs_with_zero_flaws += 1
             continue
-        else:
-            flaws_list = []
-            for flaw_name, flaw_values in doc["flaws"].items():
-                flaws_list.append(f"- **{flaw_name}**:")
-                for i, flaw_value in enumerate(flaw_values):
-                    if i + 1 > MAX_FLAW_EXPLANATION:
-                        flaws_list.append(
-                            f"  - *and {len(flaw_values) - MAX_FLAW_EXPLANATION}"
-                            " more flaws omitted*"
-                        )
-                        break
-                    if isinstance(flaw_value, dict):
-                        explanation = flaw_value.get("explanation")
-                    else:
-                        explanation = str(flaw_value)
-                    if explanation:
-                        flaws_list.append(f"  - `{explanation}`")
-                    else:
-                        flaws_list.append("  - *no explanation!*")
 
-            comments.append((doc, "\n".join(flaws_list)))
+        flaws_list = []
+        for flaw_name, flaw_values in doc["flaws"].items():
+            flaws_list.append(f"- **{flaw_name}**:")
+            for i, flaw_value in enumerate(flaw_values):
+                if i + 1 > MAX_FLAW_EXPLANATION:
+                    flaws_list.append(
+                        f"  - *and {len(flaw_values) - MAX_FLAW_EXPLANATION}"
+                        " more flaws omitted*"
+                    )
+                    break
+                if isinstance(flaw_value, dict):
+                    explanation = flaw_value.get("explanation")
+                else:
+                    explanation = str(flaw_value)
+                if explanation:
+                    flaws_list.append(f"  - `{explanation}`")
+                else:
+                    flaws_list.append("  - *no explanation!*")
+
+        comments.append((doc, "\n".join(flaws_list)))
 
     def count_flaws(flaws):
         count = 0
@@ -196,6 +198,12 @@ def count_flaws(flaws):
         return count
 
     heading = "## Flaws\n\n"
+    if docs_with_zero_flaws:
+        heading += (
+            f"Note! *{docs_with_zero_flaws} "
+            f"document{'' if docs_with_zero_flaws == 1 else 's'} with no flaws "
+            "that don't need to be listed. 🎉*\n\n"
+        )
 
     if comments:
         # Now turn all of these individual comments into one big one
diff --git a/deployer/src/deployer/test_analyze_pr.py b/deployer/src/deployer/test_analyze_pr.py
index c235f9e86866..89a75048dd01 100644
--- a/deployer/src/deployer/test_analyze_pr.py
+++ b/deployer/src/deployer/test_analyze_pr.py
@@ -62,9 +62,9 @@ def test_analyze_pr_flaws():
     with mock_build_directory(no_flaws_doc, doc) as build_directory:
         comment = analyze_pr(build_directory, dict(DEFAULT_CONFIG, analyze_flaws=True))
         assert "## Flaws" in comment
-        assert "No flaws!" in comment
+        assert "1 document with no flaws that don't need to be listed" in comment
         assert "Flaw count: 2" in comment
-        assert len(comment.split("\n---\n")) == 2
+        assert len(comment.split("\n---\n")) == 1
         assert "- **faux_pas**:" in comment
         assert "  - `Socks in sandals`" in comment
         assert "  - `Congrats on losing your cat`" in comment

From 0c03c48d86d812b002230431d9df2b1af746af91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Apr 2021 08:16:24 +0000
Subject: [PATCH 235/288] build(deps-dev): bump @storybook/node-logger from
 6.2.8 to 6.2.9 (#3612)

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

diff --git a/package.json b/package.json
index cbbe66f9bc1e..b51d9aed6132 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "@storybook/addon-actions": "^6.2.8",
     "@storybook/addon-essentials": "^6.2.8",
     "@storybook/addon-links": "^6.2.8",
-    "@storybook/node-logger": "^6.2.8",
+    "@storybook/node-logger": "^6.2.9",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.2.8",
     "@testing-library/react": "^11.2.6",
diff --git a/yarn.lock b/yarn.lock
index 059164830eb3..e9399573408b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3222,7 +3222,7 @@
   dependencies:
     lodash "^4.17.15"
 
-"@storybook/node-logger@6.2.8", "@storybook/node-logger@^6.2.8":
+"@storybook/node-logger@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.8.tgz#a5cb21e397a3e4945375b73803f901c93513a56c"
   integrity sha512-mSbHF1yneRScviISaDQmtRcOBwjHbmdc8p791X4Myl87luqENnt0s8mnTG0H8uH/LGKvtZ2AGST89MqusQ6xUw==
@@ -3233,6 +3233,17 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
+"@storybook/node-logger@^6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.9.tgz#c67d8d7684514b8d00207502e8a9adda0ee750e5"
+  integrity sha512-ryRBChWZf1A5hOVONErJZosS25IdMweoMVFAUAcj91iC0ynoSA6YL2jmoE71jQchxEXEgkDeRkX9lR/GlqFGZQ==
+  dependencies:
+    "@types/npmlog" "^4.1.2"
+    chalk "^4.1.0"
+    core-js "^3.8.2"
+    npmlog "^4.1.2"
+    pretty-hrtime "^1.0.3"
+
 "@storybook/postinstall@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.2.8.tgz#abf0f1b26f8273b49c10360207d20d3f23eafbb6"

From 84487dd6d6170c96021e11d7669934048126b4ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Apr 2021 08:48:26 +0000
Subject: [PATCH 236/288] build(deps-dev): bump @storybook/addon-actions from
 6.2.8 to 6.2.9 (#3614)

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

diff --git a/package.json b/package.json
index b51d9aed6132..45e0357a2c93 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.1",
     "@storybook/addon-a11y": "^6.2.8",
-    "@storybook/addon-actions": "^6.2.8",
+    "@storybook/addon-actions": "^6.2.9",
     "@storybook/addon-essentials": "^6.2.8",
     "@storybook/addon-links": "^6.2.8",
     "@storybook/node-logger": "^6.2.9",
diff --git a/yarn.lock b/yarn.lock
index e9399573408b..518342067399 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2697,7 +2697,7 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@6.2.8", "@storybook/addon-actions@^6.2.8":
+"@storybook/addon-actions@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.8.tgz#e11d01a35e4685e692015a5051c583a0931ecd4a"
   integrity sha512-bQE9rmVGThniXWxz57Py5bqC4my7DLCK3gT4U4cXv31zH+NMlJqSNHHfHf/Ob43fTdoCyLcB3vlWsPLra7WOCg==
@@ -2720,6 +2720,29 @@
     util-deprecate "^1.0.2"
     uuid-browser "^3.1.0"
 
+"@storybook/addon-actions@^6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.9.tgz#688413ac77410690755a5da3c277bfa0ff1a10b0"
+  integrity sha512-CkUYSMt+fvuHfWvtDzlhhaeQBCWlUo99xdL88JTsTml05P43bIHZNIRv2QJ8DwhHuxdIPeHKLmz9y/ymOagOnw==
+  dependencies:
+    "@storybook/addons" "6.2.9"
+    "@storybook/api" "6.2.9"
+    "@storybook/client-api" "6.2.9"
+    "@storybook/components" "6.2.9"
+    "@storybook/core-events" "6.2.9"
+    "@storybook/theming" "6.2.9"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    polished "^4.0.5"
+    prop-types "^15.7.2"
+    react-inspector "^5.1.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+    uuid-browser "^3.1.0"
+
 "@storybook/addon-backgrounds@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.2.8.tgz#9fb199c283c346335503e8a6cd18b0839aea9b8e"
@@ -2879,6 +2902,21 @@
     global "^4.4.0"
     regenerator-runtime "^0.13.7"
 
+"@storybook/addons@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.2.9.tgz#b7ba2b9f0e15b852c7d6b57d04fb0a493c57477c"
+  integrity sha512-GnmEKbJwiN1jncN9NSA8CuR1i2XAlasPcl/Zn0jkfV9WitQeczVcJCPw86SGH84AD+tTBCyF2i9UC0KaOV1YBQ==
+  dependencies:
+    "@storybook/api" "6.2.9"
+    "@storybook/channels" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/core-events" "6.2.9"
+    "@storybook/router" "6.2.9"
+    "@storybook/theming" "6.2.9"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    regenerator-runtime "^0.13.7"
+
 "@storybook/api@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.8.tgz#9165b25f8b71e08c4af5a30805407b025fbb5b1f"
@@ -2905,6 +2943,32 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/api@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.2.9.tgz#a9b46569192ad5d8da6435c9d63dc4b0c8463b51"
+  integrity sha512-okkA3HAScE9tGnYBrjTOcgzT+L1lRHNoEh3ZfGgh1u/XNEyHGNkj4grvkd6nX7BzRcYQ/l2VkcKCqmOjUnSkVQ==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/channels" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/core-events" "6.2.9"
+    "@storybook/csf" "0.0.1"
+    "@storybook/router" "6.2.9"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.9"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    store2 "^2.12.0"
+    telejson "^5.1.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/builder-webpack4@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.2.8.tgz#af7b7d72617c38b917b2dfc910d268e022090fcd"
@@ -2994,6 +3058,19 @@
     qs "^6.10.0"
     telejson "^5.1.0"
 
+"@storybook/channel-postmessage@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.9.tgz#ad85573e0a5d6f0cde3504f168d87a73cb0b6269"
+  integrity sha512-OqV+gLeeCHR0KExsIz0B7gD17Cjd9D+I75qnBsLWM9inWO5kc/WZ5svw8Bvjlcm6snWpvxUaT8L+svuqcPSmww==
+  dependencies:
+    "@storybook/channels" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/core-events" "6.2.9"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    qs "^6.10.0"
+    telejson "^5.1.0"
+
 "@storybook/channels@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.8.tgz#81ec350291adfe479eea69e47f670d64ce0fe8a2"
@@ -3003,6 +3080,15 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/channels@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.2.9.tgz#a9fd7f25102cbec15fb56f76abf891b7b214e9de"
+  integrity sha512-6dC8Fb2ipNyOQXnUZMDeEUaJGH5DMLzyHlGLhVyDtrO5WR6bO8mQdkzf4+5dSKXgCBNX0BSkssXth4pDjn18rg==
+  dependencies:
+    core-js "^3.8.2"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-api@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.8.tgz#69b02085fcc4f00798d04ac03e6af514d6c87975"
@@ -3027,6 +3113,30 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.2.9.tgz#f0bb44e9b2692adfbf30d7ff751c6dd44bcfe1ce"
+  integrity sha512-aLvEUVkbvv6Qo/2mF4rFCecdqi2CGOUDdsV1a6EFIVS/9gXFdpirsOwKHo9qNjacGdWPlBYGCUcbrw+DvNaSFA==
+  dependencies:
+    "@storybook/addons" "6.2.9"
+    "@storybook/channel-postmessage" "6.2.9"
+    "@storybook/channels" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/core-events" "6.2.9"
+    "@storybook/csf" "0.0.1"
+    "@types/qs" "^6.9.5"
+    "@types/webpack-env" "^1.16.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    stable "^0.1.8"
+    store2 "^2.12.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.8.tgz#2e32cc9f0b73e29fb386383ab9e927ab6d3668fc"
@@ -3035,6 +3145,14 @@
     core-js "^3.8.2"
     global "^4.4.0"
 
+"@storybook/client-logger@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.2.9.tgz#77c1ea39684ad2a2cf6836051b381fc5b354e132"
+  integrity sha512-IfOQZuvpjh66qBInQCJOb9S0dTGpzZ/Cxlcvokp+PYt95KztaWN3mPm+HaDQCeRsrWNe0Bpm1zuickcJ6dBOXg==
+  dependencies:
+    core-js "^3.8.2"
+    global "^4.4.0"
+
 "@storybook/components@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.8.tgz#303150977965f9750e7528e58fc5d1c0a1220bd2"
@@ -3065,6 +3183,36 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
+"@storybook/components@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.2.9.tgz#7189f9715b05720fe083ae8ad014849f14e98e73"
+  integrity sha512-hnV1MI2aB2g1sJ7NJphpxi7TwrMZQ/tpCJeHnkjmzyC6ez1MXqcBXGrEEdSXzRfAxjQTOEpu6H1mnns0xMP0Ag==
+  dependencies:
+    "@popperjs/core" "^2.6.0"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/csf" "0.0.1"
+    "@storybook/theming" "6.2.9"
+    "@types/color-convert" "^2.0.0"
+    "@types/overlayscrollbars" "^1.12.0"
+    "@types/react-syntax-highlighter" "11.0.5"
+    color-convert "^2.0.1"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    markdown-to-jsx "^7.1.0"
+    memoizerific "^1.11.3"
+    overlayscrollbars "^1.13.1"
+    polished "^4.0.5"
+    prop-types "^15.7.2"
+    react-colorful "^5.0.1"
+    react-popper-tooltip "^3.1.1"
+    react-syntax-highlighter "^13.5.3"
+    react-textarea-autosize "^8.3.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/core-client@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.2.8.tgz#0a103d8fb6c2e56a9565b7af36f11f4ed9620fe8"
@@ -3148,6 +3296,13 @@
   dependencies:
     core-js "^3.8.2"
 
+"@storybook/core-events@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.9.tgz#4f12947cd15d1eb3c4109923657c012feef521cd"
+  integrity sha512-xQmbX/oYQK1QsAGN8hriXX5SUKOoTUe3L4dVaVHxJqy7MReRWJpprJmCpbAPJzWS6WCbDFfCM5kVEexHLOzJlQ==
+  dependencies:
+    core-js "^3.8.2"
+
 "@storybook/core-server@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.2.8.tgz#83bd8e229225b3d7e5b11d91850b7b15bdab7525"
@@ -3309,6 +3464,22 @@
     qs "^6.10.0"
     ts-dedent "^2.0.0"
 
+"@storybook/router@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.2.9.tgz#547543031dd8330870bb6b473dcf7e51982e841c"
+  integrity sha512-7Bn1OFoItCl8whXRT8N1qp1Lky7kzXJ3aslWp5E8HcM8rxh4OYXfbaeiyJEJxBTGC5zxgY+tAEXHFjsAviFROg==
+  dependencies:
+    "@reach/router" "^1.3.4"
+    "@storybook/client-logger" "6.2.9"
+    "@types/reach__router" "^1.3.7"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    memoizerific "^1.11.3"
+    qs "^6.10.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/semver@^7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0"
@@ -3351,6 +3522,24 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
+"@storybook/theming@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.2.9.tgz#16bf40180861f222c7ed1d80abd5d1e3cb315660"
+  integrity sha512-183oJW7AD7Fhqg5NT4ct3GJntwteAb9jZnQ6yhf9JSdY+fk8OhxRbPf7ov0au2gYACcGrWDd9K5pYQsvWlP5gA==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@emotion/is-prop-valid" "^0.8.6"
+    "@emotion/styled" "^10.0.27"
+    "@storybook/client-logger" "6.2.9"
+    core-js "^3.8.2"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.27"
+    global "^4.4.0"
+    memoizerific "^1.11.3"
+    polished "^4.0.5"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+
 "@storybook/ui@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.2.8.tgz#331f8f5bb8e6feaf15a3a91b23eba48509882650"

From 2a177f2c7a03ae866bb257451cf80cd53364422d Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 23 Apr 2021 09:36:02 -0400
Subject: [PATCH 237/288] Use sessionStorage to "cache" the whoami XHR (#3337)

* Use sessionStorage to "cache" the whoami XHR

Fixes #3336

* fix tests

* eslint

* feedbacked

* fix problem with sign out

* simplify headless test

* feedbacked
---
 client/src/auth/sign-in.tsx             |  8 +++-
 client/src/ui/molecules/login/index.tsx | 15 +++++++-
 client/src/user-context.tsx             | 51 ++++++++++++++++++++++++-
 3 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/client/src/auth/sign-in.tsx b/client/src/auth/sign-in.tsx
index 803145c1c240..66f28cf45dc2 100644
--- a/client/src/auth/sign-in.tsx
+++ b/client/src/auth/sign-in.tsx
@@ -1,6 +1,6 @@
 import { useSearchParams } from "react-router-dom";
 
-import { useUserData } from "../user-context";
+import { useUserData, removeSessionStorageData } from "../user-context";
 import { useLocale } from "../hooks";
 
 import { ReactComponent as GithubLogo } from "@mdn/dinocons/brands/github-mark-small.svg";
@@ -82,6 +82,9 @@ export default function SignInApp() {
                 <a
                   href={`${prefix}/users/github/login/?${sp.toString()}`}
                   className="button icon-button outline"
+                  onClick={() => {
+                    removeSessionStorageData();
+                  }}
                 >
                   <GithubLogo />
                   Sign in with GitHub&trade;
@@ -91,6 +94,9 @@ export default function SignInApp() {
                 <a
                   href={`${prefix}/users/google/login/?${sp.toString()}`}
                   className="button icon-button outline"
+                  onClick={() => {
+                    removeSessionStorageData();
+                  }}
                 >
                   <GoogleLogo />
                   Sign in with Google&trade;
diff --git a/client/src/ui/molecules/login/index.tsx b/client/src/ui/molecules/login/index.tsx
index cfdf6eb3f498..e98092bcf277 100644
--- a/client/src/ui/molecules/login/index.tsx
+++ b/client/src/ui/molecules/login/index.tsx
@@ -3,7 +3,7 @@ import * as React from "react";
 import Dropdown from "../dropdown";
 import { useLocale } from "../../../hooks";
 import SignInLink from "../../atoms/signin-link";
-import { useUserData } from "../../../user-context";
+import { useUserData, removeSessionStorageData } from "../../../user-context";
 
 import { DISABLE_AUTH } from "../../../constants";
 
@@ -68,7 +68,18 @@ function LoginInner() {
         <a href={`/${locale}/settings`}>Account settings</a>
       </li>
       <li>
-        <form action={signOutURL} method="post">
+        <form
+          action={signOutURL}
+          method="post"
+          onSubmit={() => {
+            // Because sign out happens externally, our user-context might have
+            // cached the fact that the user was signed in. It will not have any
+            // chance of knowing, that the user signed out, until they're
+            // redirected back (after the successful signout POST in Kuma).
+            // So we take this opportunity to invalidate any such caching.
+            removeSessionStorageData();
+          }}
+        >
           <input name="next" type="hidden" value={next} />
           <button className="ghost signout-button" type="submit">
             Sign out
diff --git a/client/src/user-context.tsx b/client/src/user-context.tsx
index ce4dd6b97b08..da1e7b34d2a6 100644
--- a/client/src/user-context.tsx
+++ b/client/src/user-context.tsx
@@ -29,12 +29,53 @@ export type UserData = {
 
 const UserDataContext = React.createContext<UserData | null>(null);
 
+// The argument for using sessionStorage rather than localStorage is because
+// it's marginally simpler and "safer". For example, if we use localStorage
+// it might stick in the browser for a very long time and we might change
+// the structure of that JSON we store in there.
+// Also, localStorage doesn't go away. So if we decide to not do this stuff
+// anymore we won't have users who have that stuff stuck in their browser
+// "forever".
+const SESSION_STORAGE_KEY = "whoami";
+
+function getSessionStorageData() {
+  try {
+    const data = sessionStorage.getItem(SESSION_STORAGE_KEY);
+    if (data) {
+      return JSON.parse(data) as UserData;
+    }
+  } catch (error) {
+    console.warn("sessionStorage.getItem didn't work", error.toString());
+    return null;
+  }
+}
+
+export function removeSessionStorageData() {
+  try {
+    // It's safe to call .removeItem() on a key that doesn't already exist,
+    // and it's pointless to first do a .hasItem() before the .removeItem()
+    // because internally that's what .removeItem() already does.
+    sessionStorage.removeItem(SESSION_STORAGE_KEY);
+  } catch (error) {
+    console.warn("sessionStorage.removeItem didn't work", error.toString());
+  }
+}
+
+function setSessionStorageData(data: UserData) {
+  try {
+    sessionStorage.setItem(SESSION_STORAGE_KEY, JSON.stringify(data));
+  } catch (error) {
+    console.warn("sessionStorage.setItem didn't work", error.toString());
+  }
+}
+
 export function UserDataProvider(props: { children: React.ReactNode }) {
   const { data } = useSWR<UserData | null, Error | null>(
     DISABLE_AUTH ? null : "/api/v1/whoami",
     async (url) => {
       const response = await fetch(url);
       if (!response.ok) {
+        removeSessionStorageData();
         throw new Error(`${response.status} on ${response.url}`);
       }
       const data = await response.json();
@@ -56,8 +97,16 @@ export function UserDataProvider(props: { children: React.ReactNode }) {
     }
   );
 
+  React.useEffect(() => {
+    if (data) {
+      // At this point, the XHR request has set `data` to be an object.
+      // The user is definitely signed in or not signed in.
+      setSessionStorageData(data);
+    }
+  }, [data]);
+
   return (
-    <UserDataContext.Provider value={data || null}>
+    <UserDataContext.Provider value={data || getSessionStorageData() || null}>
       {props.children}
     </UserDataContext.Provider>
   );

From 559d21f30a07f551d2c808ff53ff7ac317584630 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Sun, 25 Apr 2021 06:41:07 -0400
Subject: [PATCH 238/288] mdn++ landing page (#3608)

---
 build/spas.js                     |  1 +
 client/src/app.tsx                |  9 +++++++++
 client/src/mdnplusplus/app.tsx    | 17 ++++++++++++++++
 client/src/mdnplusplus/index.scss |  7 +++++++
 client/src/mdnplusplus/index.tsx  | 32 +++++++++++++++++++++++++++++++
 5 files changed, 66 insertions(+)
 create mode 100644 client/src/mdnplusplus/app.tsx
 create mode 100644 client/src/mdnplusplus/index.scss
 create mode 100644 client/src/mdnplusplus/index.tsx

diff --git a/build/spas.js b/build/spas.js
index 7b15a262e408..6fac00f996d0 100644
--- a/build/spas.js
+++ b/build/spas.js
@@ -52,6 +52,7 @@ async function buildSPAs(options) {
         { prefix: "signin", pageTitle: "Sign in" },
         { prefix: "signup", pageTitle: "Sign up" },
         { prefix: "settings", pageTitle: "Account settings" },
+        { prefix: "mdn++", pageTitle: "MDN++" },
       ];
       for (const { prefix, pageTitle } of SPAs) {
         const url = `/${locale}/${prefix}`;
diff --git a/client/src/app.tsx b/client/src/app.tsx
index 2fbf8c25f227..62c29d97033a 100644
--- a/client/src/app.tsx
+++ b/client/src/app.tsx
@@ -17,6 +17,7 @@ import { PageNotFound } from "./page-not-found";
 import { Banner } from "./banners";
 import { SignIn, SignUp } from "./auth";
 import { Settings } from "./settings";
+import { MDNplusplus } from "./mdnplusplus";
 
 const AllFlaws = React.lazy(() => import("./flaws"));
 const DocumentEdit = React.lazy(() => import("./document/forms/edit"));
@@ -234,6 +235,14 @@ export function App(appProps) {
                 </StandardLayout>
               }
             />
+            <Route
+              path="/mdn++"
+              element={
+                <StandardLayout>
+                  <MDNplusplus {...appProps} />
+                </StandardLayout>
+              }
+            />
             <Route
               path="/docs/*"
               element={
diff --git a/client/src/mdnplusplus/app.tsx b/client/src/mdnplusplus/app.tsx
new file mode 100644
index 000000000000..b3fbba489391
--- /dev/null
+++ b/client/src/mdnplusplus/app.tsx
@@ -0,0 +1,17 @@
+import "./index.scss";
+
+export default function App({ ...appProps }) {
+  return (
+    <div className="mdnplusplus">
+      {/* From https://app.alchemer.com/distribute/share/id/6295937 */}
+      <iframe
+        src="http://survey.alchemer.com/s3/6295937/MDN-Fake-Door-Survey"
+        title="MDN++ survey"
+        frameBorder="0"
+        width="700"
+        height="500"
+        style={{ overflow: "hidden" }}
+      ></iframe>
+    </div>
+  );
+}
diff --git a/client/src/mdnplusplus/index.scss b/client/src/mdnplusplus/index.scss
new file mode 100644
index 000000000000..578016d3e8c1
--- /dev/null
+++ b/client/src/mdnplusplus/index.scss
@@ -0,0 +1,7 @@
+@import "~@mdn/minimalist/sass/vars/color-palette";
+@import "~@mdn/minimalist/sass/vars/layout";
+@import "~@mdn/minimalist/sass/vars/typography";
+
+.page-content-container.mdnplusplus {
+  // nothing here yet. Hi Daryl!
+}
diff --git a/client/src/mdnplusplus/index.tsx b/client/src/mdnplusplus/index.tsx
new file mode 100644
index 000000000000..21a0f2871848
--- /dev/null
+++ b/client/src/mdnplusplus/index.tsx
@@ -0,0 +1,32 @@
+import React from "react";
+
+import { PageContentContainer } from "../ui/atoms/page-content";
+
+const App = React.lazy(() => import("./app"));
+
+export function MDNplusplus() {
+  const pageTitle = "MDN++";
+  React.useEffect(() => {
+    document.title = pageTitle;
+  }, []);
+  const isServer = typeof window === "undefined";
+  return (
+    <div className="settings">
+      <PageContentContainer extraClasses="mdnplusplus">
+        {/* The reason for displaying this <h1> here
+          is to avoid an unnecessary "flicker".
+          component here is loaded SSR and is immediately present.
+          Only the "guts" below is lazy loaded. By having the header already
+          present the page feels less flickery at a very affordable cost of
+          allowing this to be part of the main JS bundle.
+       */}
+        <h1 className="slab-highlight">{pageTitle}</h1>
+        {!isServer && (
+          <React.Suspense fallback={<p>Loading...</p>}>
+            <App />
+          </React.Suspense>
+        )}
+      </PageContentContainer>
+    </div>
+  );
+}

From 7fb2ce5d1ca907d356e250838e74a915a1771662 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 07:03:55 +0000
Subject: [PATCH 239/288] build(deps): bump boto3 from 1.17.53 to 1.17.57 in
 /deployer (#3629)

---
 deployer/poetry.lock    | 29 ++++++++++++++++-------------
 deployer/pyproject.toml |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 94a573dceac6..9dd771d65958 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -52,20 +52,20 @@ d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
 
 [[package]]
 name = "boto3"
-version = "1.17.53"
+version = "1.17.57"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.53,<1.21.0"
+botocore = ">=1.20.57,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
-s3transfer = ">=0.3.0,<0.4.0"
+s3transfer = ">=0.4.0,<0.5.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.53"
+version = "1.20.57"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -77,7 +77,7 @@ python-dateutil = ">=2.1,<3.0.0"
 urllib3 = ">=1.25.4,<1.27"
 
 [package.extras]
-crt = ["awscrt (==0.10.8)"]
+crt = ["awscrt (==0.11.11)"]
 
 [[package]]
 name = "certifi"
@@ -448,7 +448,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
 
 [[package]]
 name = "s3transfer"
-version = "0.3.6"
+version = "0.4.2"
 description = "An Amazon S3 Transfer Manager"
 category = "main"
 optional = false
@@ -457,6 +457,9 @@ python-versions = "*"
 [package.dependencies]
 botocore = ">=1.12.36,<2.0a.0"
 
+[package.extras]
+crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"]
+
 [[package]]
 name = "selectolax"
 version = "0.2.11"
@@ -533,7 +536,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "e128b431424635b5d7b9e26f70adf9c99df3c9e46f5bbf81f7bdf17dde45e87d"
+content-hash = "3bed7885eae058ac5d78e2f36470df7882c5cb26094fbb9f24d7444fc9190609"
 
 [metadata.files]
 appdirs = [
@@ -552,12 +555,12 @@ black = [
     {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
 ]
 boto3 = [
-    {file = "boto3-1.17.53-py2.py3-none-any.whl", hash = "sha256:3bf3305571f3c8b738a53e9e7dcff59137dffe94670046c084a17f9fa4599ff3"},
-    {file = "boto3-1.17.53.tar.gz", hash = "sha256:1d26f6e7ae3c940cb07119077ac42485dcf99164350da0ab50d0f5ad345800cd"},
+    {file = "boto3-1.17.57-py2.py3-none-any.whl", hash = "sha256:2783947ec34dd84fc36093e8fc8a9a24679cf912a97bc9a0c47f4966ed059a29"},
+    {file = "boto3-1.17.57.tar.gz", hash = "sha256:6b4a79691a48740816f03c4cb1e8ef46f8335ad2019d9c4a95da73eb5cb98f05"},
 ]
 botocore = [
-    {file = "botocore-1.20.53-py2.py3-none-any.whl", hash = "sha256:d5e70d17b91c9b5867be7d6de0caa7dde9ed789bed62f03ea9b60718dc9350bf"},
-    {file = "botocore-1.20.53.tar.gz", hash = "sha256:e303500c4e80f6a706602da53daa6f751cfa8f491665c99a24ee732ab6321573"},
+    {file = "botocore-1.20.57-py2.py3-none-any.whl", hash = "sha256:fa430bc773363a3d332c11c55bd8c0c0a5819d576121eb6990528a1bdaa89bcd"},
+    {file = "botocore-1.20.57.tar.gz", hash = "sha256:ae4ac72921f23d35ad54a5fb0989fc00c6fff8a39e24f26128b9315cc6209fec"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
@@ -772,8 +775,8 @@ requests = [
     {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"},
 ]
 s3transfer = [
-    {file = "s3transfer-0.3.6-py2.py3-none-any.whl", hash = "sha256:5d48b1fd2232141a9d5fb279709117aaba506cacea7f86f11bc392f06bfa8fc2"},
-    {file = "s3transfer-0.3.6.tar.gz", hash = "sha256:c5dadf598762899d8cfaecf68eba649cd25b0ce93b6c954b156aaa3eed160547"},
+    {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"},
+    {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"},
 ]
 selectolax = [
     {file = "selectolax-0.2.11-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:797f95ed7d2a6e83c0c344ed3110ea8c932b7ab05b8d23f133f10d17f6a91c7e"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 93a10e56a7ac..75af1e18fbe7 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.53"
+boto3 = "^1.17.57"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 553d8575e4e140838d03dcc58555b33f6cc1480c Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 26 Apr 2021 05:51:35 -0400
Subject: [PATCH 240/288] consider <style> to be unsafe (#3601)

* consider <style> to be unsafe

* add test
---
 build/flaws/unsafe-html.js                             | 2 +-
 testing/content/files/en-us/web/unsafe_html/index.html | 4 ++++
 testing/tests/index.test.js                            | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/flaws/unsafe-html.js b/build/flaws/unsafe-html.js
index 9df27d676cbb..0589ecd3f56e 100644
--- a/build/flaws/unsafe-html.js
+++ b/build/flaws/unsafe-html.js
@@ -54,7 +54,7 @@ function getAndMarkupUnsafeHTMLFlaws(doc, $, { rawContent, fileInfo }) {
     flaws.push(flaw);
   }
 
-  $("script, embed, object, iframe").each((i, element) => {
+  $("script, embed, object, iframe, style").each((i, element) => {
     const { tagName } = element;
     if (tagName === "iframe") {
       // For iframes we only check the 'src' value
diff --git a/testing/content/files/en-us/web/unsafe_html/index.html b/testing/content/files/en-us/web/unsafe_html/index.html
index 717d4c9b381b..f3d3446cf863 100644
--- a/testing/content/files/en-us/web/unsafe_html/index.html
+++ b/testing/content/files/en-us/web/unsafe_html/index.html
@@ -34,3 +34,7 @@
 </ul>
 
 <script>alert(1)</script>
+
+<style>
+  * { background-image: url(/api/v1/settings);}
+</style>
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index b2f07bdbaef3..27cd31f3e8f5 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -1353,12 +1353,12 @@ test("unsafe HTML gets flagged as flaws and replace with its raw HTML", () => {
 
   const jsonFile = path.join(builtFolder, "index.json");
   const { doc } = JSON.parse(fs.readFileSync(jsonFile));
-  expect(doc.flaws.unsafe_html.length).toBe(6);
+  expect(doc.flaws.unsafe_html.length).toBe(7);
 
   const htmlFile = path.join(builtFolder, "index.html");
   const html = fs.readFileSync(htmlFile, "utf-8");
   const $ = cheerio.load(html);
-  expect($("code.unsafe-html").length).toBe(6);
+  expect($("code.unsafe-html").length).toBe(7);
 });
 
 test("translated content broken links can fall back to en-us", () => {

From cdbca9effc05b045938223fc1d5ca897ab0158eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 11:04:49 +0000
Subject: [PATCH 241/288] build(deps-dev): bump @storybook/addon-links from
 6.2.8 to 6.2.9 (#3616)

---
 package.json |  2 +-
 yarn.lock    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 45e0357a2c93..fa2e8f2e65a0 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "@storybook/addon-a11y": "^6.2.8",
     "@storybook/addon-actions": "^6.2.9",
     "@storybook/addon-essentials": "^6.2.8",
-    "@storybook/addon-links": "^6.2.8",
+    "@storybook/addon-links": "^6.2.9",
     "@storybook/node-logger": "^6.2.9",
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.2.8",
diff --git a/yarn.lock b/yarn.lock
index 518342067399..64ca7d99f8f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2841,16 +2841,16 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-links@^6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.8.tgz#5b9a31d84d6ba93d4d05c6e4779ec99151612252"
-  integrity sha512-r64VQDvWaUaBunY2mBPHYh2oEVYNycB/EH4WvXK1it3hXs1XGCIWLap4lKvIcT894XhykS8Jxx/s8SUGIvRzBA==
+"@storybook/addon-links@^6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.2.9.tgz#3399d14b0fc587bccdaa602f6294bc8b249c09f0"
+  integrity sha512-pBiL6EUZI3c9qtCqnGx3RXF46kAxGMdo4xDC2y3mM132W//DzxkzLZRe4ZhxxGwaLzTNlNrypZ6Li6WyIaPZ/w==
   dependencies:
-    "@storybook/addons" "6.2.8"
-    "@storybook/client-logger" "6.2.8"
-    "@storybook/core-events" "6.2.8"
+    "@storybook/addons" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/core-events" "6.2.9"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.2.8"
+    "@storybook/router" "6.2.9"
     "@types/qs" "^6.9.5"
     core-js "^3.8.2"
     global "^4.4.0"

From 76abc4f23f084d67436eabf494602e1f6a4fc9ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 11:13:40 +0000
Subject: [PATCH 242/288] build(deps-dev): bump @types/jest from 26.0.22 to
 26.0.23 (#3630)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fa2e8f2e65a0..6c2a48b0e78a 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "@storybook/preset-create-react-app": "^3.1.7",
     "@storybook/react": "^6.2.8",
     "@testing-library/react": "^11.2.6",
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^26.0.23",
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.3",
     "babel-loader": "8.1.0",
diff --git a/yarn.lock b/yarn.lock
index 64ca7d99f8f1..a14b16bf4b54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3923,10 +3923,10 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@^26.0.22":
-  version "26.0.22"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.22.tgz#8308a1debdf1b807aa47be2838acdcd91e88fbe6"
-  integrity sha512-eeWwWjlqxvBxc4oQdkueW5OF/gtfSceKk4OnOAGlUSwS/liBRtZppbJuz1YkgbrbfGOoeBHun9fOvXnjNwrSOw==
+"@types/jest@^26.0.23":
+  version "26.0.23"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz#a1b7eab3c503b80451d019efb588ec63522ee4e7"
+  integrity sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA==
   dependencies:
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"

From daa9d76d63600eabd088dd30b4e119e251b19289 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 11:21:48 +0000
Subject: [PATCH 243/288] build(deps-dev): bump html-validate from 4.10.0 to
 4.10.1 (#3632)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6c2a48b0e78a..8222e144071a 100644
--- a/package.json
+++ b/package.json
@@ -133,7 +133,7 @@
     "fuzzyjs": "4.0.4",
     "fuzzysearch": "1.0.3",
     "history": "5.0.0",
-    "html-validate": "4.10.0",
+    "html-validate": "4.10.1",
     "husky": "4.3.8",
     "ignore-loader": "^0.1.2",
     "jest-environment-jsdom-sixteen": "^1.0.3",
diff --git a/yarn.lock b/yarn.lock
index a14b16bf4b54..aeaa5b09c270 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10384,10 +10384,10 @@ html-tags@^3.1.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
   integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
 
-html-validate@4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.10.0.tgz#001b581ed0026bd4ba84034b968a76c7e95f10fb"
-  integrity sha512-5yFDrUj9mb8r4bv8crKsBDNC97oL1eWg1pEqxR5GfcnlwqBztJma6dQgfbWx7J4hF02Q1IViLdWfjy8//vXvMQ==
+html-validate@4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/html-validate/-/html-validate-4.10.1.tgz#db662c78d13a35fa4ee7e7cba408d3deed0eb708"
+  integrity sha512-FFbE2Oaq8trtQjS6X3b6yhI/Mv3/ru6kyPCDLE2U5VxkvQV+bl2w5t7lIrKUcE6FjnITP35bLU6aTcbdP2b1/w==
   dependencies:
     "@babel/code-frame" "^7.10.0"
     "@html-validate/stylish" "^1.0.0"

From 232e337ef64a447c4e273a2b403e4df6ea2b4316 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 11:33:50 +0000
Subject: [PATCH 244/288] build(deps): bump http-proxy-middleware from 1.2.0 to
 1.3.0 (#3633)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8222e144071a..8724b96381fa 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "hast-util-is-element": "^1.1.0",
     "hast-util-to-html": "^7.1.2",
     "hast-util-to-text": "^2.0.1",
-    "http-proxy-middleware": "1.2.0",
+    "http-proxy-middleware": "1.3.0",
     "image-size": "1.0.0",
     "image-type": "4.1.0",
     "imagemin": "7.0.1",
diff --git a/yarn.lock b/yarn.lock
index aeaa5b09c270..6f980e2ef02d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10527,10 +10527,10 @@ http-proxy-middleware@0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
-http-proxy-middleware@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.2.0.tgz#87776ea3d4d8dda3dc2594a076787bbc6fe4d995"
-  integrity sha512-vNw+AxT0+6VTM1rCJw1bpiIaUQ1Ww/vTyIEOUzdW9kNX4yuhhqV3jLSKDJo/Y/lqEIshaKCDujtvEqWiD9Dn6Q==
+http-proxy-middleware@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.0.tgz#eda5e0b7d1f27ac82bd11eb5099d8c309d30cf30"
+  integrity sha512-nHn8lcFNmxCalzHGXMn0ojKunXC9twBvJ+y7QNhvK/ep7ZDOXvO7Gph01rSwsMOrG4m6N72gAAWXMYhPZvK6OA==
   dependencies:
     "@types/http-proxy" "^1.17.5"
     http-proxy "^1.18.1"

From 90bce7a5bb11e2586042b2f60a4eb924b26a38b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 11:46:02 +0000
Subject: [PATCH 245/288] build(deps-dev): bump @types/react from 17.0.3 to
 17.0.4 (#3634)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8724b96381fa..563577f33119 100644
--- a/package.json
+++ b/package.json
@@ -115,7 +115,7 @@
     "@storybook/react": "^6.2.8",
     "@testing-library/react": "^11.2.6",
     "@types/jest": "^26.0.23",
-    "@types/react": "^17.0.3",
+    "@types/react": "^17.0.4",
     "@types/react-dom": "^17.0.3",
     "babel-loader": "8.1.0",
     "benchmark": "2.1.4",
diff --git a/yarn.lock b/yarn.lock
index 6f980e2ef02d..095a550c4d56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4088,10 +4088,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^17.0.3":
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz#ba6e215368501ac3826951eef2904574c262cc79"
-  integrity sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg==
+"@types/react@*", "@types/react@^17.0.4":
+  version "17.0.4"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.4.tgz#a67c6f7a460d2660e950d9ccc1c2f18525c28220"
+  integrity sha512-onz2BqScSFMoTRdJUZUDD/7xrusM8hBA2Fktk2qgaTYPCgPvWnDEgkrOs8hhPUf2jfcIXkJ5yK6VfYormJS3Jw==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"

From dce8820f197dd166ff047172e9ced6f0f592e201 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 11:58:19 +0000
Subject: [PATCH 246/288] build(deps): bump hast-util-to-html from 7.1.2 to
 7.1.3 (#3635)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 563577f33119..4dc214663f50 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "glob": "^7.1.6",
     "got": "11.8.2",
     "hast-util-is-element": "^1.1.0",
-    "hast-util-to-html": "^7.1.2",
+    "hast-util-to-html": "^7.1.3",
     "hast-util-to-text": "^2.0.1",
     "http-proxy-middleware": "1.3.0",
     "image-size": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 095a550c4d56..072e0090eaa1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10177,10 +10177,10 @@ hast-util-raw@^6.1.0:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
-hast-util-to-html@^7.1.1, hast-util-to-html@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-7.1.2.tgz#db677f0ee483658cea0eecc9dec30aba42b67111"
-  integrity sha512-pu73bvORzdF6XZgwl9eID/0RjBb/jtRfoGRRSykpR1+o9rCdiAHpgkSukZsQBRlIqMg6ylAcd7F0F7myJUb09Q==
+hast-util-to-html@^7.1.1, hast-util-to-html@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-7.1.3.tgz#9f339ca9bea71246e565fc79ff7dbfe98bb50f5e"
+  integrity sha512-yk2+1p3EJTEE9ZEUkgHsUSVhIpCsL/bvT8E5GzmWc+N1Po5gBw+0F8bo7dpxXR0nu0bQVxVZGX2lBGF21CmeDw==
   dependencies:
     ccount "^1.0.0"
     comma-separated-tokens "^1.0.0"

From d4ed5762686b0b58316b66b2e202bf2c266aeb7e Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 26 Apr 2021 08:44:55 -0400
Subject: [PATCH 247/288] fix alchemer survey iframe (#3631)

---
 client/src/mdnplusplus/app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/mdnplusplus/app.tsx b/client/src/mdnplusplus/app.tsx
index b3fbba489391..28faab3ac265 100644
--- a/client/src/mdnplusplus/app.tsx
+++ b/client/src/mdnplusplus/app.tsx
@@ -5,7 +5,7 @@ export default function App({ ...appProps }) {
     <div className="mdnplusplus">
       {/* From https://app.alchemer.com/distribute/share/id/6295937 */}
       <iframe
-        src="http://survey.alchemer.com/s3/6295937/MDN-Fake-Door-Survey"
+        src="https://survey.alchemer.com/s3/6295937/MDN-Fake-Door-Survey"
         title="MDN++ survey"
         frameBorder="0"
         width="700"

From eb6ae6d2996b42d9c8de5860efe0e58d99070100 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 12:52:35 +0000
Subject: [PATCH 248/288] build(deps-dev): bump @storybook/addon-essentials
 from 6.2.8 to 6.2.9 (#3636)

---
 package.json |   2 +-
 yarn.lock    | 437 +++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 335 insertions(+), 104 deletions(-)

diff --git a/package.json b/package.json
index 4dc214663f50..8c19aaeb621c 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "@mdn/minimalist": "^0.8.1",
     "@storybook/addon-a11y": "^6.2.8",
     "@storybook/addon-actions": "^6.2.9",
-    "@storybook/addon-essentials": "^6.2.8",
+    "@storybook/addon-essentials": "^6.2.9",
     "@storybook/addon-links": "^6.2.9",
     "@storybook/node-logger": "^6.2.9",
     "@storybook/preset-create-react-app": "^3.1.7",
diff --git a/yarn.lock b/yarn.lock
index 072e0090eaa1..4cd4443f2bb9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2697,30 +2697,7 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.8.tgz#e11d01a35e4685e692015a5051c583a0931ecd4a"
-  integrity sha512-bQE9rmVGThniXWxz57Py5bqC4my7DLCK3gT4U4cXv31zH+NMlJqSNHHfHf/Ob43fTdoCyLcB3vlWsPLra7WOCg==
-  dependencies:
-    "@storybook/addons" "6.2.8"
-    "@storybook/api" "6.2.8"
-    "@storybook/client-api" "6.2.8"
-    "@storybook/components" "6.2.8"
-    "@storybook/core-events" "6.2.8"
-    "@storybook/theming" "6.2.8"
-    core-js "^3.8.2"
-    fast-deep-equal "^3.1.3"
-    global "^4.4.0"
-    lodash "^4.17.20"
-    polished "^4.0.5"
-    prop-types "^15.7.2"
-    react-inspector "^5.1.0"
-    regenerator-runtime "^0.13.7"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
-    uuid-browser "^3.1.0"
-
-"@storybook/addon-actions@^6.2.9":
+"@storybook/addon-actions@6.2.9", "@storybook/addon-actions@^6.2.9":
   version "6.2.9"
   resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.2.9.tgz#688413ac77410690755a5da3c277bfa0ff1a10b0"
   integrity sha512-CkUYSMt+fvuHfWvtDzlhhaeQBCWlUo99xdL88JTsTml05P43bIHZNIRv2QJ8DwhHuxdIPeHKLmz9y/ymOagOnw==
@@ -2743,17 +2720,17 @@
     util-deprecate "^1.0.2"
     uuid-browser "^3.1.0"
 
-"@storybook/addon-backgrounds@6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.2.8.tgz#9fb199c283c346335503e8a6cd18b0839aea9b8e"
-  integrity sha512-nsKpoDIYsiYLWe+NCIMWkdUhQIUw0wcfAtSS/+Lm9WXlJ4ateB0guxdZn+676nt1FbO9wR22QQYwLHvUED4v5A==
+"@storybook/addon-backgrounds@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.2.9.tgz#4f75aa58b262f461d9f8713d65d11407f4e53537"
+  integrity sha512-oPSdeoUuvaXshY5sQRagbYXpr6ZEVUuLhGYBnZTlvm19QMeNCXQE+rdlgzcgyafq4mc1FI/udE2MpJ1dhfS6pQ==
   dependencies:
-    "@storybook/addons" "6.2.8"
-    "@storybook/api" "6.2.8"
-    "@storybook/client-logger" "6.2.8"
-    "@storybook/components" "6.2.8"
-    "@storybook/core-events" "6.2.8"
-    "@storybook/theming" "6.2.8"
+    "@storybook/addons" "6.2.9"
+    "@storybook/api" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/components" "6.2.9"
+    "@storybook/core-events" "6.2.9"
+    "@storybook/theming" "6.2.9"
     core-js "^3.8.2"
     global "^4.4.0"
     memoizerific "^1.11.3"
@@ -2761,24 +2738,24 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-controls@6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.2.8.tgz#15c79b6c1daae218dcabf240bc0013e2c68bf208"
-  integrity sha512-VpMo5qPlRVWr1GALWOCRDuompYZm+7z0FRc3x71AkT3sCIZdiPjHHMt7IkG14ranEumusNtBZ2ez8NgKX0mDdQ==
+"@storybook/addon-controls@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.2.9.tgz#eeec14b2946f1fb5326115f2205ed72c7f44ccea"
+  integrity sha512-NvXAJ7I5U4CLxv4wL3/Ne9rehJlgnSmQlLIG/z6dg5zm7JIb48LT4IY6GzjlUP5LkjmO9KJ8gJC249uRt2iPBQ==
   dependencies:
-    "@storybook/addons" "6.2.8"
-    "@storybook/api" "6.2.8"
-    "@storybook/client-api" "6.2.8"
-    "@storybook/components" "6.2.8"
-    "@storybook/node-logger" "6.2.8"
-    "@storybook/theming" "6.2.8"
+    "@storybook/addons" "6.2.9"
+    "@storybook/api" "6.2.9"
+    "@storybook/client-api" "6.2.9"
+    "@storybook/components" "6.2.9"
+    "@storybook/node-logger" "6.2.9"
+    "@storybook/theming" "6.2.9"
     core-js "^3.8.2"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-docs@6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.2.8.tgz#b5d039ad04805eceb99dbbb60a45c6d49096f0c3"
-  integrity sha512-IWnb10ImrzRMT2qw9785p3wYEI6U9gjsg6H2zKcRJQP5dEboqeX3OFjUKfXkaIWii4nz8MtJjBg5t4BdEYqLdw==
+"@storybook/addon-docs@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.2.9.tgz#61271e54ff4ea490409e4873ed022e62577366c1"
+  integrity sha512-qOtwgiqI3LMqT0eXYNV6ykp7qSu0LQGeXxy3wOBGuDDqAizfgnAjomYEWGFcyKp5ahV7HCRCjxbixAklFPUmyw==
   dependencies:
     "@babel/core" "^7.12.10"
     "@babel/generator" "^7.12.11"
@@ -2789,19 +2766,19 @@
     "@mdx-js/loader" "^1.6.22"
     "@mdx-js/mdx" "^1.6.22"
     "@mdx-js/react" "^1.6.22"
-    "@storybook/addons" "6.2.8"
-    "@storybook/api" "6.2.8"
-    "@storybook/builder-webpack4" "6.2.8"
-    "@storybook/client-api" "6.2.8"
-    "@storybook/client-logger" "6.2.8"
-    "@storybook/components" "6.2.8"
-    "@storybook/core" "6.2.8"
-    "@storybook/core-events" "6.2.8"
+    "@storybook/addons" "6.2.9"
+    "@storybook/api" "6.2.9"
+    "@storybook/builder-webpack4" "6.2.9"
+    "@storybook/client-api" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/components" "6.2.9"
+    "@storybook/core" "6.2.9"
+    "@storybook/core-events" "6.2.9"
     "@storybook/csf" "0.0.1"
-    "@storybook/node-logger" "6.2.8"
-    "@storybook/postinstall" "6.2.8"
-    "@storybook/source-loader" "6.2.8"
-    "@storybook/theming" "6.2.8"
+    "@storybook/node-logger" "6.2.9"
+    "@storybook/postinstall" "6.2.9"
+    "@storybook/source-loader" "6.2.9"
+    "@storybook/theming" "6.2.9"
     acorn "^7.4.1"
     acorn-jsx "^5.3.1"
     acorn-walk "^7.2.0"
@@ -2823,20 +2800,20 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-essentials@^6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.2.8.tgz#0a2551d73362f8e7d9758049b7ff3ddbf1f79e10"
-  integrity sha512-co2+/AYCWqQiokKJbVfJyQvcj0juMGXjLv57kZfJM0L0gP9i4rGtyTjy5VlmB8BmSs650ZuaKgShioC//gUr+g==
-  dependencies:
-    "@storybook/addon-actions" "6.2.8"
-    "@storybook/addon-backgrounds" "6.2.8"
-    "@storybook/addon-controls" "6.2.8"
-    "@storybook/addon-docs" "6.2.8"
-    "@storybook/addon-toolbars" "6.2.8"
-    "@storybook/addon-viewport" "6.2.8"
-    "@storybook/addons" "6.2.8"
-    "@storybook/api" "6.2.8"
-    "@storybook/node-logger" "6.2.8"
+"@storybook/addon-essentials@^6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.2.9.tgz#cd946b024804c4d9bfec4e232b74ffdf936b25ef"
+  integrity sha512-zXsV4e1TCkHyDwi7hew4h9eJfDW++f2BNKzTif+DAcjPUVFDp7yC17gLjS5IhOjcQk+db0UUlFSx/OrTxhy7Xw==
+  dependencies:
+    "@storybook/addon-actions" "6.2.9"
+    "@storybook/addon-backgrounds" "6.2.9"
+    "@storybook/addon-controls" "6.2.9"
+    "@storybook/addon-docs" "6.2.9"
+    "@storybook/addon-toolbars" "6.2.9"
+    "@storybook/addon-viewport" "6.2.9"
+    "@storybook/addons" "6.2.9"
+    "@storybook/api" "6.2.9"
+    "@storybook/node-logger" "6.2.9"
     core-js "^3.8.2"
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
@@ -2859,28 +2836,28 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-toolbars@6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.2.8.tgz#ab6dd7e080feed25d562d468316ac8e47b745ee4"
-  integrity sha512-BInsquQhEN/AD/any2tRZwreRQVueGrHg9bu1FnJzigpoUJv8VuDwOSIY1Fr1ZfMljhwVxwM5wGmHdVtG+SwDQ==
+"@storybook/addon-toolbars@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.2.9.tgz#29f2f4cba0bfbcff9424958eb573e537f7e2d5af"
+  integrity sha512-4WjIofN5npBPNZ8v1UhzPeATB9RnAWRH/y1AVS1HB+zl6Ku92o7aOMqVxs8zR1oSSmtkHh/rcUcpATFKjuofdw==
   dependencies:
-    "@storybook/addons" "6.2.8"
-    "@storybook/api" "6.2.8"
-    "@storybook/client-api" "6.2.8"
-    "@storybook/components" "6.2.8"
+    "@storybook/addons" "6.2.9"
+    "@storybook/api" "6.2.9"
+    "@storybook/client-api" "6.2.9"
+    "@storybook/components" "6.2.9"
     core-js "^3.8.2"
 
-"@storybook/addon-viewport@6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.2.8.tgz#65e6d028c757d18a3bb889e23bb80985d59b685b"
-  integrity sha512-SQvVQ59yGIH1BoBSZNssVeaHAUxCiORDzXzOLK7B6AjKx2hiIgP7+qQlqs2IzWvzdGzTOAZw3JP8+DiOnN1ehg==
+"@storybook/addon-viewport@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.2.9.tgz#e380de567cea6c24c4e933efa009e80428d5b49e"
+  integrity sha512-IK2mu5njmfcAT967SJtBOY2B6NPMikySZga9QuaLdSpQxPd3vXKNMVG1CjnduMLeDaAoUlvlJISeEPbYGuE+1A==
   dependencies:
-    "@storybook/addons" "6.2.8"
-    "@storybook/api" "6.2.8"
-    "@storybook/client-logger" "6.2.8"
-    "@storybook/components" "6.2.8"
-    "@storybook/core-events" "6.2.8"
-    "@storybook/theming" "6.2.8"
+    "@storybook/addons" "6.2.9"
+    "@storybook/api" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/components" "6.2.9"
+    "@storybook/core-events" "6.2.9"
+    "@storybook/theming" "6.2.9"
     core-js "^3.8.2"
     global "^4.4.0"
     memoizerific "^1.11.3"
@@ -3045,6 +3022,82 @@
     webpack-hot-middleware "^2.25.0"
     webpack-virtual-modules "^0.2.2"
 
+"@storybook/builder-webpack4@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.2.9.tgz#dddff0b1b4590a7ba088ce13e7cc42e482f6455d"
+  integrity sha512-swECic1huVdj+B+iRJIQ8ds59HuPVE4fmhI+j/nhw0CQCsgAEKqDlOQVYEimW6nZX8GO4WxNm6tiiRzxixejbw==
+  dependencies:
+    "@babel/core" "^7.12.10"
+    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    "@babel/plugin-proposal-decorators" "^7.12.12"
+    "@babel/plugin-proposal-export-default-from" "^7.12.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
+    "@babel/plugin-proposal-private-methods" "^7.12.1"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.12"
+    "@babel/plugin-transform-classes" "^7.12.1"
+    "@babel/plugin-transform-destructuring" "^7.12.1"
+    "@babel/plugin-transform-for-of" "^7.12.1"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
+    "@babel/plugin-transform-spread" "^7.12.1"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/preset-env" "^7.12.11"
+    "@babel/preset-react" "^7.12.10"
+    "@babel/preset-typescript" "^7.12.7"
+    "@storybook/addons" "6.2.9"
+    "@storybook/api" "6.2.9"
+    "@storybook/channel-postmessage" "6.2.9"
+    "@storybook/channels" "6.2.9"
+    "@storybook/client-api" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/components" "6.2.9"
+    "@storybook/core-common" "6.2.9"
+    "@storybook/core-events" "6.2.9"
+    "@storybook/node-logger" "6.2.9"
+    "@storybook/router" "6.2.9"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.9"
+    "@storybook/ui" "6.2.9"
+    "@types/node" "^14.0.10"
+    "@types/webpack" "^4.41.26"
+    autoprefixer "^9.8.6"
+    babel-loader "^8.2.2"
+    babel-plugin-macros "^2.8.0"
+    babel-plugin-polyfill-corejs3 "^0.1.0"
+    case-sensitive-paths-webpack-plugin "^2.3.0"
+    core-js "^3.8.2"
+    css-loader "^3.6.0"
+    dotenv-webpack "^1.8.0"
+    file-loader "^6.2.0"
+    find-up "^5.0.0"
+    fork-ts-checker-webpack-plugin "^4.1.6"
+    fs-extra "^9.0.1"
+    glob "^7.1.6"
+    glob-promise "^3.4.0"
+    global "^4.4.0"
+    html-webpack-plugin "^4.0.0"
+    pnp-webpack-plugin "1.6.4"
+    postcss "^7.0.35"
+    postcss-flexbugs-fixes "^4.2.1"
+    postcss-loader "^4.2.0"
+    raw-loader "^4.0.2"
+    react-dev-utils "^11.0.3"
+    stable "^0.1.8"
+    style-loader "^1.3.0"
+    terser-webpack-plugin "^3.1.0"
+    ts-dedent "^2.0.0"
+    url-loader "^4.1.1"
+    util-deprecate "^1.0.2"
+    webpack "4"
+    webpack-dev-middleware "^3.7.3"
+    webpack-filter-warnings-plugin "^1.2.1"
+    webpack-hot-middleware "^2.25.0"
+    webpack-virtual-modules "^0.2.2"
+
 "@storybook/channel-postmessage@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.2.8.tgz#8624d8da25cd7bb9ff42bd9a46cd4b105d63d3ec"
@@ -3235,6 +3288,28 @@
     unfetch "^4.2.0"
     util-deprecate "^1.0.2"
 
+"@storybook/core-client@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.2.9.tgz#3f611947e64dee0a297e512ff974087bc52c1877"
+  integrity sha512-jW841J5lCe1Ub5ZMtzYPgCy/OUddFxxVYeHLZyuNxlH5RoiQQxbDpuFlzuZMYGuIzD6eZw+ANE4w5vW/y5oBfA==
+  dependencies:
+    "@storybook/addons" "6.2.9"
+    "@storybook/channel-postmessage" "6.2.9"
+    "@storybook/client-api" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/core-events" "6.2.9"
+    "@storybook/csf" "0.0.1"
+    "@storybook/ui" "6.2.9"
+    ansi-to-html "^0.6.11"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    unfetch "^4.2.0"
+    util-deprecate "^1.0.2"
+
 "@storybook/core-common@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.2.8.tgz#2dac023450196b3cb2bce3c5fdb04d01741ade20"
@@ -3289,6 +3364,60 @@
     util-deprecate "^1.0.2"
     webpack "4"
 
+"@storybook/core-common@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.2.9.tgz#54f8e005733d39c4cb90eec7c17f9ca4dcbeec5f"
+  integrity sha512-ve0Qb4EMit8jGibfZBprmaU2i4LtpB4vSMIzD9nB1YeBmw2cGhHubtmayZ0TwcV3fPQhtYH9wwRWuWyzzHyQyw==
+  dependencies:
+    "@babel/core" "^7.12.10"
+    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    "@babel/plugin-proposal-decorators" "^7.12.12"
+    "@babel/plugin-proposal-export-default-from" "^7.12.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
+    "@babel/plugin-proposal-private-methods" "^7.12.1"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.12"
+    "@babel/plugin-transform-classes" "^7.12.1"
+    "@babel/plugin-transform-destructuring" "^7.12.1"
+    "@babel/plugin-transform-for-of" "^7.12.1"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
+    "@babel/plugin-transform-spread" "^7.12.1"
+    "@babel/preset-env" "^7.12.11"
+    "@babel/preset-react" "^7.12.10"
+    "@babel/preset-typescript" "^7.12.7"
+    "@babel/register" "^7.12.1"
+    "@storybook/node-logger" "6.2.9"
+    "@storybook/semver" "^7.3.2"
+    "@types/glob-base" "^0.3.0"
+    "@types/micromatch" "^4.0.1"
+    "@types/node" "^14.0.10"
+    "@types/pretty-hrtime" "^1.0.0"
+    babel-loader "^8.2.2"
+    babel-plugin-macros "^3.0.1"
+    babel-plugin-polyfill-corejs3 "^0.1.0"
+    chalk "^4.1.0"
+    core-js "^3.8.2"
+    express "^4.17.1"
+    file-system-cache "^1.0.5"
+    find-up "^5.0.0"
+    fork-ts-checker-webpack-plugin "^6.0.4"
+    glob "^7.1.6"
+    glob-base "^0.3.0"
+    interpret "^2.2.0"
+    json5 "^2.1.3"
+    lazy-universal-dotenv "^3.0.1"
+    micromatch "^4.0.2"
+    pkg-dir "^5.0.0"
+    pretty-hrtime "^1.0.3"
+    resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+    webpack "4"
+
 "@storybook/core-events@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.2.8.tgz#e33427f7b4b2bd141c788189d50dc92337dd4e81"
@@ -3362,6 +3491,65 @@
     webpack-dev-middleware "^3.7.3"
     webpack-virtual-modules "^0.2.2"
 
+"@storybook/core-server@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.2.9.tgz#da8b7f043ff59ee6cd2e8631ba8d0f954fdc265a"
+  integrity sha512-DzihO73pj1Ro0Y4tq9hjw2mLMUYeSRPrx7CndCOBxcTHCKQ8Kd7Dee3wJ49t5/19V7TW1+4lYR59GAy73FeOAQ==
+  dependencies:
+    "@babel/core" "^7.12.10"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/preset-react" "^7.12.10"
+    "@storybook/addons" "6.2.9"
+    "@storybook/builder-webpack4" "6.2.9"
+    "@storybook/core-client" "6.2.9"
+    "@storybook/core-common" "6.2.9"
+    "@storybook/node-logger" "6.2.9"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.9"
+    "@storybook/ui" "6.2.9"
+    "@types/node" "^14.0.10"
+    "@types/node-fetch" "^2.5.7"
+    "@types/pretty-hrtime" "^1.0.0"
+    "@types/webpack" "^4.41.26"
+    airbnb-js-shims "^2.2.1"
+    babel-loader "^8.2.2"
+    better-opn "^2.1.1"
+    boxen "^4.2.0"
+    case-sensitive-paths-webpack-plugin "^2.3.0"
+    chalk "^4.1.0"
+    cli-table3 "0.6.0"
+    commander "^6.2.1"
+    core-js "^3.8.2"
+    cpy "^8.1.1"
+    css-loader "^3.6.0"
+    detect-port "^1.3.0"
+    dotenv-webpack "^1.8.0"
+    express "^4.17.1"
+    file-loader "^6.2.0"
+    file-system-cache "^1.0.5"
+    find-up "^5.0.0"
+    fs-extra "^9.0.1"
+    global "^4.4.0"
+    html-webpack-plugin "^4.0.0"
+    ip "^1.1.5"
+    node-fetch "^2.6.1"
+    pnp-webpack-plugin "1.6.4"
+    pretty-hrtime "^1.0.3"
+    prompts "^2.4.0"
+    read-pkg-up "^7.0.1"
+    regenerator-runtime "^0.13.7"
+    resolve-from "^5.0.0"
+    serve-favicon "^2.5.0"
+    style-loader "^1.3.0"
+    telejson "^5.1.0"
+    terser-webpack-plugin "^3.1.0"
+    ts-dedent "^2.0.0"
+    url-loader "^4.1.1"
+    util-deprecate "^1.0.2"
+    webpack "4"
+    webpack-dev-middleware "^3.7.3"
+    webpack-virtual-modules "^0.2.2"
+
 "@storybook/core@6.2.8":
   version "6.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.2.8.tgz#f157574ad23eebd656c4b47fd3d10caf021adab7"
@@ -3370,6 +3558,14 @@
     "@storybook/core-client" "6.2.8"
     "@storybook/core-server" "6.2.8"
 
+"@storybook/core@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.2.9.tgz#e32e72b3bdb44384f5f0ff93ad1a483acd033b4b"
+  integrity sha512-pzbyjWvj0t8m0kR2pC9GQne4sZn7Y/zfcbm6/31CL+yhzOQjfJEj3n4ZFUlxikXqQJPg1aWfypfyaeaLL0QyuA==
+  dependencies:
+    "@storybook/core-client" "6.2.9"
+    "@storybook/core-server" "6.2.9"
+
 "@storybook/csf@0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.0.1.tgz#95901507dc02f0bc6f9ac8ee1983e2fc5bb98ce6"
@@ -3388,7 +3584,7 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/node-logger@^6.2.9":
+"@storybook/node-logger@6.2.9", "@storybook/node-logger@^6.2.9":
   version "6.2.9"
   resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.2.9.tgz#c67d8d7684514b8d00207502e8a9adda0ee750e5"
   integrity sha512-ryRBChWZf1A5hOVONErJZosS25IdMweoMVFAUAcj91iC0ynoSA6YL2jmoE71jQchxEXEgkDeRkX9lR/GlqFGZQ==
@@ -3399,10 +3595,10 @@
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/postinstall@6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.2.8.tgz#abf0f1b26f8273b49c10360207d20d3f23eafbb6"
-  integrity sha512-VaFQ622qSSpBqZpx+BGFGY52VKk4gnlpFs9r6+TgqaoFv9DpRWnj95fhkdtYuumzVhMiJLerdYdKgR/NsM+hJg==
+"@storybook/postinstall@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.2.9.tgz#3573ca86a27e9628defdd3a2c64721ee9db359ce"
+  integrity sha512-HjAjXZV+WItonC7lVrfrUsQuRFZNz1g1lE0GgsEK2LdC5rAcD/JwJxjiWREwY+RGxKL9rpWgqyxVQajpIJRjhA==
   dependencies:
     core-js "^3.8.2"
 
@@ -3488,13 +3684,13 @@
     core-js "^3.6.5"
     find-up "^4.1.0"
 
-"@storybook/source-loader@6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.2.8.tgz#2dfa0563cbac911685eb6cd575daa55a36a79049"
-  integrity sha512-e5rOLRPN39mTeRNv5FfIxR7XMb8bhx6kk0SS2ciojkcTg9aLLnguZSfm9E/OBLp/be8//TX4y5m3PwNQSXUrLg==
+"@storybook/source-loader@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.2.9.tgz#ac6b314e48044acad5318d237275b24e684edb9f"
+  integrity sha512-cx499g7BG2oeXvRFx45r0W0p2gKEy/e88WsUFnqqfMKZBJ8K0R/lx5DI0l1hq+TzSrE6uGe0/uPlaLkJNIro7g==
   dependencies:
-    "@storybook/addons" "6.2.8"
-    "@storybook/client-logger" "6.2.8"
+    "@storybook/addons" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
     "@storybook/csf" "0.0.1"
     core-js "^3.8.2"
     estraverse "^5.2.0"
@@ -3575,6 +3771,41 @@
     resolve-from "^5.0.0"
     store2 "^2.12.0"
 
+"@storybook/ui@6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.2.9.tgz#25cdf7ae2ef38ab337570c2377fda1da999792e7"
+  integrity sha512-jq2xmw3reIqik/6ibUSbNKGR+Xvr9wkAEwexiOl+5WQ5BeYJpw4dmDmsFQf+SQuWaSEUUPolbzkakRQM778Kdg==
+  dependencies:
+    "@emotion/core" "^10.1.1"
+    "@storybook/addons" "6.2.9"
+    "@storybook/api" "6.2.9"
+    "@storybook/channels" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/components" "6.2.9"
+    "@storybook/core-events" "6.2.9"
+    "@storybook/router" "6.2.9"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.2.9"
+    "@types/markdown-to-jsx" "^6.11.3"
+    copy-to-clipboard "^3.3.1"
+    core-js "^3.8.2"
+    core-js-pure "^3.8.2"
+    downshift "^6.0.15"
+    emotion-theming "^10.0.27"
+    fuse.js "^3.6.1"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    markdown-to-jsx "^6.11.4"
+    memoizerific "^1.11.3"
+    polished "^4.0.5"
+    qs "^6.10.0"
+    react-draggable "^4.4.3"
+    react-helmet-async "^1.0.7"
+    react-sizeme "^3.0.1"
+    regenerator-runtime "^0.13.7"
+    resolve-from "^5.0.0"
+    store2 "^2.12.0"
+
 "@stylelint/postcss-css-in-js@^0.37.2":
   version "0.37.2"
   resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"

From 4586d7a95ec2c4f46b749ef82ece19172df42f02 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 26 Apr 2021 09:29:08 -0400
Subject: [PATCH 249/288] freak out over http:// external links (#3624)

---
 deployer/src/deployer/analyze_pr.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/deployer/src/deployer/analyze_pr.py b/deployer/src/deployer/analyze_pr.py
index a98375f55939..01580b19583f 100644
--- a/deployer/src/deployer/analyze_pr.py
+++ b/deployer/src/deployer/analyze_pr.py
@@ -130,7 +130,8 @@ def post_about_dangerous_content(build_directory: Path, **config):
                 count = external_urls[url]
 
                 external_urls_list.append(
-                    f"  - <{url}> ({count} time{'' if count==1 else 's'})"
+                    f"  - {'🚨 ' if url.startswith('http://') else ''}"
+                    f"<{url}> ({count} time{'' if count==1 else 's'})"
                 )
             comments.append((doc, "\n".join(external_urls_list)))
         else:

From a383a361cb193132b162bbfbb2c468e34dff7695 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 26 Apr 2021 09:41:15 -0400
Subject: [PATCH 250/288] Make updates to the _wikihistory.json file
 deterministic (#3606)

Part of #3605
---
 content/document.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/content/document.js b/content/document.js
index 981a08fb5dba..7b9bbe9eb183 100644
--- a/content/document.js
+++ b/content/document.js
@@ -47,9 +47,27 @@ function updateWikiHistory(localeContentRoot, oldSlug, newSlug = null) {
       all[newSlug] = all[oldSlug];
     }
     delete all[oldSlug];
+    // The reason we also sort them so that the new additions don't always
+    // get appended to the end. The reason that matters is because two independent
+    // PRs might make edits to this file (i.e. two PRs that both move documents)
+    // and by default, the new entries will be added to the bottom of the
+    // file. So by making it sorted, the location of adding new entries will
+    // not cause git merge conflicts.
+    const sorted = Object.fromEntries(
+      Object.keys(all)
+        .sort()
+        .map((key) => {
+          return [key, all[key]];
+        })
+    );
     fs.writeFileSync(
       path.join(localeContentRoot, "_wikihistory.json"),
-      JSON.stringify(all, null, 2)
+      // The reason for the trailing newline is in case some ever opens the file
+      // and makes an edit, their editor will most likely force-insert a
+      // trailing newline character. So always doing in automation removes
+      // the risk of a conflict at the last line from two independent PRs
+      // that edit this file.
+      JSON.stringify(sorted, null, 2) + "\n"
     );
   }
 }

From 98209179a4b234e798b9ab13322b9e80198c1aa2 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 26 Apr 2021 09:42:40 -0400
Subject: [PATCH 251/288] http links should be considered a flaw (#3619)

* http links should be considered a flaw

Fixes #3565

* remove debugging
---
 build/flaws/broken-links.js                            | 10 +++++++++-
 testing/content/files/en-us/web/brokenlinks/index.html |  4 ++++
 testing/tests/index.test.js                            |  9 ++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/build/flaws/broken-links.js b/build/flaws/broken-links.js
index f8fca8c194dd..b8056c8a12d8 100644
--- a/build/flaws/broken-links.js
+++ b/build/flaws/broken-links.js
@@ -130,7 +130,15 @@ function getBrokenLinksFlaws(doc, $, { rawContent }, level) {
       return;
     }
 
-    if (href.startsWith("https://developer.mozilla.org/")) {
+    if (href.startsWith("http://")) {
+      addBrokenLink(
+        a,
+        checked.get(href),
+        href,
+        href.replace("http://", "https://"),
+        "http:// external links are not allowed (will be forced to https:// at build-time)"
+      );
+    } else if (href.startsWith("https://developer.mozilla.org/")) {
       // It might be a working 200 OK link but the link just shouldn't
       // have the full absolute URL part in it.
       const absoluteURL = new URL(href);
diff --git a/testing/content/files/en-us/web/brokenlinks/index.html b/testing/content/files/en-us/web/brokenlinks/index.html
index bcdef0d44ddb..3b178250447e 100644
--- a/testing/content/files/en-us/web/brokenlinks/index.html
+++ b/testing/content/files/en-us/web/brokenlinks/index.html
@@ -36,3 +36,7 @@
 <p>
   <a href="/en-US/docs/Web/BrokenLinks/contributors.txt">Link to <code>/contributors.txt</code></a> (not a flaw)
 </p>
+
+<p>
+  <a href="http://www.mozilla.org"><code>http://</code> external link</a>
+</p>
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 27cd31f3e8f5..4556cf451fcc 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -521,7 +521,7 @@ test("broken links flaws", () => {
   const { flaws } = doc;
   // You have to be intimately familiar with the fixture to understand
   // why these flaws come out as they do.
-  expect(flaws.broken_links.length).toBe(11);
+  expect(flaws.broken_links.length).toBe(12);
   // Map them by 'href'
   const map = new Map(flaws.broken_links.map((x) => [x.href, x]));
   expect(map.get("/en-US/docs/Hopeless/Case").suggestion).toBeNull();
@@ -556,6 +556,13 @@ test("broken links flaws", () => {
   expect(map.get("/en-US/docs/Web/BrokenLinks#anchor").suggestion).toBe(
     "#anchor"
   );
+  expect(map.get("http://www.mozilla.org").explanation).toBe(
+    "http:// external links are not allowed (will be forced to https:// at build-time)"
+  );
+  expect(map.get("http://www.mozilla.org").suggestion).toBe(
+    "https://www.mozilla.org"
+  );
+  expect(map.get("http://www.mozilla.org").fixable).toBeTruthy();
 });
 
 test("repeated broken links flaws", () => {

From a8d5eb417985ad4fc64f63d3d28e5171a66e8b5a Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 26 Apr 2021 09:44:32 -0400
Subject: [PATCH 252/288] refactor Flaws dashboard to include count fixable
 (#3602)

* refactor Flaws dashboard to include count fixable

* expose 'fixableFlaws' in the filter UI
---
 client/src/flaws/index.tsx | 34 +++++++++++++++++----
 server/flaws.js            | 61 ++++++++++++++++++++++++++++++++++----
 2 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/client/src/flaws/index.tsx b/client/src/flaws/index.tsx
index d54b709d7e07..3efc571d0d67 100644
--- a/client/src/flaws/index.tsx
+++ b/client/src/flaws/index.tsx
@@ -17,14 +17,17 @@ interface DocumentPopularity {
   ranking: number;
 }
 
+interface DocumentFlaws {
+  name: string;
+  value: number | string;
+  countFixable: number;
+}
 interface Document {
   mdn_url: string;
   modified: string;
   title: string;
   popularity: DocumentPopularity;
-  flaws: {
-    [key: string]: string[];
-  };
+  flaws: DocumentFlaws[];
 }
 
 type Count = { [key: string]: number };
@@ -64,6 +67,7 @@ interface Filters {
   mdn_url: string;
   title: string;
   popularity: string;
+  fixableFlaws: string;
   flaws: string[];
   page: number;
   sort_by: string;
@@ -75,6 +79,7 @@ const defaultFilters: Filters = Object.freeze({
   mdn_url: "",
   title: "",
   popularity: "",
+  fixableFlaws: "",
   flaws: [],
   page: 1,
   sort_by: "popularity",
@@ -486,6 +491,19 @@ function FilterControls({ flawLevels }: { flawLevels: FlawLevel[] }) {
           </button>
         </div>
 
+        <div>
+          <h4>Fixable flaws</h4>
+          <input
+            type="search"
+            placeholder="E.g. >0"
+            value={filters.fixableFlaws || ""}
+            onChange={(event) => {
+              setFilters({ ...filters, fixableFlaws: event.target.value });
+            }}
+            onBlur={refreshFilters}
+          />
+        </div>
+
         <div>
           <h4>&nbsp;</h4>
           <button type="submit">Filter now</button>
@@ -534,7 +552,7 @@ function DocumentsTable({
 }: {
   locale: string;
   counts: Counts;
-  documents: any;
+  documents: Document[];
 }) {
   const [filters, updateFiltersURL] = useFiltersURL();
 
@@ -552,12 +570,16 @@ function DocumentsTable({
     return n.toLocaleString() + (s[(v - 20) % 10] || s[v] || s[0]);
   }
 
-  function summarizeFlaws(flaws) {
+  function summarizeFlaws(flaws: DocumentFlaws[]) {
     // Return a one-liner about all the flaws
+    const totalCountFixable = flaws.reduce(
+      (acc, flaw) => flaw.countFixable + acc,
+      0
+    );
     const bits = flaws.map((flaw) => {
       return `${humanizeFlawName(flaw.name)}: ${flaw.value}`;
     });
-    return bits.join(", ");
+    return `${bits.join(", ")} (${totalCountFixable} fixable)`;
   }
 
   function TH({ id, title }: { id: string; title: string }) {
diff --git a/server/flaws.js b/server/flaws.js
index c7e3536600f5..1caf4e8d4ed3 100644
--- a/server/flaws.js
+++ b/server/flaws.js
@@ -62,6 +62,23 @@ function validPopularityFilter(value) {
   return [filter, null];
 }
 
+function validFixableFlawsFilter(value) {
+  let filter = null;
+  if (value) {
+    if (/[^\d<>]/.test(value.replace(/\s+/g, ""))) {
+      return [null, "fixable flaws contains unrecognized characters"];
+    }
+    if (value.startsWith("<")) {
+      filter = { max: parseInt(value.slice(1).trim()) };
+    } else if (value.startsWith(">")) {
+      filter = { min: parseInt(value.slice(1).trim()) };
+    } else {
+      filter = { equal: parseInt(parseInt(value)) };
+    }
+  }
+  return [filter, null];
+}
+
 function serializeFlawLevels(flawLevels) {
   const keys = [...flawLevels.keys()];
   keys.sort();
@@ -80,10 +97,15 @@ function packageFlaws(flawsObj) {
   keys.sort();
   for (const name of keys) {
     let value = flawsObj[name];
+    let countFixable = 0;
     if (Array.isArray(value)) {
+      countFixable += value.filter((flaw) => flaw.fixable).length;
       value = value.length;
+    } else {
+      // XXX I don't think this can ever happen.
+      countFixable += value.fixable ? 1 : 0;
     }
-    packaged.push({ name, value });
+    packaged.push({ name, value, countFixable });
   }
   return packaged;
 }
@@ -128,9 +150,17 @@ module.exports = (req, res) => {
     return res.status(400).send("'page' number invalid");
   }
 
-  const [popularityFilter, error] = validPopularityFilter(filters.popularity);
-  if (error) {
-    return res.status(400).send(error.toString());
+  const [popularityFilter, popularityFilterError] = validPopularityFilter(
+    filters.popularity
+  );
+  if (popularityFilterError) {
+    return res.status(400).send(popularityFilterError.toString());
+  }
+  const [fixableFlawsFilter, fixableFlawsFilterError] = validFixableFlawsFilter(
+    filters.fixableFlaws
+  );
+  if (fixableFlawsFilterError) {
+    return res.status(400).send(fixableFlawsFilterError.toString());
   }
 
   const sortBy = req.query.sort || "popularity";
@@ -247,8 +277,29 @@ module.exports = (req, res) => {
         continue;
       }
     }
+    const packaged = packageDocument(doc);
+    if (fixableFlawsFilter) {
+      const sumFixable = packaged.flaws.reduce(
+        (acc, flaw) => flaw.countFixable + acc,
+        0
+      );
+      if ("min" in fixableFlawsFilter && sumFixable <= fixableFlawsFilter.min) {
+        continue;
+      } else if (
+        "max" in fixableFlawsFilter &&
+        sumFixable > fixableFlawsFilter.max
+      ) {
+        continue;
+      } else if (
+        "equal" in fixableFlawsFilter &&
+        sumFixable !== fixableFlawsFilter.equal
+      ) {
+        continue;
+      }
+    }
+
     counts.found++;
-    documents.push(packageDocument(doc));
+    documents.push(packaged);
   }
 
   counts.flaws.type = strMapToObject(counts.flaws.type);

From 544a12be0da1225b0269257455708fa9e6e0f35b Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 26 Apr 2021 10:36:06 -0400
Subject: [PATCH 253/288] It says that there are no flaws twice (#3618)

Fixes #3617
---
 deployer/src/deployer/analyze_pr.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/deployer/src/deployer/analyze_pr.py b/deployer/src/deployer/analyze_pr.py
index 01580b19583f..d5901623ef74 100644
--- a/deployer/src/deployer/analyze_pr.py
+++ b/deployer/src/deployer/analyze_pr.py
@@ -199,14 +199,15 @@ def count_flaws(flaws):
         return count
 
     heading = "## Flaws\n\n"
-    if docs_with_zero_flaws:
-        heading += (
-            f"Note! *{docs_with_zero_flaws} "
-            f"document{'' if docs_with_zero_flaws == 1 else 's'} with no flaws "
-            "that don't need to be listed. 🎉*\n\n"
-        )
 
     if comments:
+        if docs_with_zero_flaws:
+            heading += (
+                f"Note! *{docs_with_zero_flaws} "
+                f"document{'' if docs_with_zero_flaws == 1 else 's'} with no flaws "
+                "that don't need to be listed. 🎉*\n\n"
+            )
+
         # Now turn all of these individual comments into one big one
         per_doc_comments = []
         for doc, comment in comments:
@@ -226,7 +227,7 @@ def count_flaws(flaws):
             per_doc_comments.append("\n".join(lines))
         return heading + "\n\n---\n\n".join(per_doc_comments)
     else:
-        return heading + "*none!* 🎉"
+        return heading + "*None!* 🎉"
 
 
 def get_built_docs(build_directory: Path):

From d4fd6673ad5bdae1647938b427e65e8ea0d1961f Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 26 Apr 2021 11:01:59 -0400
Subject: [PATCH 254/288] use fdir for server search-index gathering (#3541)

* use fdir for server search-index gathering

* use .withErrors() to avoid swalloing errors
---
 server/search-index.js | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/server/search-index.js b/server/search-index.js
index eea1740a858c..cf44d688e52f 100644
--- a/server/search-index.js
+++ b/server/search-index.js
@@ -1,6 +1,7 @@
 const fs = require("fs");
 const path = require("path");
 
+const { fdir } = require("fdir");
 const fm = require("front-matter");
 
 const {
@@ -10,28 +11,15 @@ const {
 } = require("../content");
 const { SearchIndex } = require("../build");
 
-function* walker(root) {
-  const dirents = fs.readdirSync(root, { withFileTypes: true });
-  for (const dirent of dirents) {
-    // Doing it this way is faster than doing `path.join(root, dirent.name)`
-    const filepath = `${root}${path.sep}${dirent.name}`;
-    if (dirent.isDirectory()) {
-      yield* walker(filepath);
-    } else {
-      yield filepath;
-    }
-  }
-}
-
 function populateSearchIndex(searchIndex, localeLC) {
   const root = path.join(
     localeLC === "en-us" ? CONTENT_ROOT : CONTENT_TRANSLATED_ROOT,
     localeLC
   );
   const locale = VALID_LOCALES.get(localeLC);
-  for (const filePath of walker(root)) {
-    const basename = path.basename(filePath);
-    if (!(basename === "index.html" || basename === "index.md")) {
+  const api = new fdir().withFullPaths().withErrors().crawl(root);
+  for (const filePath of api.sync()) {
+    if (!(filePath.endsWith("index.html") || filePath.endsWith("index.md"))) {
       continue;
     }
     const rawContent = fs.readFileSync(filePath, "utf-8");

From 824698b9e9d9887bb507a079f8ef95c3ee22b5f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Apr 2021 19:28:01 +0000
Subject: [PATCH 255/288] build(deps-dev): bump black from 20.8b1 to 21.4b0 in
 /deployer (#3627)

---
 deployer/poetry.lock    | 14 ++++++++------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 9dd771d65958..0ce87211058f 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -30,11 +30,11 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>
 
 [[package]]
 name = "black"
-version = "20.8b1"
+version = "21.4b0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.6.2"
 
 [package.dependencies]
 appdirs = "*"
@@ -43,12 +43,13 @@ mypy-extensions = ">=0.4.3"
 pathspec = ">=0.6,<1"
 regex = ">=2020.1.8"
 toml = ">=0.10.1"
-typed-ast = ">=1.4.0"
-typing-extensions = ">=3.7.4"
+typed-ast = {version = ">=1.4.2", markers = "python_version < \"3.8\""}
+typing-extensions = {version = ">=3.7.4", markers = "python_version < \"3.8\""}
 
 [package.extras]
 colorama = ["colorama (>=0.4.3)"]
 d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
+python2 = ["typed-ast (>=1.4.2)"]
 
 [[package]]
 name = "boto3"
@@ -536,7 +537,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "3bed7885eae058ac5d78e2f36470df7882c5cb26094fbb9f24d7444fc9190609"
+content-hash = "dc26ae62fec9cd2f186497b1f7aec77f9fdfdaa59c7d11e674f4584b19fd846c"
 
 [metadata.files]
 appdirs = [
@@ -552,7 +553,8 @@ attrs = [
     {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"},
 ]
 black = [
-    {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
+    {file = "black-21.4b0-py3-none-any.whl", hash = "sha256:2db7040bbbbaa46247bfcc05c6efdebd7ebe50c1c3ca745ca6e0f6776438c96c"},
+    {file = "black-21.4b0.tar.gz", hash = "sha256:915d916c48646dbe8040d5265cff7111421a60a3dfe7f7e07273176a57c24a34"},
 ]
 boto3 = [
     {file = "boto3-1.17.57-py2.py3-none-any.whl", hash = "sha256:2783947ec34dd84fc36093e8fc8a9a24679cf912a97bc9a0c47f4966ed059a29"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 75af1e18fbe7..68c2d4b01173 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -18,7 +18,7 @@ selectolax = "^0.2.11"
 PyGithub = "^1.54.1"
 
 [tool.poetry.dev-dependencies]
-black = "^20.8b1"
+black = "^21.4b0"
 flake8 = "^3.9.1"
 pytest = "^6.2.3"
 

From 941a960386906deafc82e72a5970153126cdd52e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Apr 2021 20:11:03 +0000
Subject: [PATCH 256/288] build(deps): bump pygithub from 1.54.1 to 1.55 in
 /deployer (#3626)

---
 deployer/poetry.lock    | 62 +++++++++++++++++++++++++++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 0ce87211058f..616cc3c0937d 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -327,7 +327,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pygithub"
-version = "1.54.1"
+version = "1.55"
 description = "Use the full Github API v3"
 category = "main"
 optional = false
@@ -335,7 +335,8 @@ python-versions = ">=3.6"
 
 [package.dependencies]
 deprecated = "*"
-pyjwt = "<2.0"
+pyjwt = ">=2.0"
+pynacl = ">=1.4.0"
 requests = ">=2.14.0"
 
 [package.extras]
@@ -343,16 +344,33 @@ integrations = ["cryptography"]
 
 [[package]]
 name = "pyjwt"
-version = "1.7.1"
+version = "2.0.1"
 description = "JSON Web Token implementation in Python"
 category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.6"
+
+[package.extras]
+crypto = ["cryptography (>=3.3.1,<4.0.0)"]
+dev = ["sphinx", "sphinx-rtd-theme", "zope.interface", "cryptography (>=3.3.1,<4.0.0)", "pytest (>=6.0.0,<7.0.0)", "coverage[toml] (==5.0.4)", "mypy", "pre-commit"]
+docs = ["sphinx", "sphinx-rtd-theme", "zope.interface"]
+tests = ["pytest (>=6.0.0,<7.0.0)", "coverage[toml] (==5.0.4)"]
+
+[[package]]
+name = "pynacl"
+version = "1.4.0"
+description = "Python binding to the Networking and Cryptography (NaCl) library"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[package.dependencies]
+cffi = ">=1.4.1"
+six = "*"
 
 [package.extras]
-crypto = ["cryptography (>=1.4)"]
-flake8 = ["flake8", "flake8-import-order", "pep8-naming"]
-test = ["pytest (>=4.0.1,<5.0.0)", "pytest-cov (>=2.6.0,<3.0.0)", "pytest-runner (>=4.2,<5.0.0)"]
+docs = ["sphinx (>=1.6.5)", "sphinx-rtd-theme"]
+tests = ["pytest (>=3.2.1,!=3.3.0)", "hypothesis (>=3.27.0)"]
 
 [[package]]
 name = "pyopenssl"
@@ -537,7 +555,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "dc26ae62fec9cd2f186497b1f7aec77f9fdfdaa59c7d11e674f4584b19fd846c"
+content-hash = "cc13faeccfaeeea774c2044a88ee605a2fbb2281fb719a423fa8bb91743b162d"
 
 [metadata.files]
 appdirs = [
@@ -702,12 +720,32 @@ pyflakes = [
     {file = "pyflakes-2.3.0.tar.gz", hash = "sha256:e59fd8e750e588358f1b8885e5a4751203a0516e0ee6d34811089ac294c8806f"},
 ]
 pygithub = [
-    {file = "PyGithub-1.54.1-py3-none-any.whl", hash = "sha256:87afd6a67ea582aa7533afdbf41635725f13d12581faed7e3e04b1579c0c0627"},
-    {file = "PyGithub-1.54.1.tar.gz", hash = "sha256:300bc16e62886ca6537b0830e8f516ea4bc3ef12d308e0c5aff8bdbd099173d4"},
+    {file = "PyGithub-1.55-py3-none-any.whl", hash = "sha256:2caf0054ea079b71e539741ae56c5a95e073b81fa472ce222e81667381b9601b"},
+    {file = "PyGithub-1.55.tar.gz", hash = "sha256:1bbfff9372047ff3f21d5cd8e07720f3dbfdaf6462fcaed9d815f528f1ba7283"},
 ]
 pyjwt = [
-    {file = "PyJWT-1.7.1-py2.py3-none-any.whl", hash = "sha256:5c6eca3c2940464d106b99ba83b00c6add741c9becaec087fb7ccdefea71350e"},
-    {file = "PyJWT-1.7.1.tar.gz", hash = "sha256:8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"},
+    {file = "PyJWT-2.0.1-py3-none-any.whl", hash = "sha256:b70b15f89dc69b993d8a8d32c299032d5355c82f9b5b7e851d1a6d706dffe847"},
+    {file = "PyJWT-2.0.1.tar.gz", hash = "sha256:a5c70a06e1f33d81ef25eecd50d50bd30e34de1ca8b2b9fa3fe0daaabcf69bf7"},
+]
+pynacl = [
+    {file = "PyNaCl-1.4.0-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:ea6841bc3a76fa4942ce00f3bda7d436fda21e2d91602b9e21b7ca9ecab8f3ff"},
+    {file = "PyNaCl-1.4.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:d452a6746f0a7e11121e64625109bc4468fc3100452817001dbe018bb8b08514"},
+    {file = "PyNaCl-1.4.0-cp27-cp27m-win32.whl", hash = "sha256:2fe0fc5a2480361dcaf4e6e7cea00e078fcda07ba45f811b167e3f99e8cff574"},
+    {file = "PyNaCl-1.4.0-cp27-cp27m-win_amd64.whl", hash = "sha256:f8851ab9041756003119368c1e6cd0b9c631f46d686b3904b18c0139f4419f80"},
+    {file = "PyNaCl-1.4.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:7757ae33dae81c300487591c68790dfb5145c7d03324000433d9a2c141f82af7"},
+    {file = "PyNaCl-1.4.0-cp35-abi3-macosx_10_10_x86_64.whl", hash = "sha256:757250ddb3bff1eecd7e41e65f7f833a8405fede0194319f87899690624f2122"},
+    {file = "PyNaCl-1.4.0-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:30f9b96db44e09b3304f9ea95079b1b7316b2b4f3744fe3aaecccd95d547063d"},
+    {file = "PyNaCl-1.4.0-cp35-abi3-win32.whl", hash = "sha256:4e10569f8cbed81cb7526ae137049759d2a8d57726d52c1a000a3ce366779634"},
+    {file = "PyNaCl-1.4.0-cp35-abi3-win_amd64.whl", hash = "sha256:c914f78da4953b33d4685e3cdc7ce63401247a21425c16a39760e282075ac4a6"},
+    {file = "PyNaCl-1.4.0-cp35-cp35m-win32.whl", hash = "sha256:06cbb4d9b2c4bd3c8dc0d267416aaed79906e7b33f114ddbf0911969794b1cc4"},
+    {file = "PyNaCl-1.4.0-cp35-cp35m-win_amd64.whl", hash = "sha256:511d269ee845037b95c9781aa702f90ccc36036f95d0f31373a6a79bd8242e25"},
+    {file = "PyNaCl-1.4.0-cp36-cp36m-win32.whl", hash = "sha256:11335f09060af52c97137d4ac54285bcb7df0cef29014a1a4efe64ac065434c4"},
+    {file = "PyNaCl-1.4.0-cp36-cp36m-win_amd64.whl", hash = "sha256:cd401ccbc2a249a47a3a1724c2918fcd04be1f7b54eb2a5a71ff915db0ac51c6"},
+    {file = "PyNaCl-1.4.0-cp37-cp37m-win32.whl", hash = "sha256:8122ba5f2a2169ca5da936b2e5a511740ffb73979381b4229d9188f6dcb22f1f"},
+    {file = "PyNaCl-1.4.0-cp37-cp37m-win_amd64.whl", hash = "sha256:537a7ccbea22905a0ab36ea58577b39d1fa9b1884869d173b5cf111f006f689f"},
+    {file = "PyNaCl-1.4.0-cp38-cp38-win32.whl", hash = "sha256:9c4a7ea4fb81536c1b1f5cc44d54a296f96ae78c1ebd2311bd0b60be45a48d96"},
+    {file = "PyNaCl-1.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:7c6092102219f59ff29788860ccb021e80fffd953920c4a8653889c029b2d420"},
+    {file = "PyNaCl-1.4.0.tar.gz", hash = "sha256:54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505"},
 ]
 pyopenssl = [
     {file = "pyOpenSSL-20.0.1-py2.py3-none-any.whl", hash = "sha256:818ae18e06922c066f777a33f1fca45786d85edfe71cd043de6379337a7f274b"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 68c2d4b01173..b11b3c2bac05 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -15,7 +15,7 @@ python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"
 selectolax = "^0.2.11"
-PyGithub = "^1.54.1"
+PyGithub = "^1.55"
 
 [tool.poetry.dev-dependencies]
 black = "^21.4b0"

From 09615e932da3bfd8d81f1809b41ee6c167e799d1 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Tue, 27 Apr 2021 16:38:14 -0400
Subject: [PATCH 257/288] MDN++ iframe visibility (#3649)

* MDN++ iframe visibility

Fixes #3646

* env var too
---
 client/src/app.tsx      | 20 +++++++++++---------
 client/src/constants.ts |  5 +++++
 docs/envvars.md         |  6 ++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/client/src/app.tsx b/client/src/app.tsx
index 62c29d97033a..7d57fc5e9e51 100644
--- a/client/src/app.tsx
+++ b/client/src/app.tsx
@@ -5,7 +5,7 @@ import { Routes, Route, useLocation } from "react-router-dom";
 // and applied before any component specific style
 import "./app.scss";
 
-import { CRUD_MODE } from "./constants";
+import { CRUD_MODE, ENABLE_MDNPLUSPLUS } from "./constants";
 import { Homepage } from "./homepage";
 import { Document } from "./document";
 import { A11yNav } from "./ui/molecules/a11y-nav";
@@ -235,14 +235,16 @@ export function App(appProps) {
                 </StandardLayout>
               }
             />
-            <Route
-              path="/mdn++"
-              element={
-                <StandardLayout>
-                  <MDNplusplus {...appProps} />
-                </StandardLayout>
-              }
-            />
+            {ENABLE_MDNPLUSPLUS && (
+              <Route
+                path="/mdn++"
+                element={
+                  <StandardLayout>
+                    <MDNplusplus {...appProps} />
+                  </StandardLayout>
+                }
+              />
+            )}
             <Route
               path="/docs/*"
               element={
diff --git a/client/src/constants.ts b/client/src/constants.ts
index 2c14082ecfa5..1bc2fa606ec3 100644
--- a/client/src/constants.ts
+++ b/client/src/constants.ts
@@ -59,3 +59,8 @@ export const VALID_LOCALES = new Set([
   "zh-CN",
   "zh-TW",
 ]);
+
+export const ENABLE_MDNPLUSPLUS = JSON.parse(
+  process.env.REACT_APP_ENABLE_MDNPLUSPLUS ||
+    JSON.stringify(process.env.NODE_ENV === "development")
+);
diff --git a/docs/envvars.md b/docs/envvars.md
index 1067d9bfedb1..83a7ce99f3c2 100644
--- a/docs/envvars.md
+++ b/docs/envvars.md
@@ -300,3 +300,9 @@ button. We use this for previewing PR builds on the content site. Those pages ar
 built with flaw detection set to warn, but since you might be viewing the pages
 on a remote domain (e.g. `pr123.dev.content.mozit.cloud`) it doesn't make sense to
 present the "Fix fixable flaws" button for example.
+
+### `REACT_APP_ENABLE_MDNPLUSPLUS`
+
+**Default: `NODE_ENV==='development'`**
+
+Determines if the MDN++ SPA should be reachable or not.

From 56b8fb3aa8a0d6675eb3cacba65433ae556b7b6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Apr 2021 20:38:43 +0000
Subject: [PATCH 258/288] build(deps-dev): bump black in /testing/integration
 (#3648)

---
 testing/integration/poetry.lock    | 78 +++++++++++++++---------------
 testing/integration/pyproject.toml |  2 +-
 2 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/testing/integration/poetry.lock b/testing/integration/poetry.lock
index 2fc0ad4c9929..b026f306c94e 100644
--- a/testing/integration/poetry.lock
+++ b/testing/integration/poetry.lock
@@ -30,25 +30,26 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>
 
 [[package]]
 name = "black"
-version = "20.8b1"
+version = "21.4b1"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.6.2"
 
 [package.dependencies]
 appdirs = "*"
 click = ">=7.1.2"
 mypy-extensions = ">=0.4.3"
-pathspec = ">=0.6,<1"
+pathspec = ">=0.8.1,<1"
 regex = ">=2020.1.8"
 toml = ">=0.10.1"
-typed-ast = ">=1.4.0"
-typing-extensions = ">=3.7.4"
+typed-ast = {version = ">=1.4.2", markers = "python_version < \"3.8\""}
+typing-extensions = {version = ">=3.7.4", markers = "python_version < \"3.8\""}
 
 [package.extras]
 colorama = ["colorama (>=0.4.3)"]
 d = ["aiohttp (>=3.3.2)", "aiohttp-cors"]
+python2 = ["typed-ast (>=1.4.2)"]
 
 [[package]]
 name = "braceexpand"
@@ -340,7 +341,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "typed-ast"
-version = "1.4.1"
+version = "1.4.3"
 description = "a fork of Python 2 and 3 ast modules with type comment support"
 category = "dev"
 optional = false
@@ -382,7 +383,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "a9917261ac018568890dcdcec5d160fd8ff2e3d64b9efaa04a972a46b48f98ed"
+content-hash = "00806ccbfb6c74f4e9e31f54032e61637cabd646ec2a7db967581ce15943b9e1"
 
 [metadata.files]
 appdirs = [
@@ -398,7 +399,8 @@ attrs = [
     {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"},
 ]
 black = [
-    {file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},
+    {file = "black-21.4b1-py3-none-any.whl", hash = "sha256:c9601dc863779db2fb1bf18b345bbfa2bb868463123cde6a7eff44b59e4ef739"},
+    {file = "black-21.4b1.tar.gz", hash = "sha256:20d326de75d13be6290925a95c94a9f368aca2f71cb7b753a938a5ae20f34a37"},
 ]
 braceexpand = [
     {file = "braceexpand-0.1.6-py2.py3-none-any.whl", hash = "sha256:c37571ad130213247fac9921f3fd1032c81057490b9ca29be6884fd6d9dc1013"},
@@ -587,36 +589,36 @@ toml = [
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
 ]
 typed-ast = [
-    {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3"},
-    {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aaee9905aee35ba5905cfb3c62f3e83b3bec7b39413f0a7f19be4e547ea01ebb"},
-    {file = "typed_ast-1.4.1-cp35-cp35m-win32.whl", hash = "sha256:0c2c07682d61a629b68433afb159376e24e5b2fd4641d35424e462169c0a7919"},
-    {file = "typed_ast-1.4.1-cp35-cp35m-win_amd64.whl", hash = "sha256:4083861b0aa07990b619bd7ddc365eb7fa4b817e99cf5f8d9cf21a42780f6e01"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:fcf135e17cc74dbfbc05894ebca928ffeb23d9790b3167a674921db19082401f"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-win32.whl", hash = "sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1"},
-    {file = "typed_ast-1.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:f208eb7aff048f6bea9586e61af041ddf7f9ade7caed625742af423f6bae3298"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-win32.whl", hash = "sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe"},
-    {file = "typed_ast-1.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355"},
-    {file = "typed_ast-1.4.1-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6"},
-    {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907"},
-    {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d"},
-    {file = "typed_ast-1.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:7e4c9d7658aaa1fc80018593abdf8598bf91325af6af5cce4ce7c73bc45ea53d"},
-    {file = "typed_ast-1.4.1-cp38-cp38-win32.whl", hash = "sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c"},
-    {file = "typed_ast-1.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4"},
-    {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34"},
-    {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:92c325624e304ebf0e025d1224b77dd4e6393f18aab8d829b5b7e04afe9b7a2c"},
-    {file = "typed_ast-1.4.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:d648b8e3bf2fe648745c8ffcee3db3ff903d0817a01a12dd6a6ea7a8f4889072"},
-    {file = "typed_ast-1.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fac11badff8313e23717f3dada86a15389d0708275bddf766cca67a84ead3e91"},
-    {file = "typed_ast-1.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:0d8110d78a5736e16e26213114a38ca35cb15b6515d535413b090bd50951556d"},
-    {file = "typed_ast-1.4.1-cp39-cp39-win32.whl", hash = "sha256:b52ccf7cfe4ce2a1064b18594381bccf4179c2ecf7f513134ec2f993dd4ab395"},
-    {file = "typed_ast-1.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:3742b32cf1c6ef124d57f95be609c473d7ec4c14d0090e5a5e05a15269fb4d0c"},
-    {file = "typed_ast-1.4.1.tar.gz", hash = "sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b"},
+    {file = "typed_ast-1.4.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:2068531575a125b87a41802130fa7e29f26c09a2833fea68d9a40cf33902eba6"},
+    {file = "typed_ast-1.4.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:c907f561b1e83e93fad565bac5ba9c22d96a54e7ea0267c708bffe863cbe4075"},
+    {file = "typed_ast-1.4.3-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:1b3ead4a96c9101bef08f9f7d1217c096f31667617b58de957f690c92378b528"},
+    {file = "typed_ast-1.4.3-cp35-cp35m-win32.whl", hash = "sha256:dde816ca9dac1d9c01dd504ea5967821606f02e510438120091b84e852367428"},
+    {file = "typed_ast-1.4.3-cp35-cp35m-win_amd64.whl", hash = "sha256:777a26c84bea6cd934422ac2e3b78863a37017618b6e5c08f92ef69853e765d3"},
+    {file = "typed_ast-1.4.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f8afcf15cc511ada719a88e013cec87c11aff7b91f019295eb4530f96fe5ef2f"},
+    {file = "typed_ast-1.4.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:52b1eb8c83f178ab787f3a4283f68258525f8d70f778a2f6dd54d3b5e5fb4341"},
+    {file = "typed_ast-1.4.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:01ae5f73431d21eead5015997ab41afa53aa1fbe252f9da060be5dad2c730ace"},
+    {file = "typed_ast-1.4.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:c190f0899e9f9f8b6b7863debfb739abcb21a5c054f911ca3596d12b8a4c4c7f"},
+    {file = "typed_ast-1.4.3-cp36-cp36m-win32.whl", hash = "sha256:398e44cd480f4d2b7ee8d98385ca104e35c81525dd98c519acff1b79bdaac363"},
+    {file = "typed_ast-1.4.3-cp36-cp36m-win_amd64.whl", hash = "sha256:bff6ad71c81b3bba8fa35f0f1921fb24ff4476235a6e94a26ada2e54370e6da7"},
+    {file = "typed_ast-1.4.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0fb71b8c643187d7492c1f8352f2c15b4c4af3f6338f21681d3681b3dc31a266"},
+    {file = "typed_ast-1.4.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:760ad187b1041a154f0e4d0f6aae3e40fdb51d6de16e5c99aedadd9246450e9e"},
+    {file = "typed_ast-1.4.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:5feca99c17af94057417d744607b82dd0a664fd5e4ca98061480fd8b14b18d04"},
+    {file = "typed_ast-1.4.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:95431a26309a21874005845c21118c83991c63ea800dd44843e42a916aec5899"},
+    {file = "typed_ast-1.4.3-cp37-cp37m-win32.whl", hash = "sha256:aee0c1256be6c07bd3e1263ff920c325b59849dc95392a05f258bb9b259cf39c"},
+    {file = "typed_ast-1.4.3-cp37-cp37m-win_amd64.whl", hash = "sha256:9ad2c92ec681e02baf81fdfa056fe0d818645efa9af1f1cd5fd6f1bd2bdfd805"},
+    {file = "typed_ast-1.4.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b36b4f3920103a25e1d5d024d155c504080959582b928e91cb608a65c3a49e1a"},
+    {file = "typed_ast-1.4.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:067a74454df670dcaa4e59349a2e5c81e567d8d65458d480a5b3dfecec08c5ff"},
+    {file = "typed_ast-1.4.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7538e495704e2ccda9b234b82423a4038f324f3a10c43bc088a1636180f11a41"},
+    {file = "typed_ast-1.4.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:af3d4a73793725138d6b334d9d247ce7e5f084d96284ed23f22ee626a7b88e39"},
+    {file = "typed_ast-1.4.3-cp38-cp38-win32.whl", hash = "sha256:f2362f3cb0f3172c42938946dbc5b7843c2a28aec307c49100c8b38764eb6927"},
+    {file = "typed_ast-1.4.3-cp38-cp38-win_amd64.whl", hash = "sha256:dd4a21253f42b8d2b48410cb31fe501d32f8b9fbeb1f55063ad102fe9c425e40"},
+    {file = "typed_ast-1.4.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f328adcfebed9f11301eaedfa48e15bdece9b519fb27e6a8c01aa52a17ec31b3"},
+    {file = "typed_ast-1.4.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:2c726c276d09fc5c414693a2de063f521052d9ea7c240ce553316f70656c84d4"},
+    {file = "typed_ast-1.4.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:cae53c389825d3b46fb37538441f75d6aecc4174f615d048321b716df2757fb0"},
+    {file = "typed_ast-1.4.3-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:b9574c6f03f685070d859e75c7f9eeca02d6933273b5e69572e5ff9d5e3931c3"},
+    {file = "typed_ast-1.4.3-cp39-cp39-win32.whl", hash = "sha256:209596a4ec71d990d71d5e0d312ac935d86930e6eecff6ccc7007fe54d703808"},
+    {file = "typed_ast-1.4.3-cp39-cp39-win_amd64.whl", hash = "sha256:9c6d1a54552b5330bc657b7ef0eae25d00ba7ffe85d9ea8ae6540d2197a3788c"},
+    {file = "typed_ast-1.4.3.tar.gz", hash = "sha256:fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65"},
 ]
 typing-extensions = [
     {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"},
diff --git a/testing/integration/pyproject.toml b/testing/integration/pyproject.toml
index 64c56b5228e9..4d725c91991a 100644
--- a/testing/integration/pyproject.toml
+++ b/testing/integration/pyproject.toml
@@ -17,7 +17,7 @@ pyquery = "^1.4.3"
 braceexpand = "^0.1.6"
 
 [tool.poetry.dev-dependencies]
-black = "^20.8b1"
+black = "^21.4b1"
 flake8 = "^3.9.1"
 
 [build-system]

From 230e08a103c252cf83d0409ba5a6b63232938ad7 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Wed, 28 Apr 2021 10:08:31 -0400
Subject: [PATCH 259/288] move interactive height CSS into KS macro (#3572)

* move interactive height CSS into KS macro

Fixes #3571
Part of #2793

* fix tests
---
 client/src/document/interactive-examples.scss | 42 ++-----------------
 kumascript/macros/EmbedInteractiveExample.ejs | 22 +++++++---
 .../macros/EmbedInteractiveExample.test.js    | 21 +++-------
 3 files changed, 26 insertions(+), 59 deletions(-)

diff --git a/client/src/document/interactive-examples.scss b/client/src/document/interactive-examples.scss
index b3c9d8f4d5ee..6d37c552bde9 100644
--- a/client/src/document/interactive-examples.scss
+++ b/client/src/document/interactive-examples.scss
@@ -5,45 +5,9 @@
   background-color: $neutral-550;
   border: 1px solid #eaf2f4;
   color: $text-color;
-  height: 550px;
   padding: 10px;
   width: 100%;
-
-  @media #{$mq-small-desktop-and-up} {
-    height: 390px;
-  }
-}
-
-.interactive.interactive-js {
-  height: 490px;
-}
-
-.interactive.taller {
-  height: 692px;
-}
-
-.interactive.shorter {
-  height: 410px;
-}
-
-.interactive.tabbed {
-  height: 430px;
-}
-
-.no-js .interactive {
-  background-color: #f8f8f8;
-  height: 240px;
-}
-
-/* custom sizing classes for the tabbed interactive editor */
-.interactive.tabbed-shorter {
-  height: 375px;
-}
-
-.interactive.tabbed-standard {
-  height: 445px;
-}
-
-.interactive.tabbed-taller {
-  height: 655px;
+  // Note! The height is set as a regular pixel height number
+  // on the <iframe> itself and that's done in the EmbedInteractiveExample.ejs
+  // macro.
 }
diff --git a/kumascript/macros/EmbedInteractiveExample.ejs b/kumascript/macros/EmbedInteractiveExample.ejs
index dcd70c775c31..350dc8cc95b3 100644
--- a/kumascript/macros/EmbedInteractiveExample.ejs
+++ b/kumascript/macros/EmbedInteractiveExample.ejs
@@ -8,16 +8,28 @@
 //  Example call {{EmbedInteractiveExample("pages/css/animation.html", "taller")}}
 //
 
-let iClass = "interactive";
-let url = kuma.url.resolve(env.interactive_examples.base_url, $0);
+const url = kuma.url.resolve(env.interactive_examples.base_url, $0);
+let height = 390;
 
 if ($0.includes('/js/')) {
-    iClass += " interactive-js";
+    height = 490;
 }
 
 if ($1) {
-    iClass += " " + $1;
+    if ($1 === 'shorter') {
+        height = 410;
+    } else if ($1 === 'taller') {
+        height = 692;
+    } else if ($1 === 'tabbed-shorter') {
+        height = 375;
+    } else  if ($1 === 'tabbed-standard') {
+        height = 445;
+    } else if ($1 === 'tabbed-taller') {
+        height = 655;
+    } else {
+        throw new Error(`An unrecognized second size parameter to EmbedInteractiveExample ('${$1}')`);
+    }
 }
 
 %>
-<iframe class="<%= iClass %>" width="100%" height="250" src="<%= url %>" title="MDN Web Docs Interactive Example"></iframe>
+<iframe class="interactive" width="100%" height="<%= height %>" src="<%= url %>" title="MDN Web Docs Interactive Example"></iframe>
diff --git a/kumascript/tests/macros/EmbedInteractiveExample.test.js b/kumascript/tests/macros/EmbedInteractiveExample.test.js
index 3c96e3570bd1..fabee63b3434 100644
--- a/kumascript/tests/macros/EmbedInteractiveExample.test.js
+++ b/kumascript/tests/macros/EmbedInteractiveExample.test.js
@@ -10,7 +10,7 @@ describeMacro("EmbedInteractiveExample", function () {
     };
     return assert.eventually.equal(
       macro.call("pages/css/animation.html"),
-      '<iframe class="interactive" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/css/animation.html" title="MDN Web Docs Interactive Example"></iframe>'
+      '<iframe class="interactive" width="100%" height="390" src="https://interactive-examples.mdn.mozilla.net/pages/css/animation.html" title="MDN Web Docs Interactive Example"></iframe>'
     );
   });
   itMacro("Changes in settings and argument are reflected", function (macro) {
@@ -19,7 +19,7 @@ describeMacro("EmbedInteractiveExample", function () {
     };
     return assert.eventually.equal(
       macro.call("pages/http/headers.html"),
-      '<iframe class="interactive" width="100%" height="250" src="https://www.fleetwood-mac.com/pages/http/headers.html" title="MDN Web Docs Interactive Example"></iframe>'
+      '<iframe class="interactive" width="100%" height="390" src="https://www.fleetwood-mac.com/pages/http/headers.html" title="MDN Web Docs Interactive Example"></iframe>'
     );
   });
   itMacro(
@@ -30,7 +30,7 @@ describeMacro("EmbedInteractiveExample", function () {
       };
       return assert.eventually.equal(
         macro.call("/pages/css/animation.html"),
-        '<iframe class="interactive" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/css/animation.html" title="MDN Web Docs Interactive Example"></iframe>'
+        '<iframe class="interactive" width="100%" height="390" src="https://interactive-examples.mdn.mozilla.net/pages/css/animation.html" title="MDN Web Docs Interactive Example"></iframe>'
       );
     }
   );
@@ -40,7 +40,7 @@ describeMacro("EmbedInteractiveExample", function () {
     };
     return assert.eventually.equal(
       macro.call("pages/js/expressions-conditionaloperators.html"),
-      '<iframe class="interactive interactive-js" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/js/expressions-conditionaloperators.html" title="MDN Web Docs Interactive Example"></iframe>'
+      '<iframe class="interactive" width="100%" height="490" src="https://interactive-examples.mdn.mozilla.net/pages/js/expressions-conditionaloperators.html" title="MDN Web Docs Interactive Example"></iframe>'
     );
   });
   itMacro("An extra class can be passed as an argument", function (macro) {
@@ -48,17 +48,8 @@ describeMacro("EmbedInteractiveExample", function () {
       base_url: "https://interactive-examples.mdn.mozilla.net",
     };
     return assert.eventually.equal(
-      macro.call("pages/http/headers.html", "extra"),
-      '<iframe class="interactive extra" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/http/headers.html" title="MDN Web Docs Interactive Example"></iframe>'
-    );
-  });
-  itMacro("Javascript pages can also add an extra class", function (macro) {
-    macro.ctx.env.interactive_examples = {
-      base_url: "https://interactive-examples.mdn.mozilla.net",
-    };
-    return assert.eventually.equal(
-      macro.call("pages/js/expressions-conditionaloperators.html", "bigger"),
-      '<iframe class="interactive interactive-js bigger" width="100%" height="250" src="https://interactive-examples.mdn.mozilla.net/pages/js/expressions-conditionaloperators.html" title="MDN Web Docs Interactive Example"></iframe>'
+      macro.call("pages/http/headers.html", "taller"),
+      '<iframe class="interactive" width="100%" height="692" src="https://interactive-examples.mdn.mozilla.net/pages/http/headers.html" title="MDN Web Docs Interactive Example"></iframe>'
     );
   });
 });

From b81c9a43f4e0e975198b8e26d9d17775f71b5fe5 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Wed, 28 Apr 2021 12:13:32 -0400
Subject: [PATCH 260/288] optimize the favicon.ico image (#3620)

Part of #3611
---
 client/public/favicon.ico | Bin 15086 -> 1153 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/client/public/favicon.ico b/client/public/favicon.ico
index ff33639a0fd66d4268c091abc922891075c0f2a7..8ceeab332350f5e293b9417dc5d855fd9f4a10f6 100644
GIT binary patch
literal 1153
zcmZQzU}Rus5D;Jh(h3ak85kJMfLK8R!cS&oU{D2O0|N;ECy?F2#K6!Q;OEZECB+3)
z%IoRj5(K1yCNKzaumH)ezsz3&scoJvjv*C{QzxoMv?U6#6qc7;rSX;<U3#hV!b3mg
zPPL<S=Rbj!HJs(s%f)`)&C#3p-py6B!X->#?TZ7fno>!Py2m6Jwnn^fk~#Z%nZ3ZK
z6-O5<1Zzv|EIy*)dV@R3q^)(2!7b(H|4kWFH>cg3Ag(Tw5I@mpx@F0`A6HECtJ0=b
zT%Y*UXGU?(OU+d;mrqVPZ$5j6+a$l0N7nPLob{0J<%}FA4awz<d^Zd=5AN{@R5cWw
zEoxK8!0BuE{5rQ5(8CN2p00i_>zopruy|JiD6IhY?#<#&^}x{4f_V4s6~&xG4kE`2
zg_>46C<KUVl*n?)iwK39N1Ap{pHZd46>Qn;l=$jHgb)jt<BtF3$~T>gWVg#j7u5Kh
z{rq}2`@X5vxA|Y0=CQeW&G>MvV_sC1K*y9#k2Kb7O@A9<l<aq|K|$eK)8;pGb2>x0
zzic^FRdlgMO5qy&x9K^aFHdoogeGJcg{@ranemUsDk_0_^Yz^;8GL8Y3|d;&c%rRr
zYxB3Qzt%7{>dNjs@K#_~SgqGx#-yc7Qq-PESkC*eaH;3?T(J~?tCz1&I(q-IOE@!&
zmpyd3ovAaM&xx7FM{f3Iu}@5z%GYrAjPq%eM=Ia{*2*y%HNT(S$|(EvoZY%kCx&vN
znK$ouG=)h#xYqEfT8#T&g}R$ma6w2M|Buy6TUylbpVEIIY?kob)OtnSWdcDAiUI?0
z5dY;i<N*fp0ca3kSDbLmfq^w3@0!aRCq+M(V~HO$WInn4opb0)=`y}@vF-y8{jM%N
zw?JTp7Ejws>*mfIfBtXZo3`w*=}A-1ZF>KI*D5{Km*n|VpU3~jVehwwiJ@m&4A;JM
zVs^GmXlB-{x!PL2Zj+_kmQA~!ceu@ESnV$J@X7t7FOS&rTYNskE3}PG$WEM3{~4?E
zHYPQjL)Sf4Nk%aU*DYT^Q{6nkIiW|n=Ix%WMn!1`PW}(Qk4lbA*I5|ItMF{zKHrju
zx6USfRV+9!ThqSeR$`A=!jb$Bb2qmJY9?$sFt74_4*wg;sm$eelS03&{uzD6jQxgE
z!R;CPA7qPkm>$X%+sR#YKOo|-_x@JwO}2=%t=mpyy;Znxp?+))W5n7`_452ncip|s
zy?w^QV`8pRX)EtUYft13zsbC8MslOBUyXGQ&*G@$bkn16%I61`{t?-}e}Q1KTUO0t
z-qmUT@tYOOKgq1D@mx2@fFWT^qyE{MiwzFkstoOS+^9S6;Ic2b?jI~+{}iRWS-ZR0
zhJ*2m>93Z{@kg|{|6DhG`0eiREj*l0dQFbM<Nsu7GU0kwpKjfS*MbWhoO*@y3=;n{
XURq*%f!Ut%Plu`a)mImTks}@e$G6*b

literal 15086
zcmeHNODt<^6yDy?a6ICbpaWO#01*R;fj9#OBqEU*7`YR12{93giNt`Iih+SJAdwRZ
z6A_Vk?4nh@Ty-eNqa4TSakW>qR9p0M*E**?*?ro(+TEU;{U?9--v48*Z>@jzf2~Cj
zAw(EaTui`|M|}8=AW8{>;PI^A?+D@?%HF{f>;DWVhyiHuJG6l=#2=8c{Cmp#@o@OH
zz&DpU9dI_l*#Kt)oDKNY1`-n!A9{Ox*UQVxrN7cTQ(0NLzq7NmZn0RjkS%?Eef(bm
ze^F79?DX_h2$0Q)+m?ohhgX9ce@aS<>fqpD1Mr$`n5oaHsi~D<#gDe~^z`(Zir4Xd
z6;d$bpPrsx1*|T0PL<*4=x8ID@P~zk8O37p8Wp3bcZEW+6HNH6w(beCT^-ohMKIyt
z-`~goDwCuS2?;R;iwt#jb-PT!W7~p)0$H%&2VI(9n{yoHo0ymg*c=)W5%COrfJ17w
zuCI<T-F}<RW^Ew%5eo|oq+4+GE3_*sD`Z1M!#3&y*N*=F{<V{n6CucV3uKIEXJ^9P
z++4Y@Z4GUP$(%`FB<GemR>#N3f~u;jkG_;6JUsm6^73-anWKM7j7H<v*x1+yZ)K>i
zuHG9TA1A39_A;xeAO9eBruvq>Q(Ro!qe`XPbEe8(iCV4R_g4SdFEuq)rPJw7*h6g3
z33z{c3x4dIm6dgadjNaN?0h{uJRCB`KQ=bT$9~id_`k4&*q+P%{XJv*iHwYVlFQ|P
z*;5M4msBeCYVREr6Qffqm6E`q{=pT-U&`b0zB08RTl<8B1g%D+k+LkqBd(LMb}_aa
z8*b_|Gc!|RFc>cUErZEqQq0fKlQ}s#->Ce3@eVR5{V2oJ;NT!1&vd@P>W&83;kTEU
zmn&b7!`$2)Yx`>07hc19a_UPNDk>@t-0938<w;3NYM5KMeIWzP?MHz+SGKjaiJqUI
z>8@#dtycTV`XAE4{!g{LyDNlsUF{DY)1?_28fvPot(6D_f;E_{k6=t}`%)9w+2^ID
zB|&|Cy#&@n16`VdY=>u@<mBW#T>AovgX7KllsOyVY=E-?&IW?q1^^zH0;K_r)8avX
z5BX=D7Q}M7NIvz;1AUGjrvuh(0M6cW^mnjrci?B)vEJhux3;!ei{Z%6&;N3DbtR^r
zaoO^rcXxMh!1?l?${XMP?E}ZN7sL~wkIXLi#D+t!*Pr=w{6|JcJo@KACmMh9M_-Rk
zR(DT`bGh{=2Do34x#NxHc+ci*{_XAUo3?v?xPwF=rl+JE9UUd%&Pj^%0rp*9UM58%
z5x=;&*lYU$8hlSoY1TdCT#=EHp`@cDxM#iY=;#n)?(FOozNUMc7%Zp{I{d*GYLv-j
zBD!?xwgWlN>F~!kaL=NLd4+K-g(oa{r}i5E+1XhV{YjX?M|<sw9@9EH^AyH2fFIg!
zerL+ZO?v~x1JL@9Mn^{*Zf<V=c0-3zG3Zb}IXSrswy$_i_tbju4{Pu4?mjYNMrjQ5
zg%bZi=+~#xW%3U9$r`u^_R2@p+S<CwgqORv@$vDG7Z(?d;u1jT|G*gP-O==>ys4>4
z?8;vcYv0}Z`T6GJ;v$LuL_VKSW@l$#d&7fHpS--htH#F0?Ut4n5zg~(8DBd5xHjB*
z?tg9rAYR}S-c#VU1P}7hdx~)Qa89h9DS<U(UKnTYO~2C8(qoLPM;{r}{yjZC7%Qv8
zWe?_jM!xxyk`hN>?+aaDTv}S%?ZCjm8lHP7ORfcDzOk;Rre?3KtjuL>67FyC42yAz
z)V?m>&EPvE9d*Ja))4SHjmgZ+4C#p51@G@gc=m9`Um}rsj8Vq1?CR<gL`6lp^lf51
yf`>R~eR_KOzm9xeed9U^=bN>|!$Z-~(9n8wbF-+hu#om1+ZD|qE(2)Zr~d%bsE{}S


From 13d4bfef8b55757886438c5c68336e29ce288a44 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Wed, 28 Apr 2021 12:19:45 -0400
Subject: [PATCH 261/288] translation differences flaw (#3106)

* translation differences flaw

Part of #3105

* less verbose

* adding some nice features

* fix bad import

* remove paragraph/heading comparison. Refactored macro comparison

* use rawBody instead

* with test

* add 'languages' KS macro

* addin 'AvailableInWorkers' macro

* fixes from merge

* feedbacked

* feedbacked

* alphabetical order
---
 build/constants.js                            |   1 +
 build/flaws/index.js                          |   9 ++
 build/flaws/translation-differences.js        |  42 +++++
 client/src/document/toolbar/flaws.scss        |   4 +
 client/src/document/toolbar/flaws.tsx         |  41 +++++
 client/src/document/types.tsx                 |  10 ++
 content/index.js                              |   2 +
 content/translation.js                        | 144 ++++++++++++++++++
 testing/tests/index.test.js                   |  14 ++
 .../files/fr/web/embeddable/index.html        |  11 ++
 10 files changed, 278 insertions(+)
 create mode 100644 build/flaws/translation-differences.js
 create mode 100644 content/translation.js
 create mode 100644 testing/translated-content/files/fr/web/embeddable/index.html

diff --git a/build/constants.js b/build/constants.js
index 9a8e6d6bb941..626c5a3c3b4f 100644
--- a/build/constants.js
+++ b/build/constants.js
@@ -31,6 +31,7 @@ const VALID_FLAW_CHECKS = new Set([
   "bad_pre_tags",
   "sectioning",
   "heading_links",
+  "translation_differences",
   "unsafe_html",
 ]);
 
diff --git a/build/flaws/index.js b/build/flaws/index.js
index 9ea46f9f082d..e089e699ea82 100644
--- a/build/flaws/index.js
+++ b/build/flaws/index.js
@@ -13,6 +13,7 @@ const sanitizeFilename = require("sanitize-filename");
 
 const { Document } = require("../../content");
 const { FLAW_LEVELS, VALID_FLAW_CHECKS } = require("../constants");
+const { DEFAULT_LOCALE } = require("../../libs/constants");
 const { replaceMatchesInText } = require("../matches-in-text");
 const { humanFileSize } = require("../utils");
 const { VALID_MIME_TYPES } = require("../../filecheck/constants");
@@ -22,6 +23,7 @@ const { getHeadingLinksFlaws } = require("./heading-links");
 const { getPreTagFlaws } = require("./pre-tags");
 const { injectSectionFlaws } = require("./sections");
 const { getUnsafeHTMLFlaws } = require("./unsafe-html");
+const { injectTranslationDifferences } = require("./translation-differences");
 
 function injectFlaws(doc, $, options, document) {
   if (doc.isArchive) return;
@@ -33,6 +35,13 @@ function injectFlaws(doc, $, options, document) {
     ["bad_pre_tags", getPreTagFlaws, false],
     ["heading_links", getHeadingLinksFlaws, false],
   ];
+  if (doc.locale !== DEFAULT_LOCALE && doc.isActive) {
+    flawChecks.push([
+      "translation_differences",
+      injectTranslationDifferences,
+      false,
+    ]);
+  }
 
   // Note that some flaw checking functions need to always run. Even if we're not
   // recording the flaws, the checks that it does are important for regular
diff --git a/build/flaws/translation-differences.js b/build/flaws/translation-differences.js
new file mode 100644
index 000000000000..5a89528a2618
--- /dev/null
+++ b/build/flaws/translation-differences.js
@@ -0,0 +1,42 @@
+const { Document, Translation } = require("../../content");
+const { DEFAULT_LOCALE } = require("../../libs/constants");
+
+function injectTranslationDifferences(doc, $, document) {
+  const flaws = [];
+
+  const englishDocument = Document.read(
+    document.fileInfo.folder.replace(
+      document.metadata.locale.toLowerCase(),
+      DEFAULT_LOCALE.toLowerCase()
+    )
+  );
+  if (!englishDocument) {
+    console.warn(`Can't get English original from ${document.fileInfo.folder}`);
+    return [];
+  }
+
+  function addFlaw(difference) {
+    const id = `translation_differences${flaws.length + 1}`;
+    const { explanation } = difference;
+    const suggestion = null;
+    const fixable = false;
+    const flaw = {
+      id,
+      explanation,
+      suggestion,
+      fixable,
+      difference,
+    };
+    flaws.push(flaw);
+  }
+
+  for (const difference of Translation.getTranslationDifferences(
+    englishDocument,
+    document
+  )) {
+    addFlaw(difference);
+  }
+  return flaws;
+}
+
+module.exports = { injectTranslationDifferences };
diff --git a/client/src/document/toolbar/flaws.scss b/client/src/document/toolbar/flaws.scss
index 1d75e05a677d..cc83cb6047ec 100644
--- a/client/src/document/toolbar/flaws.scss
+++ b/client/src/document/toolbar/flaws.scss
@@ -32,6 +32,10 @@
       text-decoration: none;
       background-color: #fbb;
     }
+
+    .explanation-notes li {
+      margin-bottom: 1px;
+    }
   }
 
   .macro-filepath-in-prerequisite {
diff --git a/client/src/document/toolbar/flaws.tsx b/client/src/document/toolbar/flaws.tsx
index 9dd340be043d..131eb1297bc0 100644
--- a/client/src/document/toolbar/flaws.tsx
+++ b/client/src/document/toolbar/flaws.tsx
@@ -19,6 +19,7 @@ import {
   BadPreTagFlaw,
   SectioningFlaw,
   HeadingLinksFlaw,
+  TranslationDifferenceFlaw,
   UnsafeHTMLFlaw,
 } from "../types";
 import "./flaws.scss";
@@ -284,6 +285,13 @@ function Flaws({
             return (
               <UnsafeHTML key="unsafe_html" flaws={doc.flaws.unsafe_html} />
             );
+          case "translation_differences":
+            return (
+              <TranslationDifferences
+                key="translation_differences"
+                flaws={doc.flaws.translation_differences}
+              />
+            );
           case "sectioning":
             return <Sectioning key="sectioning" flaws={doc.flaws.sectioning} />;
           default:
@@ -1064,3 +1072,36 @@ function UnsafeHTML({ flaws }: { flaws: UnsafeHTMLFlaw[] }) {
     </div>
   );
 }
+
+function TranslationDifferences({
+  flaws,
+}: {
+  flaws: TranslationDifferenceFlaw[];
+}) {
+  return (
+    <div className="flaw">
+      <h3>{humanizeFlawName("translation_differences")}</h3>
+      <ul>
+        {flaws.map((flaw, i) => (
+          <li key={flaw.id}>
+            {<b>{flaw.explanation}</b>}
+            {flaw.difference.explanationNotes &&
+              flaw.difference.explanationNotes.length > 0 && (
+                <ul className="explanation-notes">
+                  {flaw.difference.explanationNotes.map(
+                    (explanationNotes, i) => {
+                      return (
+                        <li key={`${explanationNotes}${i}`}>
+                          <code>{explanationNotes}</code>
+                        </li>
+                      );
+                    }
+                  )}
+                </ul>
+              )}
+          </li>
+        ))}
+      </ul>
+    </div>
+  );
+}
diff --git a/client/src/document/types.tsx b/client/src/document/types.tsx
index 571e49a78662..f1074c72cb53 100644
--- a/client/src/document/types.tsx
+++ b/client/src/document/types.tsx
@@ -82,6 +82,15 @@ export interface MacroErrorMessage extends GenericFlaw {
   fixed?: true;
 }
 
+export interface TranslationDifferenceFlaw extends GenericFlaw {
+  difference: {
+    explanation: string;
+    type: string;
+    name: string;
+    explanationNotes: string[];
+  };
+}
+
 type Flaws = {
   broken_links: BrokenLink[];
   macros: MacroErrorMessage[];
@@ -92,6 +101,7 @@ type Flaws = {
   sectioning: SectioningFlaw[];
   image_widths: ImageWidthFlaw[];
   heading_links: HeadingLinksFlaw[];
+  translation_differences: TranslationDifferenceFlaw[];
   unsafe_html: UnsafeHTMLFlaw[];
 };
 
diff --git a/content/index.js b/content/index.js
index 9eb79c7f2fed..8c0e8a03cc08 100644
--- a/content/index.js
+++ b/content/index.js
@@ -7,6 +7,7 @@ const {
   VALID_LOCALES,
 } = require("./constants");
 const Document = require("./document");
+const Translation = require("./translation");
 const { getPopularities } = require("./popularities");
 const Redirect = require("./redirect");
 const Image = require("./image");
@@ -35,6 +36,7 @@ module.exports = {
   Redirect,
   Image,
   Archive,
+  Translation,
 
   buildURL,
   memoize,
diff --git a/content/translation.js b/content/translation.js
new file mode 100644
index 000000000000..d2e4acf19092
--- /dev/null
+++ b/content/translation.js
@@ -0,0 +1,144 @@
+const LRU = require("lru-cache");
+
+const Parser = require("../kumascript/src/parser.js");
+
+const cacheKSMacros = new LRU({ max: 2000 });
+
+const IMPORTANT_MACROS = new Map(
+  [
+    "APIRef",
+    "AddonSidebar",
+    "AddonSidebarMain",
+    "AvailableInWorkers",
+    "CSSRef",
+    "CSSSyntax",
+    "CanvasSidebar",
+    "Compat",
+    "DefaultAPISidebar",
+    "EmbedGHLiveSample",
+    "EmbedInteractiveExample",
+    "EmbedLiveSample",
+    "GamesSidebar",
+    "HTMLSidebar",
+    "HTTPSidebar",
+    "IncludeSubnav",
+    "JsSidebar",
+    "LearnSidebar",
+    "MDNSidebar",
+    "SVGRef",
+    "SeeCompatTable",
+    "ServiceWorkerSidebar",
+    "ToolsSidebar",
+    "WebAssemblySidebar",
+    "WebExtAPISidebar",
+    "WebGLSidebar",
+    "WebRTCSidebar",
+    "languages",
+  ].map((name) => [name.toLowerCase(), name])
+);
+
+function getKSMacros(content, cacheKey = null) {
+  if (cacheKey && cacheKSMacros.has(cacheKey)) {
+    return cacheKSMacros.get(cacheKey);
+  }
+
+  const tokens = Parser.parse(content);
+  const macros = new Set();
+
+  for (const token of tokens) {
+    if (token.type !== "MACRO") {
+      continue;
+    }
+    const macroName = token.name.toLowerCase();
+    if (!IMPORTANT_MACROS.has(macroName)) {
+      continue;
+    }
+    const macroArgs = token.args;
+    let string = IMPORTANT_MACROS.get(macroName);
+    if (macroArgs.length) {
+      string += `(${macroArgs
+        .map((x) => {
+          if (typeof x === "object") {
+            return JSON.stringify(x);
+          }
+          return `'${x}'`;
+        })
+        .join(", ")})`;
+    }
+    macros.add(string);
+  }
+
+  if (cacheKey) {
+    cacheKSMacros.set(cacheKey, macros);
+  }
+  return macros;
+}
+
+function* getTranslationDifferences(englishDocument, translatedDocument) {
+  // Compare key KS macros presence
+  const translatedMacros = getKSMacros(translatedDocument.rawBody);
+  const englishMacros = getKSMacros(
+    englishDocument.rawBody,
+    englishDocument.url
+  );
+  if (!equalSets(translatedMacros, englishMacros)) {
+    const inCommon = setIntersection(translatedMacros, englishMacros);
+    const union = setUnion(translatedMacros, englishMacros);
+    // Turn it into an array so it can be sorted.
+    // It's good that it's sorted so the outcomes are predictable.
+    const differenceArray = [
+      ...symmetricSetDifference(translatedMacros, englishMacros),
+    ].sort();
+    const explanationNotes = differenceArray.map((macroSignature) => {
+      if (!englishMacros.has(macroSignature)) {
+        return `${macroSignature} only in ${translatedDocument.metadata.locale}`;
+      } else {
+        return `${macroSignature} only in en-US`;
+      }
+    });
+    yield {
+      type: "macro",
+      explanation: `Differences in the important macros (${inCommon.size} in common of ${union.size} possible)`,
+      explanationNotes,
+    };
+  }
+}
+
+function equalSets(setA, setB) {
+  return setA.size === setB.size && [...setA].every((value) => setB.has(value));
+}
+
+// Given [1, 2, 3] and [2, 3, 4] the symmetric difference is [1, 4]
+function symmetricSetDifference(setA, setB) {
+  const difference = new Set(setA);
+  for (const elem of setB) {
+    if (difference.has(elem)) {
+      difference.delete(elem);
+    } else {
+      difference.add(elem);
+    }
+  }
+  return difference;
+}
+
+function setIntersection(setA, setB) {
+  const intersection = new Set();
+  for (const elem of setB) {
+    if (setA.has(elem)) {
+      intersection.add(elem);
+    }
+  }
+  return intersection;
+}
+
+function setUnion(setA, setB) {
+  const union = new Set(setA);
+  for (const elem of setB) {
+    union.add(elem);
+  }
+  return union;
+}
+
+module.exports = {
+  getTranslationDifferences,
+};
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 4556cf451fcc..a76efeee8792 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -202,6 +202,20 @@ test("content built French foo page", () => {
   expect($('link[rel="alternate"][hreflang="fr"]').length).toBe(1);
 });
 
+test("content built French Embeddable page", () => {
+  const builtFolder = path.join(buildRoot, "fr", "docs", "web", "embeddable");
+  const jsonFile = path.join(builtFolder, "index.json");
+  const { doc } = JSON.parse(fs.readFileSync(jsonFile));
+  expect(doc.flaws.translation_differences.length).toBe(1);
+  const flaw = doc.flaws.translation_differences[0];
+  expect(flaw.explanation).toBe(
+    "Differences in the important macros (0 in common of 4 possible)"
+  );
+  expect(flaw.fixable).toBeFalsy();
+  expect(flaw.suggestion).toBeFalsy();
+  expect(flaw.difference.type).toBe("macro");
+});
+
 test("wrong xref macro errors", () => {
   const builtFolder = path.join(
     buildRoot,
diff --git a/testing/translated-content/files/fr/web/embeddable/index.html b/testing/translated-content/files/fr/web/embeddable/index.html
new file mode 100644
index 000000000000..9192b1542789
--- /dev/null
+++ b/testing/translated-content/files/fr/web/embeddable/index.html
@@ -0,0 +1,11 @@
+---
+title: Incorporer un échantillon en direct avec et sans nom
+slug: Web/Embeddable
+---
+
+<p>
+  This make exists to demonstrate that the French content has a difference in in
+  the <code>EmbedLiveSample</code> macro use.
+</p>
+
+<div>{{EmbedInteractiveExample("pages/css/animation.html", "taller")}}</div>

From 7fc6698e0563593a154eaa3afae7118ee41fdf8d Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Thu, 29 Apr 2021 08:18:06 -0400
Subject: [PATCH 262/288] optimize how we set the shortcut icon (#3621)

* optimize how we set the shortcut icon

Part of #3611

* fix eslint problem

* fix scripts

* use logger.info instead

* add favicon-48x48.png for the new default favicon

* add a test
---
 client/public/favicon-48x48.png | Bin 0 -> 373 bytes
 client/public/index.html        |   7 +++
 package.json                    |   3 +-
 testing/tests/index.test.js     |   7 +++
 tool/cli.js                     |  29 ++++++++++
 tool/optimize-client-build.js   |  94 ++++++++++++++++++++++++++++++++
 yarn.lock                       |   5 ++
 7 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 client/public/favicon-48x48.png
 create mode 100644 tool/optimize-client-build.js

diff --git a/client/public/favicon-48x48.png b/client/public/favicon-48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecf862a1486186c1c12c1c8e3c8431ddb0842701
GIT binary patch
literal 373
zcmV-*0gC>KP)<h;3K|Lk000e1NJLTq001xm001xq0{{R3r7YyM0000mP)t-sqN1X_
zyu5&bfY8v;-rnBp>+4QVPCY(7^z`)k`S}|g8~^|R2L}iL|NsC0{{R300rp2$0000E
zbW%=Jz`?`B#?H{y*5Kyr^7gDBfAatU0Om<VK~#9!WB88)FbqG5Kj*PZe3Q8MQVfg4
zr+M#y;Ktm|=TRm8#Jz)pepHDS?_l6Lio~yZaEXT~5-Z=q!CQT(1XKe8yp}>poOp)}
z-kO6Y5KcmXE~v!UcWB@-RDz?U6IJ2`!c{mV{`BFHIQkBUL;?fDJ!FXoh_L$d4jIfr
zNZ7qY0$1wc5+C0|!Nv3<?<ed3!zI3#7ehj$9wP>SLT$y6$OB8fLX|++ejk^_d`yYY
zV2OB4iT`{c34bgS-{%1(<grNnKMa)M$0qTA2`-8M#rO14BoN?G{ou=klu7^q>Yz#e
TCI6S|00000NkvXXu0mjflV`73

literal 0
HcmV?d00001

diff --git a/client/public/index.html b/client/public/index.html
index d399a05c9efa..6c0bb45a8b4e 100644
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -4,6 +4,13 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 
+    <!--
+      Note that our build process will rewrite this 'href' value to a copy
+      of the file that has a hash in it.
+    -->
+
+    <link rel="icon" href="%PUBLIC_URL%/favicon-48x48.png" />
+
     <!-- third-generation iPad with high-resolution Retina display: -->
     <link
       rel="apple-touch-icon-precomposed"
diff --git a/package.json b/package.json
index 8c19aaeb621c..662fdd868063 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "fiori:build": "cd client && build-storybook",
     "fiori:start": "cd client && start-storybook -p 6006",
     "md": "node markdown/cli.js",
-    "prepare-build": "yarn build:client && yarn build:ssr && yarn tool google-analytics-code && yarn tool spas && yarn tool gather-git-history",
+    "prepare-build": "yarn build:client && yarn build:ssr && yarn tool optimize-client-build && yarn tool google-analytics-code && yarn tool spas && yarn tool gather-git-history",
     "prettier-check": "prettier --check .",
     "prettier-format": "prettier --write .",
     "start": "(test -f client/build/index.html || yarn build:client) && (test -f ssr/dist/main.js || yarn build:ssr) && (test -d client/build/en-us/_spas || yarn tool spas) && nf -j Procfile.start start",
@@ -80,6 +80,7 @@
     "js-yaml": "4.1.0",
     "loglevel": "^1.7.1",
     "lru-cache": "^6.0.0",
+    "md5-file": "5.0.0",
     "mdn-data": "2.0.18",
     "open": "^8.0.6",
     "open-editor": "3.0.0",
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index a76efeee8792..15e653aa4576 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -115,6 +115,13 @@ test("content built foo page", () => {
   const html = fs.readFileSync(htmlFile, "utf-8");
   const $ = cheerio.load(html);
 
+  // Check that the favicon works and resolves
+  const faviconHref = $('link[rel="icon"]').attr("href");
+  // The faviconHref is a URL so to check that it exists on disk we need to
+  // strip the leading / and join that with the root of the build.
+  const faviconFile = path.join(buildRoot, faviconHref.slice(1));
+  expect(fs.existsSync(faviconFile)).toBeTruthy();
+
   expect($('meta[name="description"]').attr("content")).toBe(
     "This becomes the summary."
   );
diff --git a/tool/cli.js b/tool/cli.js
index 61424eec3ecc..f46f8633def9 100644
--- a/tool/cli.js
+++ b/tool/cli.js
@@ -29,6 +29,7 @@ const {
   GOOGLE_ANALYTICS_DEBUG,
 } = require("../build/constants");
 const { runMakePopularitiesFile } = require("./popularities");
+const { runOptimizeClientBuild } = require("./optimize-client-build");
 const kumascript = require("../kumascript");
 
 const PORT = parseInt(process.env.SERVER_PORT || "5000");
@@ -879,6 +880,34 @@ if (Mozilla && !Mozilla.dntEnabled()) {
         `modified: ${countModified} | no-change: ${countNoChange} | skipped: ${countSkipped} | total: ${countTotal}`
       );
     })
+  )
+
+  .command(
+    "optimize-client-build",
+    "After the client code has been built there are things to do that react-scripts can't."
+  )
+  .argument("<buildroot>", "directory where react-scripts built", {
+    default: path.join("client", "build"),
+  })
+  .action(
+    tryOrExit(async ({ args, options, logger }) => {
+      const { buildroot } = args;
+      const { results } = await runOptimizeClientBuild(buildroot);
+      if (options.verbose) {
+        for (const result of results) {
+          logger.info(`${result.filePath} -> ${result.hashedHref}`);
+        }
+      } else {
+        logger.info(
+          chalk.green(
+            `Hashed ${results.length} files in ${path.join(
+              buildroot,
+              "index.html"
+            )}`
+          )
+        );
+      }
+    })
   );
 
 program.run();
diff --git a/tool/optimize-client-build.js b/tool/optimize-client-build.js
new file mode 100644
index 000000000000..f8b1d189effb
--- /dev/null
+++ b/tool/optimize-client-build.js
@@ -0,0 +1,94 @@
+/**
+ * This script does all the necessary things the `yarn client:build`
+ * (react-scripts) can't do.
+ *
+ */
+const fs = require("fs");
+const path = require("path");
+
+const cheerio = require("cheerio");
+const md5File = require("md5-file");
+
+async function runOptimizeClientBuild(buildRoot) {
+  const indexHtmlFilePath = path.join(buildRoot, "index.html");
+  const indexHtml = fs.readFileSync(indexHtmlFilePath, "utf-8");
+
+  const results = [];
+
+  // For every favicon referred there, change it to a file URL that
+  // has a hash in it.
+  const $ = cheerio.load(indexHtml);
+  $("link[rel]").each((i, element) => {
+    const href = element.attribs.href;
+    if (!href) {
+      return;
+    }
+    const rel = element.attribs.rel;
+    if (
+      ![
+        "icon",
+        "shortcut icon",
+        "apple-touch-icon-precomposed",
+        "manifest",
+      ].includes(rel)
+    ) {
+      return;
+    }
+    // If this script is, for some reason, already run before we can
+    // bail if it looks like the href already is hashed.
+    if (/\.[a-f0-9]{8}\./.test(href)) {
+      console.warn(`Looks like ${href} is already hashed`);
+      return;
+    }
+    const filePath = hrefToFilePath(buildRoot, href);
+    if (!filePath || !fs.existsSync(filePath)) {
+      console.warn(`Unable to turn '${href}' into a valid file path`);
+      return;
+    }
+    // 8 because that's what react-scripts (which uses webpack somehow)
+    // uses to create those `build/static/**/*` files it builds.
+    const hash = md5File.sync(filePath).slice(0, 8);
+    const extName = path.extname(filePath);
+    const splitName = filePath.split(extName);
+    const hashedFilePath = `${splitName[0]}.${hash}${extName}`;
+    fs.copyFileSync(filePath, hashedFilePath);
+    const hashedHref = filePathToHref(buildRoot, hashedFilePath);
+    results.push({
+      filePath,
+      href,
+      hashedHref,
+      hashedFilePath,
+    });
+  });
+
+  if (results.length > 0) {
+    // It clearly hashed some files. Let's update the HTML!
+    let newIndexHtml = indexHtml;
+    for (const { href, hashedHref } of results) {
+      newIndexHtml = newIndexHtml.replace(
+        new RegExp(`href="${href}"`),
+        `href="${hashedHref}"`
+      );
+    }
+    fs.writeFileSync(indexHtmlFilePath, newIndexHtml, "utf-8");
+  }
+
+  return { results };
+}
+
+// Turn 'C:\Path\to\client\build\favicon.ico' to '/favicon.ico'
+function filePathToHref(root, filePath) {
+  return `${filePath.replace(root, "").replace(path.sep, "/")}`;
+}
+
+// Turn '/favicon.ico' to 'C:\Path\to\client\build\favicon.ico'
+function hrefToFilePath(root, href) {
+  // The href is always expected to start with a `/` which is part of a
+  // URL and not a file path.
+  const pathname = new URL(href, "http://localhost.example").pathname;
+  if (pathname.startsWith("/")) {
+    return path.join(root, pathname.slice(1).replace(/\//g, path.sep));
+  }
+}
+
+module.exports = { runOptimizeClientBuild };
diff --git a/yarn.lock b/yarn.lock
index 4cd4443f2bb9..5c7c9665724f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13144,6 +13144,11 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
+md5-file@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/md5-file/-/md5-file-5.0.0.tgz#e519f631feca9c39e7f9ea1780b63c4745012e20"
+  integrity sha512-xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw==
+
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"

From 510b9a080e8db843e43f3c5c3ca784c1a99ac4e6 Mon Sep 17 00:00:00 2001
From: Leo Chen <a0952250818@gmail.com>
Date: Sat, 1 May 2021 09:18:35 +0800
Subject: [PATCH 263/288] update the translation of the Angular (#3662)

---
 kumascript/macros/LearnSidebar.ejs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kumascript/macros/LearnSidebar.ejs b/kumascript/macros/LearnSidebar.ejs
index f58295b28deb..80978b9b3476 100644
--- a/kumascript/macros/LearnSidebar.ejs
+++ b/kumascript/macros/LearnSidebar.ejs
@@ -1470,12 +1470,12 @@ var text = mdn.localStringMap({
         'TypeScript_support_in_Svelte': 'TypeScript support in Svelte',
         'Deployment_and_next_steps': 'Deployment and next steps',
       'Angular': 'Angular',
-        'Getting_started_with_Angular': 'Getting started with Angular',
-        'Beginning_our_Angular_todo_list_app': 'Beginning our Angular todo list app',
-        'Styling_our_Angular_app': 'Styling our Angular app',
-        'Creating_an_item_component': 'Creating an item component',
-        'Filtering_our_to-do_items': 'Filtering our to-do items',
-        'Building_Angular_applications_and_further_resources': 'Building Angular applications and further resources',
+        'Getting_started_with_Angular': 'Angular 新手入門',
+        'Beginning_our_Angular_todo_list_app': '開始開發我們的 Angular 待辦事項應用程式',
+        'Styling_our_Angular_app': '使用樣式點綴我們的 Angular 應用程式',
+        'Creating_an_item_component': '建立一個 item 元件',
+        'Filtering_our_to-do_items': '篩選我們的待辦事項項目',
+        'Building_Angular_applications_and_further_resources': '建構 Angular 應用程式與更多資源',
     'Server-side_website_programming' : '伺服端網站程式設計',
       'First_steps' : '第一步',
         'First_steps_overview' : '第一步概述',

From b432517639ad984a601ef7ff80ef0775b9a69aa9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 07:08:17 +0000
Subject: [PATCH 264/288] build(deps): bump boto3 from 1.17.57 to 1.17.62 in
 /deployer (#3667)

---
 deployer/poetry.lock    | 16 ++++++++--------
 deployer/pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 616cc3c0937d..83672aae3211 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -53,20 +53,20 @@ python2 = ["typed-ast (>=1.4.2)"]
 
 [[package]]
 name = "boto3"
-version = "1.17.57"
+version = "1.17.62"
 description = "The AWS SDK for Python"
 category = "main"
 optional = false
 python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
-botocore = ">=1.20.57,<1.21.0"
+botocore = ">=1.20.62,<1.21.0"
 jmespath = ">=0.7.1,<1.0.0"
 s3transfer = ">=0.4.0,<0.5.0"
 
 [[package]]
 name = "botocore"
-version = "1.20.57"
+version = "1.20.62"
 description = "Low-level, data-driven core of boto 3."
 category = "main"
 optional = false
@@ -555,7 +555,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "cc13faeccfaeeea774c2044a88ee605a2fbb2281fb719a423fa8bb91743b162d"
+content-hash = "3785f2786a67bb2c45bc5c2a78f2a975a2ccf621e65191a4df36d6a49557c1fe"
 
 [metadata.files]
 appdirs = [
@@ -575,12 +575,12 @@ black = [
     {file = "black-21.4b0.tar.gz", hash = "sha256:915d916c48646dbe8040d5265cff7111421a60a3dfe7f7e07273176a57c24a34"},
 ]
 boto3 = [
-    {file = "boto3-1.17.57-py2.py3-none-any.whl", hash = "sha256:2783947ec34dd84fc36093e8fc8a9a24679cf912a97bc9a0c47f4966ed059a29"},
-    {file = "boto3-1.17.57.tar.gz", hash = "sha256:6b4a79691a48740816f03c4cb1e8ef46f8335ad2019d9c4a95da73eb5cb98f05"},
+    {file = "boto3-1.17.62-py2.py3-none-any.whl", hash = "sha256:da1b2c884dbf56cc3ece07940a7b654f41a93b9fc40ee1ed21a76da25a05989c"},
+    {file = "boto3-1.17.62.tar.gz", hash = "sha256:d856a71d74351649ca8dd59ad17c8c3e79ea57734ff4a38a97611e1e10b06863"},
 ]
 botocore = [
-    {file = "botocore-1.20.57-py2.py3-none-any.whl", hash = "sha256:fa430bc773363a3d332c11c55bd8c0c0a5819d576121eb6990528a1bdaa89bcd"},
-    {file = "botocore-1.20.57.tar.gz", hash = "sha256:ae4ac72921f23d35ad54a5fb0989fc00c6fff8a39e24f26128b9315cc6209fec"},
+    {file = "botocore-1.20.62-py2.py3-none-any.whl", hash = "sha256:e4f8cb923edf035c2ae5f6169c70e77e31df70b88919b92b826a6b9bd14511b1"},
+    {file = "botocore-1.20.62.tar.gz", hash = "sha256:f7c2c5c5ed5212b2628d8fb1c587b31c6e8d413ecbbd1a1cdf6f96ed6f5c8d5e"},
 ]
 certifi = [
     {file = "certifi-2020.12.5-py2.py3-none-any.whl", hash = "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index b11b3c2bac05..279791dd8acd 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -10,7 +10,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.7"
 click = "^7.1.2"
-boto3 = "^1.17.57"
+boto3 = "^1.17.62"
 python-decouple = "^3.4"
 requests = {extras = ["security"], version = "^2.25.0"}
 elasticsearch-dsl = "^7.3.0"

From 2962fab35ce96a2d7071b031a702ef131ebc8860 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 3 May 2021 04:50:49 -0400
Subject: [PATCH 265/288] experimental variants for the mdn++ landing page
 (#3659)

---
 client/src/mdnplusplus/app.tsx | 85 ++++++++++++++++++++++++++++++++--
 1 file changed, 80 insertions(+), 5 deletions(-)

diff --git a/client/src/mdnplusplus/app.tsx b/client/src/mdnplusplus/app.tsx
index 28faab3ac265..a7c0e0c9b4c3 100644
--- a/client/src/mdnplusplus/app.tsx
+++ b/client/src/mdnplusplus/app.tsx
@@ -1,15 +1,90 @@
 import "./index.scss";
 
+type Variant = 0 | 1 | 2 | 3;
+
+interface IFrameData {
+  src: string;
+  title: string;
+  width: number;
+  height: number;
+}
+
+function getSurveyIframe(variant: number): IFrameData {
+  const _default: IFrameData = {
+    // From https://app.alchemer.com/distribute/share/id/6295937
+    src: "https://survey.alchemer.com/s3/6295937/MDN-Fake-Door-Survey",
+    title: "MDN++ survey",
+    width: 700,
+    height: 500,
+  };
+  // Remember variant 0 is the default.
+  if (variant === 1) {
+    return Object.assign({}, _default, {
+      src: "https://survey.alchemer.com/s3/6295937/MDN-Fake-Door-SurveyV1",
+    });
+  }
+  if (variant === 2) {
+    return Object.assign({}, _default, {
+      src: "https://survey.alchemer.com/s3/6295937/MDN-Fake-Door-SurveyV2",
+    });
+  }
+  return _default;
+}
+
+const LOCALSTORAGE_KEY = "mdnplusplus_lc_variant";
+
+function loadPreviousVariant(possibleVariants: Variant[]): Variant | undefined {
+  try {
+    const previous = localStorage.getItem(LOCALSTORAGE_KEY);
+    if (previous) {
+      const value = parseInt(previous) as Variant;
+      if (possibleVariants.includes(value)) {
+        return value;
+      }
+    }
+  } catch (error) {
+    // Can happen if localStorage simply isn't working in this browser!
+    // Or, if the saved value isn't a valid number.
+  }
+  return undefined;
+}
+
+function setPreviousVariant(value: Variant) {
+  try {
+    localStorage.setItem(LOCALSTORAGE_KEY, `${value}`);
+  } catch (error) {
+    // Can happen if localStorage simply isn't working in this browser!
+  }
+}
+
 export default function App({ ...appProps }) {
+  const variants: Variant[] = [0, 1, 2, 3];
+  const previousVariant = loadPreviousVariant(variants);
+  const variant: Variant =
+    previousVariant || variants[Math.floor(Math.random() * variants.length)];
+
+  if (!previousVariant) {
+    setPreviousVariant(variant);
+  }
+
+  const iframe = getSurveyIframe(variant);
   return (
     <div className="mdnplusplus">
-      {/* From https://app.alchemer.com/distribute/share/id/6295937 */}
+      <p>Hi I'm Daryl!</p>
+      {variant === 1 || variant === 3 ? (
+        <p>Hi, this is variant 1 or 3!</p>
+      ) : (
+        <p>This must be variant 0 or 2</p>
+      )}
+
+      {variant !== 3 && <p>The price is $10/month</p>}
+
       <iframe
-        src="https://survey.alchemer.com/s3/6295937/MDN-Fake-Door-Survey"
-        title="MDN++ survey"
+        src={iframe.src}
+        title={iframe.title}
         frameBorder="0"
-        width="700"
-        height="500"
+        width={iframe.width}
+        height={iframe.height}
         style={{ overflow: "hidden" }}
       ></iframe>
     </div>

From 8808321ee191e3120703c8da3295ebfef7ebcecc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 11:16:47 +0000
Subject: [PATCH 266/288] build(deps-dev): bump stylelint from 13.12.0 to
 13.13.1 (#3671)

---
 package.json |   2 +-
 yarn.lock    | 132 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 88 insertions(+), 46 deletions(-)

diff --git a/package.json b/package.json
index 662fdd868063..40483f54e03b 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     "react-scripts": "4.0.3",
     "rough-notation": "0.5.1",
     "sass": "^1.32.11",
-    "stylelint": "^13.12.0",
+    "stylelint": "^13.13.1",
     "stylelint-a11y": "^1.2.3",
     "stylelint-config-prettier": "^8.0.2",
     "stylelint-config-recommended": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5c7c9665724f..4d7e1c4c6b5d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4880,7 +4880,7 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^7.0.0, ajv@^7.0.2:
+ajv@^7.0.0:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2"
   integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ==
@@ -4890,6 +4890,16 @@ ajv@^7.0.0, ajv@^7.0.2:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
+ajv@^8.0.1:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602"
+  integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -5589,6 +5599,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
+balanced-match@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
+  integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
+
 base64-js@^1.0.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
@@ -6296,7 +6311,7 @@ chalk@3.0.0, chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@4.1.1, chalk@^4.0.0, chalk@^4.1.0:
+chalk@4.1.1, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
   integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
@@ -10010,10 +10025,10 @@ globby@^10.0.0:
     merge2 "^1.2.3"
     slash "^3.0.0"
 
-globby@^11.0.1, globby@^11.0.2:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
-  integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==
+globby@^11.0.1, globby@^11.0.3:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
+  integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
@@ -11682,6 +11697,11 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
@@ -12841,6 +12861,11 @@ lodash._reinterpolate@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -12851,6 +12876,11 @@ lodash.escaperegexp@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
 
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
 lodash.groupby@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1"
@@ -12891,6 +12921,11 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "^3.0.0"
 
+lodash.truncate@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
+  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
+
 lodash.uniq@4.5.0, lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -12908,12 +12943,13 @@ log-symbols@^2.1.0:
   dependencies:
     chalk "^2.0.1"
 
-log-symbols@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
-  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
+log-symbols@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
   dependencies:
-    chalk "^4.0.0"
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
 
 logalot@^2.0.0, logalot@^2.1.0:
   version "2.1.0"
@@ -13510,13 +13546,13 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.0, micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
   dependencies:
     braces "^3.0.1"
-    picomatch "^2.0.5"
+    picomatch "^2.2.3"
 
 miller-rabin@^4.0.0:
   version "4.0.1"
@@ -14820,11 +14856,16 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
+picomatch@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
+  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
+
 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"
@@ -15597,14 +15638,12 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
-  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz#042d74e137db83e6f294712096cb413f5aa612c4"
+  integrity sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==
   dependencies:
     cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
     util-deprecate "^1.0.2"
 
 postcss-sorting@^5.0.1:
@@ -18293,16 +18332,16 @@ stylelint-scss@^3.18.0, stylelint-scss@^3.19.0:
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.1.0"
 
-stylelint@^13.12.0:
-  version "13.12.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.12.0.tgz#cceb922be0d0c7b7b6926271eea2b90cb924733e"
-  integrity sha512-P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw==
+stylelint@^13.13.1:
+  version "13.13.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.13.1.tgz#fca9c9f5de7990ab26a00f167b8978f083a18f3c"
+  integrity sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==
   dependencies:
     "@stylelint/postcss-css-in-js" "^0.37.2"
     "@stylelint/postcss-markdown" "^0.36.2"
     autoprefixer "^9.8.6"
-    balanced-match "^1.0.0"
-    chalk "^4.1.0"
+    balanced-match "^2.0.0"
+    chalk "^4.1.1"
     cosmiconfig "^7.0.0"
     debug "^4.3.1"
     execall "^2.0.0"
@@ -18311,7 +18350,7 @@ stylelint@^13.12.0:
     file-entry-cache "^6.0.1"
     get-stdin "^8.0.0"
     global-modules "^2.0.0"
-    globby "^11.0.2"
+    globby "^11.0.3"
     globjoin "^0.1.4"
     html-tags "^3.1.0"
     ignore "^5.1.8"
@@ -18319,10 +18358,10 @@ stylelint@^13.12.0:
     imurmurhash "^0.1.4"
     known-css-properties "^0.21.0"
     lodash "^4.17.21"
-    log-symbols "^4.0.0"
+    log-symbols "^4.1.0"
     mathml-tag-names "^2.1.3"
     meow "^9.0.0"
-    micromatch "^4.0.2"
+    micromatch "^4.0.4"
     normalize-selector "^0.2.0"
     postcss "^7.0.35"
     postcss-html "^0.36.0"
@@ -18332,7 +18371,7 @@ stylelint@^13.12.0:
     postcss-safe-parser "^4.0.2"
     postcss-sass "^0.4.4"
     postcss-scss "^2.1.1"
-    postcss-selector-parser "^6.0.4"
+    postcss-selector-parser "^6.0.5"
     postcss-syntax "^0.36.2"
     postcss-value-parser "^4.1.0"
     resolve-from "^5.0.0"
@@ -18343,8 +18382,8 @@ stylelint@^13.12.0:
     style-search "^0.1.0"
     sugarss "^2.0.0"
     svg-tags "^1.0.0"
-    table "^6.0.7"
-    v8-compile-cache "^2.2.0"
+    table "^6.6.0"
+    v8-compile-cache "^2.3.0"
     write-file-atomic "^3.0.3"
 
 sugarss@^2.0.0:
@@ -18461,15 +18500,18 @@ table@5.4.6:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
-table@^6.0.4, table@^6.0.7:
-  version "6.0.7"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"
-  integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==
+table@^6.0.4, table@^6.6.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e"
+  integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==
   dependencies:
-    ajv "^7.0.2"
-    lodash "^4.17.20"
+    ajv "^8.0.1"
+    lodash.clonedeep "^4.5.0"
+    lodash.flatten "^4.4.0"
+    lodash.truncate "^4.4.2"
     slice-ansi "^4.0.0"
     string-width "^4.2.0"
+    strip-ansi "^6.0.0"
 
 tabtab@^3.0.2:
   version "3.0.2"
@@ -19484,10 +19526,10 @@ uuid@^8.3.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
   integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
-  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0, v8-compile-cache@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
 v8-to-istanbul@^7.0.0:
   version "7.0.0"

From 1f9d7dcb37eac77d3b1cd5faabb62b160f72cfd1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 11:21:42 +0000
Subject: [PATCH 267/288] build(deps-dev): bump @storybook/addon-a11y from
 6.2.8 to 6.2.9 (#3672)

---
 package.json |  2 +-
 yarn.lock    | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 40483f54e03b..d96af153f26d 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "@babel/core": "^7.13.16",
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.1",
-    "@storybook/addon-a11y": "^6.2.8",
+    "@storybook/addon-a11y": "^6.2.9",
     "@storybook/addon-actions": "^6.2.9",
     "@storybook/addon-essentials": "^6.2.9",
     "@storybook/addon-links": "^6.2.9",
diff --git a/yarn.lock b/yarn.lock
index 4d7e1c4c6b5d..340d1c1b37c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2675,19 +2675,19 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@storybook/addon-a11y@^6.2.8":
-  version "6.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.8.tgz#11a302579ee3f31dbf7f96ac48c9d1ee53b3e5c5"
-  integrity sha512-bheVrZM0q0CfFNNtzaZphqN8qf7ZT0hqXCiHRGMfv7jrHk34IT6UDIhchydDTta9LirwK1DvBQomsNfHdzGPrA==
+"@storybook/addon-a11y@^6.2.9":
+  version "6.2.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.2.9.tgz#8386d73343db03c15d07f6bf927a4030d441d1ff"
+  integrity sha512-wo7nFpEqEeiHDsRKnhqe2gIHZ9Z7/Aefw570kBgReU5tKlmrb5rFAfTVBWGBZlLHWeJMsFsRsWrWrmkf1B52OQ==
   dependencies:
-    "@storybook/addons" "6.2.8"
-    "@storybook/api" "6.2.8"
-    "@storybook/channels" "6.2.8"
-    "@storybook/client-api" "6.2.8"
-    "@storybook/client-logger" "6.2.8"
-    "@storybook/components" "6.2.8"
-    "@storybook/core-events" "6.2.8"
-    "@storybook/theming" "6.2.8"
+    "@storybook/addons" "6.2.9"
+    "@storybook/api" "6.2.9"
+    "@storybook/channels" "6.2.9"
+    "@storybook/client-api" "6.2.9"
+    "@storybook/client-logger" "6.2.9"
+    "@storybook/components" "6.2.9"
+    "@storybook/core-events" "6.2.9"
+    "@storybook/theming" "6.2.9"
     axe-core "^4.1.1"
     core-js "^3.8.2"
     global "^4.4.0"

From d6288be22570fe11dc0d1b5f3ce9c44b161e9eaa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 11:30:08 +0000
Subject: [PATCH 268/288] build(deps): bump open from 8.0.6 to 8.0.7 (#3674)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d96af153f26d..2b353a773355 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "lru-cache": "^6.0.0",
     "md5-file": "5.0.0",
     "mdn-data": "2.0.18",
-    "open": "^8.0.6",
+    "open": "^8.0.7",
     "open-editor": "3.0.0",
     "prismjs": "1.23.0",
     "read-chunk": "3.2.0",
diff --git a/yarn.lock b/yarn.lock
index 340d1c1b37c8..f589513bf95d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14323,10 +14323,10 @@ open@^7.0.2, open@^7.0.3, open@^7.3.0:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
 
-open@^8.0.6:
-  version "8.0.6"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.0.6.tgz#bdf94a80b4ef5685d8c7b58fb0fbbe5729b37204"
-  integrity sha512-vDOC0KwGabMPFtIpCO2QOnQeOz0N2rEkbuCuxICwLMUCrpv+A7NHrrzJ2dQReJmVluHhO4pYRh/Pn6s8t7Op6Q==
+open@^8.0.7:
+  version "8.0.7"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.0.7.tgz#5597eeff14b440f6ff78fb7ced9ede9f69b2122d"
+  integrity sha512-qoyG0kpdaWVoL5MiwTRQWujSdivwBOgfLadVEdpsZNHOK1+kBvmVtLYdgWr8G4cgBpG9zaxezn6jz6PPdQW5xg==
   dependencies:
     define-lazy-prop "^2.0.0"
     is-docker "^2.1.1"

From 11f5a3162870e0b2150a3167583e71893942bb89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 11:30:16 +0000
Subject: [PATCH 269/288] build(deps): bump http-proxy-middleware from 1.3.0 to
 1.3.1 (#3675)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2b353a773355..d25d15c76e2b 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "hast-util-is-element": "^1.1.0",
     "hast-util-to-html": "^7.1.3",
     "hast-util-to-text": "^2.0.1",
-    "http-proxy-middleware": "1.3.0",
+    "http-proxy-middleware": "1.3.1",
     "image-size": "1.0.0",
     "image-type": "4.1.0",
     "imagemin": "7.0.1",
diff --git a/yarn.lock b/yarn.lock
index f589513bf95d..56647450a81d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10773,10 +10773,10 @@ http-proxy-middleware@0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
-http-proxy-middleware@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.0.tgz#eda5e0b7d1f27ac82bd11eb5099d8c309d30cf30"
-  integrity sha512-nHn8lcFNmxCalzHGXMn0ojKunXC9twBvJ+y7QNhvK/ep7ZDOXvO7Gph01rSwsMOrG4m6N72gAAWXMYhPZvK6OA==
+http-proxy-middleware@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665"
+  integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==
   dependencies:
     "@types/http-proxy" "^1.17.5"
     http-proxy "^1.18.1"

From 57d705c67de28ec121b02faddbd83cf54d07f7cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 11:39:43 +0000
Subject: [PATCH 270/288] build(deps-dev): bump eslint-plugin-jest from 24.3.5
 to 24.3.6 (#3677)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d25d15c76e2b..a000309de9db 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "downshift": "^6.1.3",
     "eslint": "^7.18.0",
     "eslint-gitignore": "^0.1.0",
-    "eslint-plugin-jest": "24.3.5",
+    "eslint-plugin-jest": "24.3.6",
     "eslint-plugin-node": "11.1.0",
     "extend": "^3.0.2",
     "flexsearch": "0.6.32",
diff --git a/yarn.lock b/yarn.lock
index 56647450a81d..948bc94f62ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8564,10 +8564,10 @@ eslint-plugin-import@^2.22.1:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-jest@24.3.5, eslint-plugin-jest@^24.1.0:
-  version "24.3.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.5.tgz#71f0b580f87915695c286c3f0eb88cf23664d044"
-  integrity sha512-XG4rtxYDuJykuqhsOqokYIR84/C8pRihRtEpVskYLbIIKGwPNW2ySxdctuVzETZE+MbF/e7wmsnbNVpzM0rDug==
+eslint-plugin-jest@24.3.6, eslint-plugin-jest@^24.1.0:
+  version "24.3.6"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz#5f0ca019183c3188c5ad3af8e80b41de6c8e9173"
+  integrity sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg==
   dependencies:
     "@typescript-eslint/experimental-utils" "^4.0.1"
 

From c5cba675672de2ade2ddd3913db9b3ba217304f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 11:40:40 +0000
Subject: [PATCH 271/288] build(deps-dev): bump sass from 1.32.11 to 1.32.12
 (#3678)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a000309de9db..5580ee03d73a 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "react-router-dom": "6.0.0-beta.0",
     "react-scripts": "4.0.3",
     "rough-notation": "0.5.1",
-    "sass": "^1.32.11",
+    "sass": "^1.32.12",
     "stylelint": "^13.13.1",
     "stylelint-a11y": "^1.2.3",
     "stylelint-config-prettier": "^8.0.2",
diff --git a/yarn.lock b/yarn.lock
index 948bc94f62ce..6966f18d5d99 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17292,10 +17292,10 @@ sass-loader@^10.0.5:
     schema-utils "^3.0.0"
     semver "^7.3.2"
 
-sass@^1.32.11:
-  version "1.32.11"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.11.tgz#b236b3ea55c76602c2ef2bd0445f0db581baa218"
-  integrity sha512-O9tRcob/fegUVSIV1ihLLZcftIOh0AF1VpKgusUfLqnb2jQ0GLDwI5ivv1FYWivGv8eZ/AwntTyTzjcHu0c/qw==
+sass@^1.32.12:
+  version "1.32.12"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.12.tgz#a2a47ad0f1c168222db5206444a30c12457abb9f"
+  integrity sha512-zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
 

From bbf11de4740ce586c1cd918d2a0d475477e02160 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 11:41:06 +0000
Subject: [PATCH 272/288] build(deps): bump @mdn/browser-compat-data from 3.3.0
 to 3.3.2 (#3679)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 5580ee03d73a..c5118b94750d 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
   "dependencies": {
     "@caporal/core": "2.0.2",
     "@fast-csv/parse": "4.3.6",
-    "@mdn/browser-compat-data": "3.3.0",
+    "@mdn/browser-compat-data": "3.3.2",
     "accept-language-parser": "1.5.0",
     "chalk": "4.1.1",
     "cheerio": "1.0.0-rc.6",
diff --git a/yarn.lock b/yarn.lock
index 6966f18d5d99..e6d1729751d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2458,10 +2458,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@mdn/browser-compat-data@3.3.0":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.3.0.tgz#00259cedef91cd4ea253d861fc68ad49b3d113ec"
-  integrity sha512-VtD1pp8/DaOzvONz/I9RHFKB6/SkFsckDy3+0Zm3zXjqnkOEvvoJlaCxWskoyvEoFapkktx0ghA7Avi49EnEUA==
+"@mdn/browser-compat-data@3.3.2":
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.3.2.tgz#6150ff389513af5bda46b3d67bf6426e4358b581"
+  integrity sha512-TW8LAl7MLc3gVMqd+Y70mHCOJ2dugvuXt5rQe+UjusFRhhKlFvmCBFyZ1Qv3QWf7N9Ppd6+6gl36lvg9sCc4Kg==
 
 "@mdn/dinocons@^0.3.1":
   version "0.3.1"

From 404a6d7888a96cb1b73bf8fe67d1a3e78f44455c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 11:51:31 +0000
Subject: [PATCH 273/288] build(deps-dev): bump jest-puppeteer from 5.0.2 to
 5.0.3 (#3680)

---
 package.json |  2 +-
 yarn.lock    | 42 +++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index c5118b94750d..be4311ee3093 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
     "ignore-loader": "^0.1.2",
     "jest-environment-jsdom-sixteen": "^1.0.3",
     "jest-junit-reporter": "^1.1.0",
-    "jest-puppeteer": "5.0.2",
+    "jest-puppeteer": "5.0.3",
     "jsdom": "^16.5.3",
     "jsesc": "^3.0.2",
     "nodemon": "2.0.7",
diff --git a/yarn.lock b/yarn.lock
index e6d1729751d1..1cc8a4cdd1ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8914,10 +8914,10 @@ expand-tilde@^1.2.2:
   dependencies:
     os-homedir "^1.0.1"
 
-expect-puppeteer@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/expect-puppeteer/-/expect-puppeteer-5.0.0.tgz#e4a61bb91e3bba58030d8d66a87e5b67bb2898a9"
-  integrity sha512-yMzVgFfPN0GOD7YMvs9hHsf9YxRg7SrcHqENxkgznoqtRBUZDdSmUte3osJ0LpLIb+9TXP5YUbCbOj7HmCl6EQ==
+expect-puppeteer@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/expect-puppeteer/-/expect-puppeteer-5.0.3.tgz#5e2f7afc55ebabb38edcff45480955473e67a2a7"
+  integrity sha512-l5APxyanw4n+zmVCCRKY6BoialeLvNSunTeA4e5QdhGq1QGQCq9WBcw3NVcCO4bAk2yQLL2ZoUmYMD3Q9ZvroQ==
 
 expect@^26.6.0, expect@^26.6.2:
   version "26.6.2"
@@ -11947,12 +11947,12 @@ jest-config@^26.6.3:
     micromatch "^4.0.2"
     pretty-format "^26.6.2"
 
-jest-dev-server@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/jest-dev-server/-/jest-dev-server-5.0.0.tgz#904ff0525715b8268d817a07d6ce942ce70d06b2"
-  integrity sha512-PUgOwr/XT+KUJG+bMjifSWwswQXhh92wMPGnkFZiHtWkc2IcdCCykRLkoFSKCKWPveuGDOa7ZKVoUgn0+S4wew==
+jest-dev-server@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/jest-dev-server/-/jest-dev-server-5.0.3.tgz#324bf6426477450ec3dae349ee9223d43f8be368"
+  integrity sha512-aJR3a5KdY18Lsz+VbREKwx2HM3iukiui+J9rlv9o6iYTwZCSsJazSTStcD9K1q0AIF3oA+FqLOKDyo/sc7+fJw==
   dependencies:
-    chalk "^4.1.0"
+    chalk "^4.1.1"
     cwd "^0.10.0"
     find-process "^1.4.4"
     prompts "^2.4.1"
@@ -12023,14 +12023,14 @@ jest-environment-node@^26.6.2:
     jest-mock "^26.6.2"
     jest-util "^26.6.2"
 
-jest-environment-puppeteer@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-puppeteer/-/jest-environment-puppeteer-5.0.1.tgz#dc520fca625de054876181304b57c0f5879372e8"
-  integrity sha512-OtSNz3YOkhEGdQ02AQk1t9EbN9TcU7rbPRkcJeRj9RgwXlm5O9ijZIwi8ASd7tLKxddykdF+s8JPhynyDnLHOg==
+jest-environment-puppeteer@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/jest-environment-puppeteer/-/jest-environment-puppeteer-5.0.3.tgz#5cff9d1aa75c16ad525e3acbddc322e90a87673b"
+  integrity sha512-KHUJKeFKFNgQPitZZCHSlw22FanCSV3EnM8GaqV8v3nPp1CqoPgFFYKrrX/Z5mCZhSgJfo2qMtinG2YAUSLpCg==
   dependencies:
-    chalk "^4.1.0"
+    chalk "^4.1.1"
     cwd "^0.10.0"
-    jest-dev-server "^5.0.0"
+    jest-dev-server "^5.0.3"
     jest-environment-node "^26.6.2"
     merge-deep "^3.0.3"
 
@@ -12158,13 +12158,13 @@ jest-pnp-resolver@^1.2.2:
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-puppeteer@5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/jest-puppeteer/-/jest-puppeteer-5.0.2.tgz#33607a4785fde3bd8e18ee1c8365d77a718008bc"
-  integrity sha512-qrUVlFQivA9G3zRZho/fZ33RZl7pOOz2ITYgf7ly0sV2mdJA2Sy4966c9n9RuOzKADdg65mwV9zlFTsNVRVt4w==
+jest-puppeteer@5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/jest-puppeteer/-/jest-puppeteer-5.0.3.tgz#f34f91637b42dcf2407f80d18ad4598acc4c6be4"
+  integrity sha512-H432LFp1YlyLr4XIPSWp2xCupNMkgZwp9L5gIbIliwM5cyboronWYjwKb9mfE8ipfzz755MitEWqtw807fXEow==
   dependencies:
-    expect-puppeteer "^5.0.0"
-    jest-environment-puppeteer "^5.0.1"
+    expect-puppeteer "^5.0.3"
+    jest-environment-puppeteer "^5.0.3"
 
 jest-regex-util@^26.0.0:
   version "26.0.0"

From f482bb1d7f04289d300c091164f8589e043e1ada Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 11:53:36 +0000
Subject: [PATCH 274/288] build(deps-dev): bump @babel/core from 7.13.16 to
 7.14.0 (#3683)

---
 package.json |  2 +-
 yarn.lock    | 93 +++++++++++++++++++++++++++-------------------------
 2 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/package.json b/package.json
index be4311ee3093..9419540b2d71 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "unist-util-visit": "2.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.16",
+    "@babel/core": "^7.14.0",
     "@mdn/dinocons": "^0.3.1",
     "@mdn/minimalist": "^0.8.1",
     "@storybook/addon-a11y": "^6.2.9",
diff --git a/yarn.lock b/yarn.lock
index 1cc8a4cdd1ef..b1e511d4f6ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -70,20 +70,20 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.16.tgz#7756ab24396cc9675f1c3fcd5b79fcce192ea96a"
-  integrity sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q==
+"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.14.0", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz#47299ff3ec8d111b493f1a9d04bf88c04e728d88"
+  integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.16"
+    "@babel/generator" "^7.14.0"
     "@babel/helper-compilation-targets" "^7.13.16"
-    "@babel/helper-module-transforms" "^7.13.14"
-    "@babel/helpers" "^7.13.16"
-    "@babel/parser" "^7.13.16"
+    "@babel/helper-module-transforms" "^7.14.0"
+    "@babel/helpers" "^7.14.0"
+    "@babel/parser" "^7.14.0"
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.15"
-    "@babel/types" "^7.13.16"
+    "@babel/traverse" "^7.14.0"
+    "@babel/types" "^7.14.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -91,12 +91,12 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.1", "@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.13.16":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14"
-  integrity sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==
+"@babel/generator@^7.12.1", "@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.0.tgz#0f35d663506c43e4f10898fbda0d752ec75494be"
+  integrity sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg==
   dependencies:
-    "@babel/types" "^7.13.16"
+    "@babel/types" "^7.14.0"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
@@ -352,19 +352,19 @@
   dependencies:
     "@babel/types" "^7.13.12"
 
-"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.13.14":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
-  integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz#8fcf78be220156f22633ee204ea81f73f826a8ad"
+  integrity sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==
   dependencies:
     "@babel/helper-module-imports" "^7.13.12"
     "@babel/helper-replace-supers" "^7.13.12"
     "@babel/helper-simple-access" "^7.13.12"
     "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.14.0"
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.13"
-    "@babel/types" "^7.13.14"
+    "@babel/traverse" "^7.14.0"
+    "@babel/types" "^7.14.0"
 
 "@babel/helper-optimise-call-expression@^7.10.4":
   version "7.10.4"
@@ -485,6 +485,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
   integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
 
+"@babel/helper-validator-identifier@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
+  integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
+
 "@babel/helper-validator-option@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
@@ -515,14 +520,14 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.0"
 
-"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.5", "@babel/helpers@^7.13.16":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.17.tgz#b497c7a00e9719d5b613b8982bda6ed3ee94caf6"
-  integrity sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg==
+"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.5", "@babel/helpers@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"
+  integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==
   dependencies:
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.17"
-    "@babel/types" "^7.13.17"
+    "@babel/traverse" "^7.14.0"
+    "@babel/types" "^7.14.0"
 
 "@babel/highlight@^7.10.4":
   version "7.10.4"
@@ -542,10 +547,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7", "@babel/parser@^7.13.16", "@babel/parser@^7.7.0":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"
-  integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.12.7", "@babel/parser@^7.14.0", "@babel/parser@^7.7.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz#2f0ebfed92bcddcc8395b91f1895191ce2760380"
+  integrity sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q==
 
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
   version "7.13.12"
@@ -1981,26 +1986,26 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.13.17", "@babel/traverse@^7.7.0":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3"
-  integrity sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.7.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz#cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef"
+  integrity sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.16"
+    "@babel/generator" "^7.14.0"
     "@babel/helper-function-name" "^7.12.13"
     "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.16"
-    "@babel/types" "^7.13.17"
+    "@babel/parser" "^7.14.0"
+    "@babel/types" "^7.14.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.13.16", "@babel/types@^7.13.17", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
-  integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.14.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.0.tgz#3fc3fc74e0cdad878182e5f66cc6bcab1915a802"
+  integrity sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.14.0"
     to-fast-properties "^2.0.0"
 
 "@base2/pretty-print-object@1.0.0":

From 84d67cdd244b20e2d9bf91029ba5c85ac84692a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 12:23:32 +0000
Subject: [PATCH 275/288] build(deps-dev): bump black in /testing/integration
 (#3666)

---
 testing/integration/poetry.lock    | 8 ++++----
 testing/integration/pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testing/integration/poetry.lock b/testing/integration/poetry.lock
index b026f306c94e..afdcad11e7fc 100644
--- a/testing/integration/poetry.lock
+++ b/testing/integration/poetry.lock
@@ -30,7 +30,7 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>
 
 [[package]]
 name = "black"
-version = "21.4b1"
+version = "21.4b2"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -383,7 +383,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "00806ccbfb6c74f4e9e31f54032e61637cabd646ec2a7db967581ce15943b9e1"
+content-hash = "383a658c92ee1169cdb7df0980e35f06a179f5623519f6268eeb431f6013bc6d"
 
 [metadata.files]
 appdirs = [
@@ -399,8 +399,8 @@ attrs = [
     {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"},
 ]
 black = [
-    {file = "black-21.4b1-py3-none-any.whl", hash = "sha256:c9601dc863779db2fb1bf18b345bbfa2bb868463123cde6a7eff44b59e4ef739"},
-    {file = "black-21.4b1.tar.gz", hash = "sha256:20d326de75d13be6290925a95c94a9f368aca2f71cb7b753a938a5ae20f34a37"},
+    {file = "black-21.4b2-py3-none-any.whl", hash = "sha256:bff7067d8bc25eb21dcfdbc8c72f2baafd9ec6de4663241a52fb904b304d391f"},
+    {file = "black-21.4b2.tar.gz", hash = "sha256:fc9bcf3b482b05c1f35f6a882c079dc01b9c7795827532f4cc43c0ec88067bbc"},
 ]
 braceexpand = [
     {file = "braceexpand-0.1.6-py2.py3-none-any.whl", hash = "sha256:c37571ad130213247fac9921f3fd1032c81057490b9ca29be6884fd6d9dc1013"},
diff --git a/testing/integration/pyproject.toml b/testing/integration/pyproject.toml
index 4d725c91991a..a95bb81db185 100644
--- a/testing/integration/pyproject.toml
+++ b/testing/integration/pyproject.toml
@@ -17,7 +17,7 @@ pyquery = "^1.4.3"
 braceexpand = "^0.1.6"
 
 [tool.poetry.dev-dependencies]
-black = "^21.4b1"
+black = "^21.4b2"
 flake8 = "^3.9.1"
 
 [build-system]

From 8a04999efda300733ec8913b44dc85f0501f7b12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 12:27:35 +0000
Subject: [PATCH 276/288] build(deps-dev): bump black from 21.4b0 to 21.4b2 in
 /deployer (#3668)

---
 deployer/poetry.lock    | 10 +++++-----
 deployer/pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployer/poetry.lock b/deployer/poetry.lock
index 83672aae3211..a31a39af245d 100644
--- a/deployer/poetry.lock
+++ b/deployer/poetry.lock
@@ -30,7 +30,7 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>
 
 [[package]]
 name = "black"
-version = "21.4b0"
+version = "21.4b2"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -40,7 +40,7 @@ python-versions = ">=3.6.2"
 appdirs = "*"
 click = ">=7.1.2"
 mypy-extensions = ">=0.4.3"
-pathspec = ">=0.6,<1"
+pathspec = ">=0.8.1,<1"
 regex = ">=2020.1.8"
 toml = ">=0.10.1"
 typed-ast = {version = ">=1.4.2", markers = "python_version < \"3.8\""}
@@ -555,7 +555,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "3785f2786a67bb2c45bc5c2a78f2a975a2ccf621e65191a4df36d6a49557c1fe"
+content-hash = "b08996cf469bbde3c984ad93903bc6983304442a36853f36114e741e6bd32b61"
 
 [metadata.files]
 appdirs = [
@@ -571,8 +571,8 @@ attrs = [
     {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"},
 ]
 black = [
-    {file = "black-21.4b0-py3-none-any.whl", hash = "sha256:2db7040bbbbaa46247bfcc05c6efdebd7ebe50c1c3ca745ca6e0f6776438c96c"},
-    {file = "black-21.4b0.tar.gz", hash = "sha256:915d916c48646dbe8040d5265cff7111421a60a3dfe7f7e07273176a57c24a34"},
+    {file = "black-21.4b2-py3-none-any.whl", hash = "sha256:bff7067d8bc25eb21dcfdbc8c72f2baafd9ec6de4663241a52fb904b304d391f"},
+    {file = "black-21.4b2.tar.gz", hash = "sha256:fc9bcf3b482b05c1f35f6a882c079dc01b9c7795827532f4cc43c0ec88067bbc"},
 ]
 boto3 = [
     {file = "boto3-1.17.62-py2.py3-none-any.whl", hash = "sha256:da1b2c884dbf56cc3ece07940a7b654f41a93b9fc40ee1ed21a76da25a05989c"},
diff --git a/deployer/pyproject.toml b/deployer/pyproject.toml
index 279791dd8acd..a3b95fa930f2 100644
--- a/deployer/pyproject.toml
+++ b/deployer/pyproject.toml
@@ -18,7 +18,7 @@ selectolax = "^0.2.11"
 PyGithub = "^1.55"
 
 [tool.poetry.dev-dependencies]
-black = "^21.4b0"
+black = "^21.4b2"
 flake8 = "^3.9.1"
 pytest = "^6.2.3"
 

From e134e72ddc19c5ca91b1dda42f3c30f7f3d61f58 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 3 May 2021 08:34:12 -0400
Subject: [PATCH 277/288] More concurrent open npm PRs (#3685)

Because we reached the limit and it was causing a problem.
---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5107fa066339..54793e658861 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,7 +5,7 @@ updates:
     directory: "/"
     schedule:
       interval: daily
-    open-pull-requests-limit: 10
+    open-pull-requests-limit: 15
     ignore:
       # Need manual updates with "resolutions" in package.json
       # to property hoist versions from react-scripts

From 966f0ad847a9cbebc366997f58c13132cdb44bae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 12:34:31 +0000
Subject: [PATCH 278/288] build(deps-dev): bump jest-environment-jsdom-sixteen
 from 1.0.3 to 2.0.0 (#3615)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9419540b2d71..0eedc16c3001 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "html-validate": "4.10.1",
     "husky": "4.3.8",
     "ignore-loader": "^0.1.2",
-    "jest-environment-jsdom-sixteen": "^1.0.3",
+    "jest-environment-jsdom-sixteen": "^2.0.0",
     "jest-junit-reporter": "^1.1.0",
     "jest-puppeteer": "5.0.3",
     "jsdom": "^16.5.3",
diff --git a/yarn.lock b/yarn.lock
index b1e511d4f6ff..6541715615c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11993,10 +11993,10 @@ jest-each@^26.6.0, jest-each@^26.6.2:
     jest-util "^26.6.2"
     pretty-format "^26.6.2"
 
-jest-environment-jsdom-sixteen@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom-sixteen/-/jest-environment-jsdom-sixteen-1.0.3.tgz#e222228fac537ef15cca5ad470b19b47d9690165"
-  integrity sha512-CwMqDUUfSl808uGPWXlNA1UFkWFgRmhHvyAjhCmCry6mYq4b/nn80MMN7tglqo5XgrANIs/w+mzINPzbZ4ZZrQ==
+jest-environment-jsdom-sixteen@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom-sixteen/-/jest-environment-jsdom-sixteen-2.0.0.tgz#0f8c12663ccd9836d248574decffc575bfb091e1"
+  integrity sha512-BF+8P67aEJcd78TQzwSb9P4a73cArOWb5KgqI8eU6cHRWDIJdDRE8XTeZAmOuDSDhKpuEXjKkXwWB3GOJvqHJQ==
   dependencies:
     "@jest/fake-timers" "^25.1.0"
     jest-mock "^25.1.0"

From 01a91d8b8bec63226b181bc31929311b4127a047 Mon Sep 17 00:00:00 2001
From: Gregor <gregorwbr@gmail.com>
Date: Mon, 3 May 2021 14:35:22 +0200
Subject: [PATCH 279/288] build(deps-dev): bump & migrate husky to 6.0.0
 (#3681)

---
 .husky/.gitignore |  1 +
 .husky/pre-commit |  4 ++++
 package.json      | 10 +++-----
 yarn.lock         | 58 ++++-------------------------------------------
 4 files changed, 12 insertions(+), 61 deletions(-)
 create mode 100644 .husky/.gitignore
 create mode 100755 .husky/pre-commit

diff --git a/.husky/.gitignore b/.husky/.gitignore
new file mode 100644
index 000000000000..31354ec13899
--- /dev/null
+++ b/.husky/.gitignore
@@ -0,0 +1 @@
+_
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 000000000000..d3f8e31cb82d
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn pretty-quick --staged && yarn install --ignore-scripts
diff --git a/package.json b/package.json
index 0eedc16c3001..d16eece8956b 100644
--- a/package.json
+++ b/package.json
@@ -28,12 +28,8 @@
     "test:kumascript": "jest kumascript",
     "test:testing": "cd testing && jest",
     "tool": "node tool/cli.js",
-    "watch:ssr": "cd ssr && webpack --mode=production --watch"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "pretty-quick --staged && yarn install --ignore-scripts"
-    }
+    "watch:ssr": "cd ssr && webpack --mode=production --watch",
+    "prepare": "husky install"
   },
   "resolutions": {
     "@typescript-eslint/typescript-estree": ">=4.15.2",
@@ -135,7 +131,7 @@
     "fuzzysearch": "1.0.3",
     "history": "5.0.0",
     "html-validate": "4.10.1",
-    "husky": "4.3.8",
+    "husky": "^6.0.0",
     "ignore-loader": "^0.1.2",
     "jest-environment-jsdom-sixteen": "^2.0.0",
     "jest-junit-reporter": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 6541715615c8..5f66d12c3a0a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6767,11 +6767,6 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-compare-versions@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
-  integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
-
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -9424,13 +9419,6 @@ find-versions@^3.0.0:
   dependencies:
     semver-regex "^2.0.0"
 
-find-versions@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965"
-  integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==
-  dependencies:
-    semver-regex "^3.1.2"
-
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -10838,21 +10826,10 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-husky@4.3.8:
-  version "4.3.8"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d"
-  integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==
-  dependencies:
-    chalk "^4.0.0"
-    ci-info "^2.0.0"
-    compare-versions "^3.6.0"
-    cosmiconfig "^7.0.0"
-    find-versions "^4.0.0"
-    opencollective-postinstall "^2.0.2"
-    pkg-dir "^5.0.0"
-    please-upgrade-node "^3.2.0"
-    slash "^3.0.0"
-    which-pm-runs "^1.0.0"
+husky@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
+  integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==
 
 iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
@@ -14337,11 +14314,6 @@ open@^8.0.7:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-opencollective-postinstall@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
-  integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
-
 opn@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
@@ -14945,13 +14917,6 @@ platform@^1.3.3:
   resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
   integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
 
-please-upgrade-node@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
-  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
-  dependencies:
-    semver-compare "^1.0.0"
-
 pngquant-bin@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/pngquant-bin/-/pngquant-bin-6.0.0.tgz#aff0d7e61095feb96ced379ad8c7294ad3dd1712"
@@ -17384,11 +17349,6 @@ selfsigned@^1.10.8:
   dependencies:
     node-forge "^0.10.0"
 
-semver-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
-
 semver-diff@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
@@ -17401,11 +17361,6 @@ semver-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
   integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
 
-semver-regex@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807"
-  integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==
-
 semver-truncate@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-1.1.2.tgz#57f41de69707a62709a7e0104ba2117109ea47e8"
@@ -19970,11 +19925,6 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which-pm-runs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
-  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
-
 which-typed-array@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff"

From 40572063d53a4e3caac9f6b322f8520d52b8cd0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 12:47:34 +0000
Subject: [PATCH 280/288] build(deps-dev): bump puppeteer from 9.0.0 to 9.1.0
 (#3686)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d16eece8956b..f6e61798b551 100644
--- a/package.json
+++ b/package.json
@@ -143,7 +143,7 @@
     "prettier": "2.2.1",
     "prettier-plugin-packagejson": "^2.2.10",
     "pretty-quick": "3.1.0",
-    "puppeteer": "9.0.0",
+    "puppeteer": "9.1.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-is": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 5f66d12c3a0a..c6c92ce2248c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15964,10 +15964,10 @@ pupa@^2.0.1:
   dependencies:
     escape-goat "^2.0.0"
 
-puppeteer@9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-9.0.0.tgz#b476e17ceb3e33a6667bf682d66dde9898f9c031"
-  integrity sha512-Avu8SKWQRC1JKNMgfpH7d4KzzHOL/A65jRYrjNU46hxnOYGwqe4zZp/JW8qulaH0Pnbm5qyO3EbSKvqBUlfvkg==
+puppeteer@9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-9.1.0.tgz#0530ed1f595088eefd078c8f1f7618d00f216a56"
+  integrity sha512-+BWwEKYQ9oBTUcDYwfgnVPlHSEYqD4sXsMqQf70vSlTE6YIuXujc7zKgO3FyZNJYVrdrUppy/LLwGF1IRacQMQ==
   dependencies:
     debug "^4.1.0"
     devtools-protocol "0.0.869402"

From 5dae69d0367d7e839379df4b74ebf480c0797138 Mon Sep 17 00:00:00 2001
From: Gregor <gregorwbr@gmail.com>
Date: Mon, 3 May 2021 16:32:02 +0200
Subject: [PATCH 281/288] build(deps-dev): bump & migrate use-debounce to 6.0.0
 (#3684)

---
 client/src/document/forms/form.tsx | 2 +-
 package.json                       | 2 +-
 yarn.lock                          | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/src/document/forms/form.tsx b/client/src/document/forms/form.tsx
index 84c1c3ec2d78..5ca9f7b3c73b 100644
--- a/client/src/document/forms/form.tsx
+++ b/client/src/document/forms/form.tsx
@@ -71,7 +71,7 @@ export function DocumentForm({
     setAutoSaveEnabled(!autosaveEnabled);
   }
 
-  const { callback: debounceCallback } = useDebouncedCallback(onSave, 1000);
+  const debounceCallback = useDebouncedCallback(onSave, 1000);
 
   useEffect(() => {
     if (willAutosave) {
diff --git a/package.json b/package.json
index f6e61798b551..9b34cd50b398 100644
--- a/package.json
+++ b/package.json
@@ -163,7 +163,7 @@
     "swr": "^0.5.5",
     "ts-loader": "^8.1.0",
     "typescript": "^4.2.4",
-    "use-debounce": "^5.2.1",
+    "use-debounce": "^6.0.1",
     "webpack": "^4.44.2",
     "webpack-cli": "^4.6.0",
     "webpack-node-externals": "^3.0.0"
diff --git a/yarn.lock b/yarn.lock
index c6c92ce2248c..7936ed684b6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19397,10 +19397,10 @@ use-composed-ref@^1.0.0:
   dependencies:
     ts-essentials "^2.0.3"
 
-use-debounce@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/use-debounce/-/use-debounce-5.2.1.tgz#7366543c769f1de3e92104dee64de5c4dfddfd33"
-  integrity sha512-BQG5uEypYHd/ASF6imzYR8tJHh5qGn28oZG/5iVAbljV6MUrfyT4jzxA8co+L+WLCT1U8VBwzzvlb3CHmUDpEA==
+use-debounce@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/use-debounce/-/use-debounce-6.0.1.tgz#ed1eb2b30189408fb9792ea2887f4c6c3cb401a3"
+  integrity sha512-kpvIxpa0vOLz/2I2sfNJ72mUeaT2CMNCu5BT1f2HkV9qZK27UVSOFf1sSSu+wjJE4TcR2VTXS2SM569+m3TN7Q==
 
 use-isomorphic-layout-effect@^1.0.0:
   version "1.0.0"

From e19d75c4c073b8ccba861ff1f0664de684a4cf85 Mon Sep 17 00:00:00 2001
From: Florian Scholz <fscholz@mozilla.com>
Date: Mon, 3 May 2021 18:02:40 +0200
Subject: [PATCH 282/288] Add a Specifications macro and extract a special
 specification section to the Document (#3518)

* Prototype spec section from BCD spec_urls

* Address some feedback, mostly rename things

* Branch out building special sections in their own functions per Ryuno-Ki

* Add a KumaScript test

* Add extraction test

* Add browser-specs data; update tests; update renderer

* feedback on pr 3518

* Remove log calls, fix tests

* Rename SpecificationTable to SpecificationSection/Specifications

* Update browser-specs to latest

* Add specfications to makeTOC

* Move spec-section to ingredients

* Remove comment

Co-authored-by: Peter Bengtsson <mail@peterbe.com>
---
 build/document-extractor.js                   | 285 ++++++++++++------
 build/index.js                                |   3 +-
 client/src/document/index.tsx                 |   5 +
 .../src/document/ingredients/spec-section.tsx |  64 ++++
 kumascript/macros/Specifications.ejs          |  25 ++
 .../tests/macros/Specifications.test.js       |  24 ++
 package.json                                  |   1 +
 .../web/spec_section_extraction/index.html    |  20 ++
 testing/tests/index.test.js                   |  28 ++
 yarn.lock                                     |   5 +
 10 files changed, 365 insertions(+), 95 deletions(-)
 create mode 100644 client/src/document/ingredients/spec-section.tsx
 create mode 100644 kumascript/macros/Specifications.ejs
 create mode 100644 kumascript/tests/macros/Specifications.test.js
 create mode 100644 testing/content/files/en-us/web/spec_section_extraction/index.html

diff --git a/build/document-extractor.js b/build/document-extractor.js
index 91f8a1e477ca..06084aa704b6 100644
--- a/build/document-extractor.js
+++ b/build/document-extractor.js
@@ -1,5 +1,6 @@
 const cheerio = require("cheerio");
 const { packageBCD } = require("./resolve-bcd");
+const specs = require("browser-specs");
 
 /** Extract and mutate the $ if it as a "Quick_Links" section.
  * But only if it exists.
@@ -110,16 +111,28 @@ function extractSections($) {
  *        data: {....}
  *   }]
  *
- * At the time of writing (Jan 2020), there is only one single special type of
- * section and that's BCD. The idea is we look for a bunch of special sections
- * and if all else fails, just leave it as HTML as is.
+ * Another example is for the specification section. If the input is this:
+ *
+ *   <h2 id="Specifications">Specifications</h2>
+ *   <div class="bc-specs" data-bcd-query="foo.bar.thing">...</div>
+ *
+ * Then, extract the data-bcd-query and return this:
+ *
+ *   [{
+ *     type: "specifications",
+ *     value: {
+ *        query: "foo.bar.thing",
+ *        id: "specifications",
+ *        title: "Specifications",
+ *        specifications: {....}
+ *   }]
  */
 function addSections($) {
   const flaws = [];
 
-  const countPotentialBCDDataDivs = $.find("div.bc-data").length;
-  if (countPotentialBCDDataDivs) {
-    /** If there's exactly 1 BCD table the only section to add is something
+  const countPotentialSpecialDivs = $.find("div.bc-data, div.bc-specs").length;
+  if (countPotentialSpecialDivs) {
+    /** If there's exactly 1 special table the only section to add is something
      * like this:
      *    {
      *     "type": "browser_compatibility",
@@ -132,8 +145,8 @@ function addSections($) {
      *
      * Where the 'title' and 'id' values comes from the <h2> tag (if available).
      *
-     * However, if there are **multiple BCD tables**, which is rare, the it
-     * needs to return something like this:
+     * However, if there are **multiple special tables**,
+     * it needs to return something like this:
      *
      *   [{
      *     "type": "prose",
@@ -154,7 +167,7 @@ function addSections($) {
      *       "content": "Any other stuff before table maybe"
      *    },
      */
-    if (countPotentialBCDDataDivs > 1) {
+    if (countPotentialSpecialDivs > 1) {
       const subSections = [];
       const section = cheerio
         .load("<div></div>", {
@@ -163,19 +176,20 @@ function addSections($) {
         .eq(0);
 
       // Loop over each and every "root element" in the node and keep piling
-      // them up in a buffer, until you encounter a `div.bc-table` then
+      // them up in a buffer, until you encounter a `div.bc-data` or `div.bc-specs` then
       // add that to the stack, clear and repeat.
       const iterable = [...$[0].childNodes];
       let c = 0;
-      let countBCDDataDivsFound = 0;
+      let countSpecialDivsFound = 0;
       iterable.forEach((child) => {
         if (
           child.tagName === "div" &&
           child.attribs &&
           child.attribs.class &&
-          /bc-data/.test(child.attribs.class)
+          (child.attribs.class.includes("bc-data") ||
+            child.attribs.class.includes("bc-specs"))
         ) {
-          countBCDDataDivsFound++;
+          countSpecialDivsFound++;
           if (c) {
             const [proseSections, proseFlaws] = _addSectionProse(
               section.clone()
@@ -186,10 +200,10 @@ function addSections($) {
             c = 0; // reset the counter
           }
           section.append(child);
-          // XXX That `_addSingleSectionBCD(section.clone())` might return a
+          // XXX That `_addSingleSpecialSection(section.clone())` might return a
           // and empty array and that means it failed and we should
           // bail.
-          subSections.push(..._addSingleSectionBCD(section.clone()));
+          subSections.push(..._addSingleSpecialSection(section.clone()));
           section.empty();
         } else {
           section.append(child);
@@ -201,28 +215,29 @@ function addSections($) {
         subSections.push(...proseSections);
         flaws.push(...proseFlaws);
       }
-      if (countBCDDataDivsFound !== countPotentialBCDDataDivs) {
-        const leftoverCount = countPotentialBCDDataDivs - countBCDDataDivsFound;
-        const explanation = `${leftoverCount} 'div.bc-data' element${
+      if (countSpecialDivsFound !== countPotentialSpecialDivs) {
+        const leftoverCount = countPotentialSpecialDivs - countSpecialDivsFound;
+        const explanation = `${leftoverCount} 'div.bc-data' or 'div.bc-specs' element${
           leftoverCount > 1 ? "s" : ""
         } found but deeply nested.`;
         flaws.push(explanation);
       }
       return [subSections, flaws];
     }
-    const bcdSections = _addSingleSectionBCD($);
+    const specialSections = _addSingleSpecialSection($);
 
-    // The _addSingleSectionBCD() function will have sucked up the <h2> or <h3>
-    // and the `div.bc-data` to turn it into a BCD section.
+    // The _addSingleSpecialSection() function will have sucked up the <h2> or <h3>
+    // and the `div.bc-data` or `div.bc-specs` to turn it into a special section.
     // First remove that, then put whatever HTML is left as a prose
     // section underneath.
     $.find("div.bc-data, h2, h3").remove();
+    $.find("div.bc-specs, h2, h3").remove();
     const [proseSections, proseFlaws] = _addSectionProse($);
-    bcdSections.push(...proseSections);
+    specialSections.push(...proseSections);
     flaws.push(...proseFlaws);
 
-    if (bcdSections.length) {
-      return [bcdSections, flaws];
+    if (specialSections.length) {
+      return [specialSections, flaws];
     }
   }
 
@@ -233,7 +248,7 @@ function addSections($) {
   return [proseSections, flaws];
 }
 
-function _addSingleSectionBCD($) {
+function _addSingleSpecialSection($) {
   let id = null;
   let title = null;
   let isH3 = false;
@@ -251,7 +266,16 @@ function _addSingleSectionBCD($) {
     }
   }
 
-  const dataQuery = $.find("div.bc-data").attr("id");
+  let dataQuery = null;
+  let specialSectionType = null;
+  if ($.find("div.bc-data").length) {
+    specialSectionType = "browser_compatibility";
+    dataQuery = $.find("div.bc-data").attr("id");
+  } else if ($.find("div.bc-specs").length) {
+    specialSectionType = "specifications";
+    dataQuery = $.find("div.bc-specs").attr("data-bcd-query");
+  }
+
   // Some old legacy documents haven't been re-rendered yet, since it
   // was added, so the `div.bc-data` tag doesn't have a `id="bcd:..."`
   // attribute. If that's the case, bail and fail back on a regular
@@ -263,7 +287,103 @@ function _addSingleSectionBCD($) {
   }
   const query = dataQuery.replace(/^bcd:/, "");
   const { browsers, data } = packageBCD(query);
-  if (data === undefined) {
+
+  if (specialSectionType === "browser_compatibility") {
+    if (data === undefined) {
+      return [
+        {
+          type: specialSectionType,
+          value: {
+            title,
+            id,
+            isH3,
+            data: null,
+            query,
+            browsers: null,
+          },
+        },
+      ];
+    }
+    return _buildSpecialBCDSection();
+  } else if (specialSectionType === "specifications") {
+    if (data === undefined) {
+      return [
+        {
+          type: specialSectionType,
+          value: {
+            title,
+            id,
+            isH3,
+            query,
+            specifications: [],
+          },
+        },
+      ];
+    }
+    return _buildSpecialSpecSection();
+  }
+
+  throw new Error(`Unrecognized special section type '${specialSectionType}'`);
+
+  function _buildSpecialBCDSection() {
+    // First extract a map of all release data, keyed by (normalized) browser
+    // name and the versions.
+    // You'll have a map that looks like this:
+    //
+    //   'chrome_android': {
+    //      '28': {
+    //        release_data: '2012-06-01',
+    //        release_notes: '...',
+    //        ...
+    //
+    // The reason we extract this to a locally scoped map, is so we can
+    // use it to augment the `__compat` blocks for the latest version
+    // when (if known) it was added.
+    const browserReleaseData = new Map();
+    for (const [name, browser] of Object.entries(browsers)) {
+      const releaseData = new Map();
+      for (const [version, data] of Object.entries(browser.releases || [])) {
+        if (data) {
+          releaseData.set(version, data);
+        }
+      }
+      browserReleaseData.set(name, releaseData);
+    }
+
+    for (const [key, compat] of Object.entries(data)) {
+      let block;
+      if (key === "__compat") {
+        block = compat;
+      } else if (compat.__compat) {
+        block = compat.__compat;
+      }
+      if (block) {
+        for (let [browser, info] of Object.entries(block.support)) {
+          // `info` here will be one of the following:
+          //  - a single simple_support_statement:
+          //    { version_added: 42 }
+          //  - an array of simple_support_statements:
+          //    [ { version_added: 42 }, { prefix: '-moz', version_added: 35 } ]
+          //
+          // Standardize the first version to an array of one, so we don't have
+          // to deal with two different forms below
+          if (!Array.isArray(info)) {
+            info = [info];
+          }
+          for (const infoEntry of info) {
+            const added = infoEntry.version_added;
+            if (browserReleaseData.has(browser)) {
+              if (browserReleaseData.get(browser).has(added)) {
+                infoEntry.release_date = browserReleaseData
+                  .get(browser)
+                  .get(added).release_date;
+              }
+            }
+          }
+        }
+      }
+    }
+
     return [
       {
         type: "browser_compatibility",
@@ -271,85 +391,62 @@ function _addSingleSectionBCD($) {
           title,
           id,
           isH3,
-          data: null,
+          data,
           query,
-          browsers: null,
+          browsers,
         },
       },
     ];
   }
 
-  // First extract a map of all release data, keyed by (normalized) browser
-  // name and the versions.
-  // You'll have a map that looks like this:
-  //
-  //   'chrome_android': {
-  //      '28': {
-  //        release_data: '2012-06-01',
-  //        release_notes: '...',
-  //        ...
-  //
-  // The reason we extract this to a locally scoped map, is so we can
-  // use it to augment the `__compat` blocks for the latest version
-  // when (if known) it was added.
-  const browserReleaseData = new Map();
-  for (const [name, browser] of Object.entries(browsers)) {
-    const releaseData = new Map();
-    for (const [version, data] of Object.entries(browser.releases || [])) {
-      if (data) {
-        releaseData.set(version, data);
-      }
-    }
-    browserReleaseData.set(name, releaseData);
-  }
+  function _buildSpecialSpecSection() {
+    // Collect spec_urls from a BCD feature.
+    // Can either be a string or an array of strings.
+    let specURLs = [];
 
-  for (const [key, compat] of Object.entries(data)) {
-    let block;
-    if (key === "__compat") {
-      block = compat;
-    } else if (compat.__compat) {
-      block = compat.__compat;
-    }
-    if (block) {
-      for (let [browser, info] of Object.entries(block.support)) {
-        // `info` here will be one of the following:
-        //  - a single simple_support_statement:
-        //    { version_added: 42 }
-        //  - an array of simple_support_statements:
-        //    [ { version_added: 42 }, { prefix: '-moz', version_added: 35 } ]
-        //
-        // Standardize the first version to an array of one, so we don't have
-        // to deal with two different forms below
-        if (!Array.isArray(info)) {
-          info = [info];
-        }
-        for (const infoEntry of info) {
-          const added = infoEntry.version_added;
-          if (browserReleaseData.has(browser)) {
-            if (browserReleaseData.get(browser).has(added)) {
-              infoEntry.release_date = browserReleaseData
-                .get(browser)
-                .get(added).release_date;
-            }
-          }
+    for (const [key, compat] of Object.entries(data)) {
+      if (key === "__compat" && compat.spec_url) {
+        if (Array.isArray(compat.spec_url)) {
+          specURLs = compat.spec_url;
+        } else {
+          specURLs.push(compat.spec_url);
         }
       }
     }
-  }
 
-  return [
-    {
-      type: "browser_compatibility",
-      value: {
-        title,
-        id,
-        isH3,
-        data,
-        query,
-        browsers,
+    // Use BCD specURLs to look up more specification data
+    // from the browser-specs package
+    const specifications = specURLs
+      .map((specURL) => {
+        const spec = specs.find(
+          (spec) =>
+            specURL.startsWith(spec.url) || specURL.startsWith(spec.nightly.url)
+        );
+        if (spec) {
+          // We only want to return exactly the keys that we will use in the
+          // client code that renders this in React.
+          return {
+            bcdSpecificationURL: specURL,
+            title: spec.title,
+            shortTitle: spec.shortTitle,
+          };
+        }
+      })
+      .filter(Boolean);
+
+    return [
+      {
+        type: "specifications",
+        value: {
+          title,
+          id,
+          isH3,
+          specifications,
+          query,
+        },
       },
-    },
-  ];
+    ];
+  }
 }
 
 function _addSectionProse($) {
diff --git a/build/index.js b/build/index.js
index 41e328c6e375..fe6a2e6d36ac 100644
--- a/build/index.js
+++ b/build/index.js
@@ -212,7 +212,8 @@ function makeTOC(doc) {
     .map((section) => {
       if (
         (section.type === "prose" ||
-          section.type === "browser_compatibility") &&
+          section.type === "browser_compatibility" ||
+          section.type === "specifications") &&
         section.value.id &&
         section.value.title &&
         !section.value.isH3
diff --git a/client/src/document/index.tsx b/client/src/document/index.tsx
index cc955807cc7c..27ebb59a79a6 100644
--- a/client/src/document/index.tsx
+++ b/client/src/document/index.tsx
@@ -9,6 +9,7 @@ import { Doc } from "./types";
 // Ingredients
 import { Prose, ProseWithHeading } from "./ingredients/prose";
 import { LazyBrowserCompatibilityTable } from "./lazy-bcd-table";
+import { SpecificationSection } from "./ingredients/spec-section";
 
 // Misc
 // Sub-components
@@ -232,6 +233,10 @@ function RenderDocumentBody({ doc }) {
           {...section.value}
         />
       );
+    } else if (section.type === "specifications") {
+      return (
+        <SpecificationSection key={`specifications${i}`} {...section.value} />
+      );
     } else {
       console.warn(section);
       throw new Error(`No idea how to handle a '${section.type}' section`);
diff --git a/client/src/document/ingredients/spec-section.tsx b/client/src/document/ingredients/spec-section.tsx
new file mode 100644
index 000000000000..c1352568281d
--- /dev/null
+++ b/client/src/document/ingredients/spec-section.tsx
@@ -0,0 +1,64 @@
+import { DisplayH2, DisplayH3 } from "./utils";
+
+export function SpecificationSection({
+  id,
+  title,
+  isH3,
+  specifications,
+  query,
+}: {
+  id: string;
+  title: string;
+  isH3: boolean;
+  specifications: Array<{
+    title: string;
+    bcdSpecificationURL: string;
+    shortTitle: string;
+  }>;
+  query: string;
+}) {
+  return (
+    <>
+      {title && !isH3 && <DisplayH2 id={id} title={title} />}
+      {title && isH3 && <DisplayH3 id={id} title={title} />}
+
+      {specifications.length > 0 ? (
+        <table className="standard-table">
+          <thead>
+            <tr>
+              <th scope="col">Specification</th>
+            </tr>
+          </thead>
+          <tbody>
+            {specifications.map((spec) => (
+              <tr key={spec.bcdSpecificationURL}>
+                <td>
+                  <a href={spec.bcdSpecificationURL}>
+                    {spec.title} ({spec.shortTitle})
+                    <br />{" "}
+                    <small>#{spec.bcdSpecificationURL.split("#")[1]}</small>
+                  </a>
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      ) : (
+        <div className="notecard warning">
+          <h4>No specification found</h4>
+          <p>
+            No specification data found for <code>{query}</code>.<br />
+            <a href="#on-github">Check for problems with this page</a> or
+            contribute a missing <code>spec_url</code> to{" "}
+            <a href="https://github.com/mdn/browser-compat-data">
+              mdn/browser-compat-data
+            </a>
+            . Also make sure the specification is included in{" "}
+            <a href="https://github.com/w3c/browser-specs">w3c/browser-specs</a>
+            .
+          </p>
+        </div>
+      )}
+    </>
+  );
+}
diff --git a/kumascript/macros/Specifications.ejs b/kumascript/macros/Specifications.ejs
new file mode 100644
index 000000000000..149ae710502f
--- /dev/null
+++ b/kumascript/macros/Specifications.ejs
@@ -0,0 +1,25 @@
+<%
+/*
+Placeholder to render a specification section with spec_urls from BCD
+
+Parameters
+
+$0 – A query string indicating for which feature to retrieve specification URLs for.
+
+Example calls
+
+{{Specifications}}
+{{Specifications("html.element.abbr")}}
+
+*/
+
+var query = $0 || env['browser-compat'];
+if (!query) {
+  throw new Error("No first query argument or 'browser-compat' front-matter value passed");
+}
+var output = `<div class="bc-specs" data-bcd-query="${query}">
+  If you're able to see this, something went wrong on this page.
+</div>`;
+%>
+
+<%-output%>
diff --git a/kumascript/tests/macros/Specifications.test.js b/kumascript/tests/macros/Specifications.test.js
new file mode 100644
index 000000000000..ffff3ed11f6b
--- /dev/null
+++ b/kumascript/tests/macros/Specifications.test.js
@@ -0,0 +1,24 @@
+const { assert, itMacro, describeMacro, lintHTML } = require("./utils");
+
+const jsdom = require("jsdom");
+const { JSDOM } = jsdom;
+
+describeMacro("Specifications", function () {
+  itMacro("Outputs a simple div tag", async (macro) => {
+    const result = await macro.call("api.feature");
+    const dom = JSDOM.fragment(result);
+    assert.equal(
+      dom.querySelector("div.bc-specs").dataset.bcdQuery,
+      "api.feature"
+    );
+    assert.equal(
+      dom.querySelector("div.bc-specs").textContent.trim(),
+      "If you're able to see this, something went wrong on this page."
+    );
+  });
+
+  itMacro("Outputs valid HTML", async (macro) => {
+    const result = await macro.call("api.feature");
+    expect(lintHTML(result)).toBeFalsy();
+  });
+});
diff --git a/package.json b/package.json
index 9b34cd50b398..9db9fe0155c3 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "@fast-csv/parse": "4.3.6",
     "@mdn/browser-compat-data": "3.3.2",
     "accept-language-parser": "1.5.0",
+    "browser-specs": "^1.34.2",
     "chalk": "4.1.1",
     "cheerio": "1.0.0-rc.6",
     "cli-progress": "^3.9.0",
diff --git a/testing/content/files/en-us/web/spec_section_extraction/index.html b/testing/content/files/en-us/web/spec_section_extraction/index.html
new file mode 100644
index 000000000000..927474afb5ad
--- /dev/null
+++ b/testing/content/files/en-us/web/spec_section_extraction/index.html
@@ -0,0 +1,20 @@
+---
+title: Spec section extraction
+browser-compat: javascript.builtins.Array.toLocaleString
+slug: Web/Spec_Section_Extraction
+---
+
+<h2>Intro</h2>
+<p>Text in Intro</p>
+
+<h2 id="Specifications">Specifications</h2>
+
+<p>{{Specifications}}</p>
+
+<h2 id="Browser_compatibility">Browser compatibility</h2>
+
+<p>{{Compat}}</p>
+
+<h2 id="See_also">See also</h2>
+
+<p>More stuff</p>
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 15e653aa4576..3aac8309cb93 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -1056,6 +1056,34 @@ test("bcd table extraction followed by h3", () => {
   expect(doc.body[4].value.isH3).toBeTruthy();
 });
 
+test("specifications and bcd extraction", () => {
+  const builtFolder = path.join(
+    buildRoot,
+    "en-us",
+    "docs",
+    "web",
+    "spec_section_extraction"
+  );
+  expect(fs.existsSync(builtFolder)).toBeTruthy();
+  const jsonFile = path.join(builtFolder, "index.json");
+  const { doc } = JSON.parse(fs.readFileSync(jsonFile));
+  expect(doc.body[0].type).toBe("prose");
+  expect(doc.body[1].type).toBe("specifications");
+  expect(doc.body[1].value.specifications[0].shortTitle).toBe("ECMAScript");
+  expect(doc.body[1].value.specifications[0].bcdSpecificationURL).toBe(
+    "https://tc39.es/ecma262/#sec-array.prototype.tolocalestring"
+  );
+  expect(doc.body[1].value.specifications[1].shortTitle).toBe(
+    "ECMAScript Internationalization API"
+  );
+  expect(doc.body[1].value.specifications[1].bcdSpecificationURL).toBe(
+    "https://tc39.es/ecma402/#sup-array.prototype.tolocalestring"
+  );
+  expect(doc.body[2].type).toBe("prose");
+  expect(doc.body[3].type).toBe("browser_compatibility");
+  expect(doc.body[4].type).toBe("prose");
+});
+
 test("headers within non-root elements is a 'sectioning' flaw", () => {
   const builtFolder = path.join(
     buildRoot,
diff --git a/yarn.lock b/yarn.lock
index 7936ed684b6f..e8eb257a2564 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5864,6 +5864,11 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
+browser-specs@^1.34.2:
+  version "1.35.1"
+  resolved "https://registry.yarnpkg.com/browser-specs/-/browser-specs-1.35.1.tgz#01c77221940b5d733995248438e869ca5342cc9c"
+  integrity sha512-y9rMHjHa2kXUOBqovbRHCQAQhCJARiPQYluiO3PBoBl4Wa7f0ukE72+zDBN7+0oYzdRyWngZaUtl2rqCVdZ1Aw==
+
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"

From fd2660ca7bd5ae3bfc7b2c3cbb4d1ae2b8194f94 Mon Sep 17 00:00:00 2001
From: Leo Chen <a0952250818@gmail.com>
Date: Tue, 4 May 2021 01:03:59 +0800
Subject: [PATCH 283/288] update the translation of the zh-TW (#3663)

* update the translation of the zh-TW

* update the specific wording's translation
---
 kumascript/macros/LearnSidebar.ejs | 54 +++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/kumascript/macros/LearnSidebar.ejs b/kumascript/macros/LearnSidebar.ejs
index 80978b9b3476..5fcda6a16901 100644
--- a/kumascript/macros/LearnSidebar.ejs
+++ b/kumascript/macros/LearnSidebar.ejs
@@ -1307,15 +1307,20 @@ var text = mdn.localStringMap({
         'Adding_vector_graphics_to_the_Web': '為 Web 新增向量圖',
         'Responsive_images': '適應性圖片',
         'Assessment_Mozilla_splash_page': '親和度：Mozilla 形象頁面',
+      'HTML_tables' : 'HTML 表格',
+        'HTML_tables_overview' : 'HTML 表格概述',
+        'HTML_table_basics' : 'HTML表格基礎',
+        'HTML_table_advanced' : 'HTML Table advanced features and accessibility',
+        'Assessment_Structuring_planet_data' : 'Assessment: Structuring planet data',
     'CSS_styling_the_Web': 'CSS — 設計 Web 的風格',
-      'CSS_first_steps': 'CSS first steps',
-        'CSS_first_steps_overview': 'CSS first steps overview',
-        'What_is_CSS':  'What is CSS?',
-        'Getting_started_with_CSS': 'Getting started with CSS',
+      'CSS_first_steps': '初探 CSS',
+        'CSS_first_steps_overview': '初探 CSS（概述）',
+        'What_is_CSS':  'CSS 是什麼？',
+        'Getting_started_with_CSS': 'CSS 入門',
         'How_CSS_is_structured': 'How CSS is structured',
-        'How_CSS_works': 'How CSS works',
+        'How_CSS_works': 'CSS 怎麼運作',
         'Using_your_new_knowledge': 'Using your new knowledge',
-      'CSS_building_blocks': 'CSS building blocks',
+      'CSS_building_blocks': 'CSS 組件',
         'CSS_building_blocks_overview': 'CSS building blocks overview',
         'Cascade_and_inheritance': 'Cascade and inheritance',
         'CSS_selectors': 'CSS selectors',
@@ -1379,7 +1384,7 @@ var text = mdn.localStringMap({
         'Working_with_JSON_data' : '使用 JSON 資料',
         'Object_building_practice' : '物件建構實作',
         'Assessment_Adding_features_to_our_bouncing_balls_demo' : '親合度：為彈跳球展示新增功能',
-      'Asynchronous_JavaScript': 'Asynchronous JavaScript',
+      'Asynchronous_JavaScript': '非同步的 JavaScript',
         'Asynchronous_JavaScript_overview': 'Asynchronous JavaScript overview',
         'General_asynchronous_programming_concepts': 'General asynchronous programming concepts',
         'Introducing_asynchronous_JavaScript': 'Introducing asynchronous JavaScript',
@@ -1387,19 +1392,19 @@ var text = mdn.localStringMap({
         'Promises': 'Graceful asynchronous programming with Promises',
         'Async_await': 'Making asynchronous programming easier with async and await',
         'Choosing_the_right_approach': 'Choosing the right approach',
-      'Client-side_web_APIs': 'Client-side web APIs',
+      'Client-side_web_APIs': '客戶端 web APIs',
         'Client-side_web_APIs_Introduction': 'Introduction to web APIs',
-        'Client-side_web_APIs_Manipulating_documents': 'Manipulating documents',
+        'Client-side_web_APIs_Manipulating_documents': '文件操作',
         'Client-side_web_APIs_Fetching_data': 'Fetching data from the server',
         'Client-side_web_APIs_Third_party_APIs': 'Third party APIs',
         'Client-side_web_APIs_Drawing_graphics': 'Drawing graphics',
         'Client-side_web_APIs_Video_and_audio_APIs': 'Video and audio APIs',
         'Client-side_web_APIs_client-side_storage': 'Client-side storage',
-    'Web_forms' : 'Web forms — Working with user data',
-      'Web_forms_core' : 'Core forms learning pathway',
-        'Web_forms_overview' : 'Web forms overview',
+    'Web_forms' : '網頁表單-與使用者資料合作',
+      'Web_forms_core' : '核心的表單學習途徑',
+        'Web_forms_overview' : '網頁表單概述',
         'Your_first_form' : 'Your first form',
-        'How_to_structure_a_web_form' : 'How to structure a web form',
+        'How_to_structure_a_web_form' : '如何建構網頁表單',
         'Basic_native_form_controls' : 'Basic native form controls',
         'The_HTML5_input_types': 'The HTML5 input types',
         'Other_form_controls': 'Other form controls',
@@ -1408,10 +1413,21 @@ var text = mdn.localStringMap({
         'UI_pseudo-classes': 'UI pseudo-classes',
         'Client-side_form_validation' : 'Client-side form validation',
         'Sending_form_data' : 'Sending form data',
-      'Web_forms_advanced': 'Advanced forms articles',
+      'Web_forms_advanced': '深入網頁表單',
         'How_to_build_custom_form_controls' : 'How to build custom form controls',
         'Sending_forms_through_JavaScript' : 'Sending forms through JavaScript',
         'CSS_property_compatibility_table_for_form_controls' : 'CSS property compatibility table for form controls',
+    'Accessibility_—_Make_the_web_usable_by_everyone' : '無障礙網頁 — 每個人都可以使用的網頁',
+    'Accessibility_guides' : '無障礙網頁指南',
+    'Accessibility_assessment' : '無障礙網頁評估',
+      'Accessibility_overview' : '無障礙網頁概述',
+      'What_is_accessibility' : '何謂無障礙網頁？',
+      'HTML_a_good_basis_for_accessibility' : 'HTML: A good basis for accessibility',
+      'CSS_and_JavaScript_accessibility_best_practices' : 'CSS and JavaScript accessibility best practices',
+      'WAI-ARIA_basics' : 'WAI-ARIA 基礎',
+      'Accessible_multimedia' : 'Accessible multimedia',
+      'Mobile_accessibility' : '行動裝置上的無障礙',
+      'Assessment_Accessibility_troubleshooting' : 'Assessment: Accessibility troubleshooting',
     'Tools_and_testing' : '工具與測試',
       'Cross_browser_testing' : '跨瀏覽器測試',
         'Cross_browser_testing_overview' : '跨瀏覽器測試概述',
@@ -1424,7 +1440,7 @@ var text = mdn.localStringMap({
         'Introduction_to_automated_testing' : '自動化測試介紹',
         'Setting_up_your_own_test_automation_environment' : '設定自己的自動化測試環境',
       'Git_and_GitHub' : 'Git and GitHub',
-        'Git_and_GitHub_overview' : 'Git and GitHub overview',
+        'Git_and_GitHub_overview' : 'Git and GitHub 概述',
       'Client-side_web_development_tools' : 'Client-side web development tools',
         'Client-side_web_development_tools_index' : 'Client-side web development tools index',
         'Client-side_tooling_overview' : 'Client-side tooling overview',
@@ -1432,8 +1448,8 @@ var text = mdn.localStringMap({
         'Package_management_basics' : 'Package management basics',
         'Introducing_a_complete_toolchain' : 'Introducing a complete toolchain',
         'Deploying_our_app' : 'Deploying our app',
-      'Introduction_to_client-side_frameworks': 'Introduction to client-side frameworks',
-        'Client-side_frameworks_overview': 'Client-side frameworks overview',
+      'Introduction_to_client-side_frameworks': '介紹前端框架',
+        'Client-side_frameworks_overview': '前端框架簡介',
         'Framework_main_features': 'Framework main features',
       'React': 'React',
         'Getting_started_with_React': 'Getting started with React',
@@ -1451,7 +1467,7 @@ var text = mdn.localStringMap({
         'Routing_in_Ember': 'Routing in Ember',
         'Ember_resources_and_troubleshooting': 'Ember resources and troubleshooting',
       'Vue': 'Vue',
-        'Getting_started_with_Vue': 'Getting started with Vue',
+        'Getting_started_with_Vue': '開始學 Vue',
         'Creating_our_first_Vue_component': 'Creating our first Vue component',
         'Rendering_a_list_of_Vue_components': 'Rendering a list of Vue components',
         'Adding_a_new_todo_form:_Vue_events_methods_and_models': 'Adding a new todo form: Vue events, methods, and models',
@@ -1461,7 +1477,7 @@ var text = mdn.localStringMap({
         'Focus_management_with_Vue_refs': 'Focus management with Vue refs',
         'Vue_resources': 'Vue resources',
       'Svelte': 'Svelte',
-        'Getting_started_with_Svelte': 'Getting started with Svelte',
+        'Getting_started_with_Svelte': 'Svelte 入門',
         'Starting_our_Svelte_Todo_list_app': 'Starting our Svelte Todo list app',
         'Dynamic_behavior_in_Svelte:_working_with_variables_and_props': 'Dynamic behavior in Svelte: working with variables and props',
         'Componentizing_our_Svelte_app': 'Componentizing our Svelte app',

From cc569cbfe9240c087c032757e8478a6941cf8f7c Mon Sep 17 00:00:00 2001
From: Leo Chen <a0952250818@gmail.com>
Date: Tue, 4 May 2021 01:04:43 +0800
Subject: [PATCH 284/288] add the lost part and update the translation for
 Express (#3664)

* add the lost part and update the translation for Express

* update the translations to make more fluency
---
 kumascript/macros/LearnSidebar.ejs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/kumascript/macros/LearnSidebar.ejs b/kumascript/macros/LearnSidebar.ejs
index 5fcda6a16901..bbdd9cf3c695 100644
--- a/kumascript/macros/LearnSidebar.ejs
+++ b/kumascript/macros/LearnSidebar.ejs
@@ -1516,6 +1516,17 @@ var text = mdn.localStringMap({
         'Tutorial_Part_11_Deploying_Django_to_production' : '線上教學 11：佈署 Django 至產品',
         'Web_application_security' : 'Web App 安全性',
         'Assessment_DIY_mini_blog' : '親合度：DIY 迷你部落格',
+      'Express_Web_Framework_(Node.js_JavaScript)' : 'Express 網站框架 (node.js/JavaScript)',
+        'Express_Web_Framework_(Node.js_JavaScript)_overview' : 'Express 網站框架 (Node.js/JavaScript) 概述',
+        'Express_Node_introduction' : 'Express/Node 介紹',
+        'Setting_up_a_Node_(Express)_development_environment' : '設定 Node (Express) 的開發環境',
+        'Express_Tutorial_The_Local_Library_website' : 'Express 教學 1: 本地圖書館網站',
+        'Express_Tutorial_Part_2_Creating_a_skeleton_website' : 'Express 教學 2: 建立骨架網站',
+        'Express_Tutorial_Part_3_Using_a_database_(with_Mongoose)' : 'Express 教學 3: 使用資料庫 (Mongoose)',
+        'Express_Tutorial_Part_4_Routes_and_controllers' : 'Express 教學 4: 路由與控制器',
+        'Express_Tutorial_Part_5_Displaying_library_data' : 'Express 教程 5: 呈現圖書館的資料',
+        'Express_Tutorial_Part_6_Working_with_forms' : 'Express 教學 6: 使用表單',
+        'Express_Tutorial_Part_7_Deploying_to_production' : 'Express 教學 7: 佈署到正式環境',
     'Further_resources': '更多資源',
     'Common_questions': '常見問題',
       'HTML_questions': 'HTML 問題',

From 4743ee3e716b2fa7fe87e6c0212a0d37d662613d Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Mon, 3 May 2021 15:09:40 -0400
Subject: [PATCH 285/288] not all http:// links can be https:// (#3657)

Fixes #3654
---
 build/flaws/broken-links.js            |  45 ++-
 build/flaws/safe-to-https-domains.json | 505 +++++++++++++++++++++++++
 testing/tests/index.test.js            |   2 +-
 3 files changed, 544 insertions(+), 8 deletions(-)
 create mode 100644 build/flaws/safe-to-https-domains.json

diff --git a/build/flaws/broken-links.js b/build/flaws/broken-links.js
index b8056c8a12d8..afba6fd70c3b 100644
--- a/build/flaws/broken-links.js
+++ b/build/flaws/broken-links.js
@@ -1,8 +1,27 @@
+const fs = require("fs");
+const path = require("path");
+
 const { Archive, Document, Redirect, Image } = require("../../content");
 const { FLAW_LEVELS } = require("../constants");
 const { findMatchesInText } = require("../matches-in-text");
 const { DEFAULT_LOCALE, VALID_LOCALES } = require("../../libs/constants");
 
+const _safeToHttpsDomains = new Map();
+function getSafeToHttpDomains() {
+  if (!_safeToHttpsDomains.size) {
+    const fileParsed = JSON.parse(
+      fs.readFileSync(
+        path.join(__dirname, "safe-to-https-domains.json"),
+        "utf-8"
+      )
+    );
+    Object.entries(fileParsed).forEach(([key, value]) =>
+      _safeToHttpsDomains.set(key, value)
+    );
+  }
+  return _safeToHttpsDomains;
+}
+
 function isHomepageURL(url) {
   // Return true if the URL is something like `/` or `/en-US` or `/fr/`
   if (url === "/") {
@@ -131,13 +150,25 @@ function getBrokenLinksFlaws(doc, $, { rawContent }, level) {
     }
 
     if (href.startsWith("http://")) {
-      addBrokenLink(
-        a,
-        checked.get(href),
-        href,
-        href.replace("http://", "https://"),
-        "http:// external links are not allowed (will be forced to https:// at build-time)"
-      );
+      const domain = new URL(href).hostname;
+      // If a URL's domain is in the list that getSafeToHttpDomains() provides,
+      // that means we've tested that you can turn that into a HTTPS link
+      // simply by replacing the `http://` for `https://`.
+      // Using `.get(domain)` is smart because if the domain isn't known you
+      // get `undefined` otherwise you get `true` or `false`. And we're only
+      // interested in the `true`.
+      if (getSafeToHttpDomains().get(domain)) {
+        addBrokenLink(
+          a,
+          checked.get(href),
+          href,
+          href.replace("http://", "https://"),
+          "Is currently http:// but can become https://"
+        );
+      }
+      // Note! If it's not known that the URL's domain can be turned into https://
+      // we do nothing here. No flaw. It's unfortunate that we still have http://
+      // links in our content but that's a reality of MDN being 15+ years old.
     } else if (href.startsWith("https://developer.mozilla.org/")) {
       // It might be a working 200 OK link but the link just shouldn't
       // have the full absolute URL part in it.
diff --git a/build/flaws/safe-to-https-domains.json b/build/flaws/safe-to-https-domains.json
new file mode 100644
index 000000000000..795840f82061
--- /dev/null
+++ b/build/flaws/safe-to-https-domains.json
@@ -0,0 +1,505 @@
+{
+  "www.mozilla.org": true,
+  "groups.google.com": true,
+  "schepers.cc": false,
+  "stackoverflow.com": true,
+  "ecma-international.org": true,
+  "www.sencha.com": true,
+  "schema.org": true,
+  "scrawl.rikweb.org.uk": true,
+  "unicode.org": true,
+  "gpac.wp.mines-telecom.fr": true,
+  "www.csstutorial.net": true,
+  "docs.oracle.com": true,
+  "example.com": true,
+  "asmjs.org": false,
+  "www.iana.org": true,
+  "pouchdb.com": true,
+  "www.youtube.com": true,
+  "hsivonen.iki.fi": true,
+  "webkit.org": true,
+  "easings.net": true,
+  "www.videojs.com": true,
+  "2017.js13kgames.com": true,
+  "www.w3.org": true,
+  "www.double.co.nz": false,
+  "mdn.beonex.com": true,
+  "html5doctor.com": true,
+  "blog.danielfriesen.name": true,
+  "www.quirksmode.org": true,
+  "0xfe.blogspot.com": true,
+  "www-archive.mozilla.org": true,
+  "zimjs.com": true,
+  "bugzilla.mozilla.org": true,
+  "aurelio.audero.it": true,
+  "www.exslt.org": false,
+  "diveintohtml5.info": false,
+  "reference.sitepoint.com": true,
+  "brucelindbloom.com": false,
+  "web.archive.org": true,
+  "hacks.mozilla.org": true,
+  "dlmf.nist.gov": true,
+  "tokenposts.blogspot.com.au": true,
+  "videogamejournaliser.com": false,
+  "meta.wikimedia.org": true,
+  "glmatrix.net": true,
+  "www.inkscape.org": true,
+  "www.inftyreader.org": true,
+  "www.ietf.org": true,
+  "selectivizr.com": false,
+  "en.wikiversity.org": true,
+  "www.bbc.co.uk": true,
+  "cve.mitre.org": true,
+  "searchfox.org": true,
+  "whereswalden.com": true,
+  "updates.html5rocks.com": false,
+  "www.croczilla.com": false,
+  "gridbyexample.com": true,
+  "zenphoton.com": true,
+  "lbsyun.baidu.com": true,
+  "www.khronos.org": true,
+  "jsconsole.com": true,
+  "dev-test.nemikor.com": false,
+  "www.mergevr.com": true,
+  "www.html5rocks.com": true,
+  "www.ecma-international.org": true,
+  "wiki.codetalks.org": false,
+  "dbaron.org": true,
+  "accessfirefox.com": false,
+  "jwatt.org": true,
+  "www.fontsquirrel.com": true,
+  "paulirish.com": true,
+  "pubs.opengroup.org": true,
+  "dmitrysoshnikov.com": false,
+  "www.isg.rhul.ac.uk": true,
+  "www.smartjava.org": true,
+  "fitzgeraldnick.com": true,
+  "www.colorzilla.com": true,
+  "msopentech.com": false,
+  "www.flumotion.net": false,
+  "wiki.csswg.org": true,
+  "ffmpeg.org": true,
+  "nginx-rtmp.blogspot.it": true,
+  "trac.webkit.org": true,
+  "openid.net": true,
+  "www.brendangregg.com": false,
+  "qnimate.com": false,
+  "lists.w3.org": true,
+  "www.chromium.org": true,
+  "greensock.com": true,
+  "datatracker.ietf.org": true,
+  "firefogg.org": false,
+  "wiki.svg.org": false,
+  "houdini.glitch.me": true,
+  "svg-whiz.com": false,
+  "www.mattgreer.org": true,
+  "jointjs.com": true,
+  "www.wirfs-brock.com": false,
+  "tomrothe.de": true,
+  "raphaeljs.com": true,
+  "gva.noekeon.org": false,
+  "www1.chapman.edu": false,
+  "lawrencemandel.com": true,
+  "timepicker.co": true,
+  "razvancaliman.com": false,
+  "css-tricks.com": true,
+  "webvr.directory": true,
+  "sandbox.photonstorm.com": false,
+  "yuiblog.com": false,
+  "floating-point-gui.de": true,
+  "math.etsu.edu": true,
+  "toolbar.netcraft.com": true,
+  "dev.opera.com": true,
+  "www.bebits.com": false,
+  "www.websiteoptimization.com": false,
+  "windows.microsoft.com": true,
+  "mobile.smashingmagazine.com": true,
+  "www.faqs.org": false,
+  "usabilitypost.com": true,
+  "www.go-oo.org": false,
+  "dev.w3.org": true,
+  "www.404notfound.fr": false,
+  "googledevelopers.blogspot.ca": true,
+  "www.useit.com": false,
+  "dsheiko.com": true,
+  "eloquentjavascript.net": true,
+  "paperjs.org": false,
+  "forum.komodoide.com": false,
+  "unicode-table.com": true,
+  "jinja.pocoo.org": false,
+  "www.zvon.org": false,
+  "mdn.github.io": true,
+  "jquery.com": true,
+  "webauthndemo.appspot.com": true,
+  "csrc.nist.gov": true,
+  "httpd.apache.org": true,
+  "tinyurl.com": true,
+  "bikeshed.com": true,
+  "www.xml.com": true,
+  "feature-policy-demos.appspot.com": true,
+  "uxdesign.com": false,
+  "addons.mozilla.org": true,
+  "www.opera.com": true,
+  "jPlayer.org": true,
+  "maps.google.com": true,
+  "www.blender.org": true,
+  "www.samsung.com": true,
+  "es6console.com": true,
+  "www.objectplayground.com": false,
+  "developer.apple.com": true,
+  "www.voiceage.com": false,
+  "www.opensearch.org": true,
+  "rajudasa.blogspot.in": true,
+  "cedato.com": true,
+  "api.jquery.com": true,
+  "www.paulirish.com": true,
+  "golem.ph.utexas.edu": true,
+  "lesscss.org": true,
+  "www.nvda-project.org": false,
+  "www.rfc-editor.org": true,
+  "www.csszengarden.com": false,
+  "lachy.id.au": true,
+  "www.createjs.com": true,
+  "java.sun.com": true,
+  "www.codedread.com": true,
+  "docs.phaser.io": false,
+  "www.stevesouders.com": true,
+  "ogp.me": true,
+  "gyu.que.jp": false,
+  "ckeditor.com": true,
+  "www.alistapart.com": true,
+  "www.aptana.com": false,
+  "ted.mielczarek.org": true,
+  "www.upu.int": true,
+  "blog.mozilla.com": true,
+  "ftp.mozilla.org": true,
+  "blog.agektmr.com": true,
+  "docs.google.com": true,
+  "www.dogtagpki.org": true,
+  "www.pitivi.org": false,
+  "developer.android.com": true,
+  "offlinefirst.org": false,
+  "www.dexie.org": true,
+  "perfectionkills.com": false,
+  "sublimevideo.net": true,
+  "www.the-pope.com": false,
+  "support.mozillamessaging.com": true,
+  "mathworld.wolfram.com": true,
+  "support.mozilla.com": true,
+  "msdn2.microsoft.com": true,
+  "gogogadgetscott.info": false,
+  "wiki.c2.com": true,
+  "wiki.mozilla.org": true,
+  "blog.chromium.org": true,
+  "web.mit.edu": true,
+  "cssgridgarden.com": true,
+  "www.base64-image.de": true,
+  "mediaelementjs.com": false,
+  "webaim.org": true,
+  "bugs.firefox-dev.tools": true,
+  "tracker.com": false,
+  "www.currency-iso.org": true,
+  "www.jwplayer.com": true,
+  "www.ctan.org": true,
+  "gstreamer.freedesktop.org": true,
+  "adrianroselli.com": true,
+  "developer.yahoo.com": true,
+  "www.songho.ca": true,
+  "bugzil.la": true,
+  "threejs.org": true,
+  "jibbering.com": true,
+  "accessibleajax.clcworld.net": false,
+  "support.apple.com": true,
+  "www.lutanho.net": false,
+  "www.typescriptlang.org": true,
+  "fontsgeek.com": true,
+  "accessify.com": true,
+  "developers.whatwg.org": true,
+  "code.google.com": true,
+  "alistapart.com": true,
+  "www.bluegriffon.com": false,
+  "www.sublimevideo.net": true,
+  "babeljs.io": true,
+  "www.cnet.com": true,
+  "plurib.us": true,
+  "svg-wow.org": false,
+  "www.commonjs.org": false,
+  "demo.huihoo.com": true,
+  "www.unicode.org": true,
+  "stuff.mit.edu": true,
+  "ready.to": true,
+  "www.html5accessibility.com": true,
+  "crbug.com": true,
+  "felixniklas.com": true,
+  "www.squarefree.com": true,
+  "simpl.info": true,
+  "www.apple.com": true,
+  "chromium.googlecode.com": true,
+  "www.dyn4j.org": true,
+  "skillsmatter.com": true,
+  "www.glge.org": false,
+  "creativecommons.org": true,
+  "dashif.org": true,
+  "dvcs.w3.org": true,
+  "mathscribe.com": true,
+  "tripleodeon.com": true,
+  "thejit.org": true,
+  "www.adobe.com": true,
+  "peter.sh": true,
+  "www.jenitennison.com": true,
+  "net.tutsplus.com": true,
+  "speak-demo.herokuapp.com": true,
+  "uk.video.yahoo.com": true,
+  "clang.llvm.org": true,
+  "pieisgood.org": true,
+  "requirejs.org": true,
+  "hyperaud.io": true,
+  "www.pixijs.com": true,
+  "openfontlibrary.org": true,
+  "www.peachpit.com": true,
+  "www.cs.tut.fi": true,
+  "codepen.io": true,
+  "lbs.qq.com": true,
+  "www.brettjankord.com": true,
+  "eilv.cie.co.at": false,
+  "nchc.dl.sourceforge.net": true,
+  "audiocogs.org": false,
+  "download.smedley.info": false,
+  "webglfundamentals.org": true,
+  "www.yoctopuce.com": true,
+  "www.bbc.com": true,
+  "www.softwareishard.com": false,
+  "davidwalsh.name": true,
+  "pixelscommander.com": false,
+  "www.seamonkey-project.org": true,
+  "www-106.ibm.com": true,
+  "learningbabylonjs.com": false,
+  "htmldog.com": true,
+  "standardista.com": false,
+  "www.yappy.it": false,
+  "www.cablelabs.com": true,
+  "mathcs.chapman.edu": true,
+  "www.whatwg.org": true,
+  "www.openoffice.org": true,
+  "www.mirovideoconverter.com": false,
+  "www.2ality.com": true,
+  "www.nongnu.org": true,
+  "socketcluster.io": true,
+  "innolitics.com": true,
+  "mp4ra.org": true,
+  "praegnanz.de": true,
+  "mathiasbynens.be": true,
+  "jplayer.org": true,
+  "www.w3clubs.com": true,
+  "jsonbeautifier.org": true,
+  "xmlgraphics.apache.org": true,
+  "www.color.org": true,
+  "www.example.com": true,
+  "blogs.msdn.com": true,
+  "js13kgames.com": true,
+  "jsxgraph.uni-bayreuth.de": true,
+  "www.webglacademy.com": false,
+  "www.redhat.com": true,
+  "joshondesign.com": true,
+  "exploringjs.com": true,
+  "mediapm.edgesuite.net": false,
+  "brew.sh": true,
+  "www.htmlhelp.com": true,
+  "getfirebug.com": true,
+  "nightly.mozilla.org": true,
+  "ImageMagick.org": true,
+  "ie.microsoft.com": false,
+  "teamgiraffe.co.uk": false,
+  "labs.jensimmons.com": true,
+  "hevc.info": false,
+  "nodejs.org": true,
+  "go-oo.org": false,
+  "www.davidflanagan.com": true,
+  "cubic-bezier.com": true,
+  "www.leanbackplayer.com": true,
+  "m.flickr.com": true,
+  "callbackhell.com": false,
+  "www.addyosmani.com": true,
+  "fabricjs.com": false,
+  "getbem.com": false,
+  "bennettfeely.com": true,
+  "a11y-style-guide.com": true,
+  "pki.fedoraproject.org": true,
+  "promisesaplus.com": true,
+  "www.gtalbot.org": true,
+  "de.slideshare.net": true,
+  "libreoffice.org": true,
+  "webglplayground.net": false,
+  "www.microsoft.com": true,
+  "www.svgbasics.com": false,
+  "oos.moxiecode.com": false,
+  "csstriggers.com": true,
+  "www.gwhitworth.com": true,
+  "xregexp.com": true,
+  "www.themaninblue.com": true,
+  "software.hixie.ch": true,
+  "robert.ocallahan.org": true,
+  "www.streamingmedia.com": true,
+  "www.unece.org": true,
+  "www.jitbit.com": true,
+  "www.totaljs.com": true,
+  "www.gnome.org": true,
+  "www.xiph.org": true,
+  "plyr.io": true,
+  "www.codicode.com": true,
+  "www.webkit.org": true,
+  "www.lukew.com": true,
+  "slimjs.com": true,
+  "ondras.zarovi.cz": true,
+  "bucephalus.org": true,
+  "engineering.silk.co": true,
+  "handbrake.fr": true,
+  "tylerfinck.com": true,
+  "www.dotnet247.com": true,
+  "www.codecademy.com": true,
+  "my.opera.com": true,
+  "mozakai.blogspot.com": true,
+  "fedoraproject.org": true,
+  "inria.fr": true,
+  "tools.ietf.org": true,
+  "www.keio.ac.jp": true,
+  "mango.blender.org": true,
+  "www.muazkhan.com": true,
+  "betterexplained.com": true,
+  "www.sitepoint.com": true,
+  "www-xray.ast.cam.ac.uk": true,
+  "www.slideshare.net": true,
+  "www.lg.com": true,
+  "www.nczonline.net": true,
+  "html5demos.com": true,
+  "www.modernizr.com": true,
+  "www.widevine.com": true,
+  "www-itec.uni-klu.ac.at": true,
+  "help.adobe.com": true,
+  "modernizr.com": true,
+  "www.useragentman.com": true,
+  "wayback.archive.org": true,
+  "www.delphiki.com": true,
+  "www.evolt.org": true,
+  "httpwg.org": true,
+  "store.steampowered.com": true,
+  "unstoppablerobotninja.com": true,
+  "w3.org": true,
+  "www.kevinroth.com": true,
+  "curl.haxx.se": true,
+  "m.facebook.com": true,
+  "www.oracle.com": true,
+  "www.kb.cert.org": true,
+  "download.java.net": true,
+  "www.getmiro.com": true,
+  "www.mulberrytech.com": true,
+  "www.streamingmediaglobal.com": true,
+  "www.itu.int": true,
+  "m.youtube.com": true,
+  "soledadpenades.com": true,
+  "people.mozilla.org": true,
+  "dom.spec.whatwg.org": true,
+  "svg.org": true,
+  "encoding.spec.whatwg.org": true,
+  "duriansoftware.com": true,
+  "ev.buaa.edu.cn": true,
+  "html5.org": true,
+  "intercoolerjs.org": true,
+  "videojs.com": true,
+  "www.lyx.org": true,
+  "www.html5canvastutorials.com": true,
+  "www.firemath.info": true,
+  "coffeescript.org": true,
+  "docs.aws.amazon.com": true,
+  "jvectormap.com": true,
+  "www.icecast.org": true,
+  "lea.verou.me": true,
+  "www.earlevel.com": true,
+  "mulberrytech.com": true,
+  "dash-mse-test.appspot.com": true,
+  "www.sintel.org": true,
+  "nerget.com": true,
+  "en.flossmanuals.net": true,
+  "www.meyerweb.com": true,
+  "library.gnome.org": true,
+  "cssmenumaker.com": true,
+  "www.testufo.com": true,
+  "m.vid.ly": true,
+  "wikiversity.org": true,
+  "tink.uk": true,
+  "www.via-corp.com": true,
+  "soundbible.com": true,
+  "www.dspguide.com": true,
+  "carto.net": true,
+  "www.hixie.ch": true,
+  "emberjs.com": true,
+  "signalr.net": true,
+  "www.google.com": true,
+  "dropshado.ws": true,
+  "www.thomasfrank.se": true,
+  "luca.ntop.org": true,
+  "webglsamples.org": true,
+  "carlosrafaelgn.com.br": true,
+  "blog.kylehuey.com": true,
+  "earth-info.nga.mil": true,
+  "www6.software.ibm.com": true,
+  "processingjs.org": true,
+  "cdn.rawgit.com": true,
+  "www.mathjax.org": true,
+  "sass-lang.com": true,
+  "www.ffmpeg.org": true,
+  "v2v.cc": true,
+  "www.peej.co.uk": true,
+  "webglreport.com": true,
+  "jsstore.net": true,
+  "javascriptweblog.wordpress.com": true,
+  "glitch.com": true,
+  "angularjs.org": true,
+  "html.spec.whatwg.org": true,
+  "couchdb.apache.org": true,
+  "www.i18nguy.com": false,
+  "diagramcenter.org": false,
+  "www-cs-students.stanford.edu": false,
+  "www.dria.org": false,
+  "users.skynet.be": false,
+  "browserify.org": false,
+  "brackets.io": false,
+  "velocityjs.org": false,
+  "1997.webhistory.org": false,
+  "www.codelobster.com": false,
+  "smacss.com": false,
+  "csslint.net": false,
+  "www.auraluxgame.com": false,
+  "adaptive-images.com": false,
+  "www.html.net": false,
+  "abisource.org": false,
+  "www.jsondiff.com": false,
+  "daniemon.com": false,
+  "qutoric.com": false,
+  "camendesign.com": false,
+  "info.cern.ch": false,
+  "xml.coverpages.org": false,
+  "www.deafblind.com": false,
+  "www.passani.it": false,
+  "browsershots.org": false,
+  "www.stubbornella.org": false,
+  "eyeasme.com": false,
+  "corber.io": false,
+  "ogldev.atspace.co.uk": false,
+  "www.chromevox.com": false,
+  "disruptive-innovations.com": false,
+  "mkweb.bcgsc.ca": false,
+  "www.vision-and-eye-health.com": false,
+  "getskeleton.com": false,
+  "snapsvg.io": false,
+  "compass-style.org": false,
+  "videogamecaster.com": false,
+  "www.zibbo.com": false,
+  "www.javascriptkit.com": false,
+  "www.7zip.org": false,
+  "flask.pocoo.org": false,
+  "chaijs.com": false,
+  "www.schillmania.com": false,
+  "www.os2bbs.com": false,
+  "es6-features.org": false
+}
diff --git a/testing/tests/index.test.js b/testing/tests/index.test.js
index 3aac8309cb93..e8eacc8aa24b 100644
--- a/testing/tests/index.test.js
+++ b/testing/tests/index.test.js
@@ -578,7 +578,7 @@ test("broken links flaws", () => {
     "#anchor"
   );
   expect(map.get("http://www.mozilla.org").explanation).toBe(
-    "http:// external links are not allowed (will be forced to https:// at build-time)"
+    "Is currently http:// but can become https://"
   );
   expect(map.get("http://www.mozilla.org").suggestion).toBe(
     "https://www.mozilla.org"

From 7a4a06be4e6c459dfc2f9ebd4f748299de77580d Mon Sep 17 00:00:00 2001
From: Soham Shah <47717492+sohamsshah@users.noreply.github.com>
Date: Tue, 4 May 2021 01:13:43 +0530
Subject: [PATCH 286/288] move footer icons to CSS bg images (#3655)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ↗ Fixes #2900: move footer icons to CSS bg images

* replace with utility class visually-hidden
---
 client/src/ui/organisms/footer/index.scss | 31 +++++++++++++++++------
 client/src/ui/organisms/footer/index.tsx  | 21 ++++++---------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/client/src/ui/organisms/footer/index.scss b/client/src/ui/organisms/footer/index.scss
index b5032c2f2852..f38222e11888 100644
--- a/client/src/ui/organisms/footer/index.scss
+++ b/client/src/ui/organisms/footer/index.scss
@@ -47,16 +47,31 @@
     ul {
       padding-inline-start: $base-spacing / 4;
     }
+  }
 
-    svg {
-      height: 18px;
-      vertical-align: sub;
-      width: 18px;
+  .social-icon::before {
+    background-size: 18px;
+    content: "";
+    display: inline-block;
+    filter: invert(1);
+    height: 18px;
+    vertical-align: sub;
+    width: 18px;
+  }
 
-      path {
-        fill: #fff;
-      }
-    }
+  .twitter::before {
+    background: transparent url("~@mdn/dinocons/social/twitter.svg") 0 0
+      no-repeat;
+  }
+
+  .github::before {
+    background: transparent url("~@mdn/dinocons/brands/github-mark-small.svg") 0
+      0 no-repeat;
+  }
+
+  .instagram::before {
+    background: transparent url("~@mdn/dinocons/social/instagram.svg") 0 0
+      no-repeat;
   }
 
   .footer-license {
diff --git a/client/src/ui/organisms/footer/index.tsx b/client/src/ui/organisms/footer/index.tsx
index 8f5e06c499d3..7810cdd6d556 100644
--- a/client/src/ui/organisms/footer/index.tsx
+++ b/client/src/ui/organisms/footer/index.tsx
@@ -1,9 +1,4 @@
 import * as React from "react";
-
-import { ReactComponent as GithubIcon } from "@mdn/dinocons/brands/github-mark-small.svg";
-import { ReactComponent as TwitterIcon } from "@mdn/dinocons/social/twitter.svg";
-import { ReactComponent as InstagramIcon } from "@mdn/dinocons/social/instagram.svg";
-
 import { useLocale } from "../../../hooks";
 import { Logo } from "../../atoms/logo";
 import "./index.scss";
@@ -76,22 +71,22 @@ export function Footer() {
           <ul>
             <li>
               <a
+                className="social-icon twitter"
                 href="https://twitter.com/mozdevnet"
                 target="_blank"
                 rel="noopener noreferrer"
-                aria-label="Twitter"
               >
-                <TwitterIcon />
+                <span className="visually-hidden">MDN on Twitter</span>
               </a>
             </li>
             <li>
               <a
+                className="social-icon github"
                 href="https://github.com/mdn/"
                 target="_blank"
                 rel="noopener noreferrer"
-                aria-label="Github"
               >
-                <GithubIcon />
+                <span className="visually-hidden">MDN on Github</span>
               </a>
             </li>
           </ul>
@@ -102,22 +97,22 @@ export function Footer() {
           <ul>
             <li>
               <a
+                className="social-icon github"
                 href="https://twitter.com/mozilla"
                 target="_blank"
                 rel="noopener noreferrer"
-                aria-label="Twitter"
               >
-                <TwitterIcon />
+                <span className="visually-hidden">Mozilla on Twitter</span>
               </a>
             </li>
             <li>
               <a
+                className="social-icon instagram"
                 href="https://www.instagram.com/mozillagram/"
                 target="_blank"
                 rel="noopener noreferrer"
-                aria-label="Instagram"
               >
-                <InstagramIcon />
+                <span className="visually-hidden">Mozilla on Instagram</span>
               </a>
             </li>
           </ul>

From 974f86a01be81a71d1e7852978b88f579f87ff85 Mon Sep 17 00:00:00 2001
From: Ryan Johnson <rjohnson@mozilla.com>
Date: Mon, 3 May 2021 14:02:42 -0700
Subject: [PATCH 287/288] Limit non-English locales (#3661)

* update/add locale constants

* add and test redirects of retired locales

* fix locale alias for pt

* fix for developing.test.js cookie test

* fix gather-git-history

* add integration tests for retired locale redirects

* move redirects into the fundamental redirects

* add lambda tests (feedbacked)

* use DEFAULT_LOCALE (feedbacked)
---
 client/src/constants.ts                       |  22 --
 .../content-origin-request/index.js           |  13 +-
 .../content-origin-request/server.test.js     |  31 +++
 libs/constants/index.js                       |  30 +--
 libs/fundamental-redirects/index.js           |  26 ++-
 testing/integration/headless/map_301.py       |   4 +-
 .../integration/headless/test_redirects.py    |  57 +++++
 testing/tests/developing.test.js              |   4 +-
 testing/tests/headless.test.js                |   6 +-
 testing/tests/redirects.test.js               | 197 +++++++++++++++++-
 tool/cli.js                                   |   5 +-
 11 files changed, 343 insertions(+), 52 deletions(-)

diff --git a/client/src/constants.ts b/client/src/constants.ts
index 1bc2fa606ec3..751abcf06809 100644
--- a/client/src/constants.ts
+++ b/client/src/constants.ts
@@ -25,37 +25,15 @@ export const AUTOCOMPLETE_SEARCH_WIDGET = JSON.parse(
 // We could encode the list in the SSR rendering but that means the client side
 // code needs to depend on having access to the `window` global first.
 export const VALID_LOCALES = new Set([
-  "ar",
-  "bg",
-  "bn",
-  "ca",
   "de",
-  "el",
   "en-US",
   "es",
-  "fa",
-  "fi",
   "fr",
-  "he",
-  "hi-IN",
-  "hu",
-  "id",
-  "it",
   "ja",
-  "kab",
   "ko",
-  "ms",
-  "my",
-  "nl",
   "pl",
   "pt-BR",
-  "pt-PT",
   "ru",
-  "sv-SE",
-  "th",
-  "tr",
-  "uk",
-  "vi",
   "zh-CN",
   "zh-TW",
 ]);
diff --git a/deployer/aws-lambda/content-origin-request/index.js b/deployer/aws-lambda/content-origin-request/index.js
index c02d0a732f73..4b41fa70fc7f 100644
--- a/deployer/aws-lambda/content-origin-request/index.js
+++ b/deployer/aws-lambda/content-origin-request/index.js
@@ -105,12 +105,14 @@ exports.handler = async (event) => {
     return redirect(`/${request.uri.replace(/^\/+/g, "")}`);
   }
 
-  const { url, status } = resolveFundamental(request.uri);
+  let { url, status } = resolveFundamental(request.uri);
   if (url) {
-    // TODO: Do we want to add the query string to the redirect?
-    //       If we decide we do, then we probably need to change
-    //       the caching policy on the "*/docs/* behavior" to
-    //       cache based on the query strings as well.
+    // NOTE: The query string is not forwarded for document requests,
+    //       as directed by their origin request policy, so it's safe to
+    //       assume "request.querystring" is empty for document requests.
+    if (request.querystring) {
+      url += (url.includes("?") ? "&" : "?") + request.querystring;
+    }
     return redirect(url, {
       status,
       cacheControlSeconds: THIRTY_DAYS,
@@ -127,6 +129,7 @@ exports.handler = async (event) => {
     const path = request.uri.endsWith("/")
       ? request.uri.slice(0, -1)
       : request.uri;
+    // Note that "getLocale" only returns valid locales, never a retired locale.
     const locale = getLocale(request);
     // The only time we actually want a trailing slash is when the URL is just
     // the locale. E.g. `/en-US/` (not `/en-US`)
diff --git a/deployer/aws-lambda/content-origin-request/server.test.js b/deployer/aws-lambda/content-origin-request/server.test.js
index 39d8e74474dd..7ecf299df0b3 100644
--- a/deployer/aws-lambda/content-origin-request/server.test.js
+++ b/deployer/aws-lambda/content-origin-request/server.test.js
@@ -207,3 +207,34 @@ describe("redirect double-slash prefix URIs", () => {
     expect(r.headers["location"]).toBe("/blablabla");
   });
 });
+
+describe("retired locale redirects", () => {
+  it("should 302 redirect a retired locale (accept-language)", async () => {
+    const r = await get("/", {
+      "Accept-language": "sv-SE",
+    });
+    expect(r.statusCode).toBe(302);
+    expect(r.headers["location"]).toBe("/en-US/");
+  });
+  it("should 302 redirect a retired locale (preferredlocale cookie)", async () => {
+    const r = await get("/docs/Web/HTTP", {
+      Cookie: "preferredlocale=it",
+    });
+    expect(r.statusCode).toBe(302);
+    expect(r.headers["location"]).toBe("/en-US/docs/Web/HTTP");
+  });
+  it("should 302 redirect a retired locale (no query string)", async () => {
+    const r = await get("/sv-SE/docs/Web/HTML");
+    expect(r.statusCode).toBe(302);
+    expect(r.headers["location"]).toBe(
+      "/en-US/docs/Web/HTML?retiredLocale=sv-SE"
+    );
+  });
+  it("should 302 redirect a retired locale (query string, improper locale)", async () => {
+    const r = await get("/BN/search?q=video");
+    expect(r.statusCode).toBe(302);
+    expect(r.headers["location"]).toBe(
+      "/en-US/search?retiredLocale=bn&q=video"
+    );
+  });
+});
diff --git a/libs/constants/index.js b/libs/constants/index.js
index 79781a519221..3c5618edf0af 100644
--- a/libs/constants/index.js
+++ b/libs/constants/index.js
@@ -1,38 +1,43 @@
 const VALID_LOCALES = new Map(
+  [
+    "de",
+    "en-US",
+    "es",
+    "fr",
+    "ja",
+    "ko",
+    "pl",
+    "pt-BR",
+    "ru",
+    "zh-CN",
+    "zh-TW",
+  ].map((x) => [x.toLowerCase(), x])
+);
+
+const RETIRED_LOCALES = new Map(
   [
     "ar",
     "bg",
     "bn",
     "ca",
-    "de",
     "el",
-    "en-US",
-    "es",
     "fa",
     "fi",
-    "fr",
     "he",
     "hi-IN",
     "hu",
     "id",
     "it",
-    "ja",
     "kab",
-    "ko",
     "ms",
     "my",
     "nl",
-    "pl",
-    "pt-BR",
     "pt-PT",
-    "ru",
     "sv-SE",
     "th",
     "tr",
     "uk",
     "vi",
-    "zh-CN",
-    "zh-TW",
   ].map((x) => [x.toLowerCase(), x])
 );
 
@@ -41,7 +46,7 @@ const DEFAULT_LOCALE = "en-US";
 const LOCALE_ALIASES = new Map([
   // Case is not important on either the keys or the values.
   ["en", "en-us"],
-  ["pt", "pt-PT"], // Note! Portugal Portugese is the default
+  ["pt", "pt-br"],
   ["cn", "zh-cn"],
   ["zh", "zh-cn"],
   ["zh-hans", "zh-cn"],
@@ -64,6 +69,7 @@ const ACTIVE_LOCALES = new Set([
 module.exports = {
   ACTIVE_LOCALES,
   VALID_LOCALES,
+  RETIRED_LOCALES,
   DEFAULT_LOCALE,
   LOCALE_ALIASES,
   PREFERRED_LOCALE_COOKIE_NAME,
diff --git a/libs/fundamental-redirects/index.js b/libs/fundamental-redirects/index.js
index 5343752b8859..1e37d29589ea 100644
--- a/libs/fundamental-redirects/index.js
+++ b/libs/fundamental-redirects/index.js
@@ -1,4 +1,9 @@
-const { VALID_LOCALES, LOCALE_ALIASES } = require("../constants");
+const {
+  DEFAULT_LOCALE,
+  VALID_LOCALES,
+  LOCALE_ALIASES,
+  RETIRED_LOCALES,
+} = require("../constants");
 
 const startRe = /^\^?\/?/;
 const startTemplate = /^\//;
@@ -65,12 +70,12 @@ for (const locale of VALID_LOCALES.keys()) {
 }
 
 for (const [alias, correct] of LOCALE_ALIASES) {
-  // E.g. things like `en` -> `en-us` or `pt` -> `pt-pt`
+  // E.g. things like `en` -> `en-us` or `pt` -> `pt-br`
   fixableLocales.set(alias, correct);
 }
 
-// All things like `/en_Us/docs/...` -> `/en-US/docs/...`
 const LOCALE_PATTERNS = [
+  // All things like `/en_Us/docs/...` -> `/en-US/docs/...`
   redirect(
     new RegExp(
       `^(?<locale>${Array.from(fixableLocales.keys()).join(
@@ -92,6 +97,21 @@ const LOCALE_PATTERNS = [
     },
     { permanent: true }
   ),
+  // Retired locales
+  redirect(
+    new RegExp(
+      `^(?<locale>${Array.from(RETIRED_LOCALES.keys()).join(
+        "|"
+      )})(/(?<suffix>.*)|$)`,
+      "i"
+    ),
+    ({ locale, suffix }) => {
+      const join = suffix && suffix.includes("?") ? "&" : "?";
+      return `/${DEFAULT_LOCALE}/${
+        (suffix || "") + join
+      }retiredLocale=${RETIRED_LOCALES.get(locale.toLowerCase())}`;
+    }
+  ),
 ];
 
 // Redirects/rewrites/aliases migrated from SCL3 httpd config
diff --git a/testing/integration/headless/map_301.py b/testing/integration/headless/map_301.py
index d3f96afd2d83..00756973905c 100644
--- a/testing/integration/headless/map_301.py
+++ b/testing/integration/headless/map_301.py
@@ -1069,8 +1069,8 @@
     url_test("/EN-US/?next=FOO", "/en-US/?next=FOO", status_code=302),
     url_test("/eN-us/docs/Web", "/en-US/docs/Web", status_code=302),
     url_test("/eN-us/docs/Web/", "/en-US/docs/Web", status_code=302),
-    url_test("/eN-us/docs/Web?next=FOO", "/en-US/docs/Web?next=FOO", status_code=302),
-    url_test("/eN-us/docs/Web/?next=FOO", "/en-US/docs/Web?next=FOO", status_code=302),
+    url_test("/eN-us/docs/Web?next=FOO", "/en-US/docs/Web", status_code=302),
+    url_test("/eN-us/docs/Web/?next=FOO", "/en-US/docs/Web", status_code=302),
     url_test("/en-uS/search", "/en-US/search", status_code=302),
     url_test("/en-uS/search/", "/en-US/search", status_code=302),
     url_test("/en-Us/search?q=video", "/en-US/search?q=video", status_code=302),
diff --git a/testing/integration/headless/test_redirects.py b/testing/integration/headless/test_redirects.py
index 70b43145b996..3bb71f9c7458 100644
--- a/testing/integration/headless/test_redirects.py
+++ b/testing/integration/headless/test_redirects.py
@@ -1,5 +1,6 @@
 import pytest
 
+from . import request
 from utils.urls import assert_valid_url
 
 from .map_301 import (
@@ -116,3 +117,59 @@ def test_firefox_source_docs_redirects(url, base_url):
 def test_misc_redirects(url, base_url):
     url["base_url"] = base_url
     assert_valid_url(**url)
+
+
+@pytest.mark.parametrize(
+    "retired_locale",
+    (
+        "ar",
+        "bg",
+        "bn",
+        "ca",
+        "el",
+        "fa",
+        "fi",
+        "he",
+        "hi-IN",
+        "hu",
+        "id",
+        "it",
+        "kab",
+        "ms",
+        "my",
+        "nl",
+        "pt-PT",
+        "sv-SE",
+        "th",
+        "tr",
+        "uk",
+        "vi",
+    ),
+)
+@pytest.mark.parametrize(
+    "slug",
+    [
+        "",
+        "/",
+        "/docs/Web",
+        "/docs/Web/",
+        "/search",
+        "/search/",
+        "/search?q=video",
+        "/search/?q=video",
+        "/signup",
+        "/settings",
+    ],
+)
+def test_retired_locale_redirects(base_url, slug, retired_locale):
+    """Ensure that requests for retired locales properly redirect."""
+    resp = request("get", f"{base_url}/{retired_locale}{slug}")
+    assert resp.status_code == 302
+    slug_parts = slug.split("?")
+    expected_slug = slug_parts[0].lstrip("/")
+    expected_qs = f"?retiredLocale={retired_locale}"
+    if len(slug_parts) > 1:
+        expected_qs += f"&{slug_parts[1]}"
+    assert (
+        resp.headers["Location"] == f"/en-US/{expected_slug}{expected_qs}"
+    ), f"{resp.headers['Location']} is not /en-US/{expected_slug}{expected_qs}"
diff --git a/testing/tests/developing.test.js b/testing/tests/developing.test.js
index 66585fcd10e6..00519790dfb4 100644
--- a/testing/tests/developing.test.js
+++ b/testing/tests/developing.test.js
@@ -166,12 +166,12 @@ describe("Testing the Express server", () => {
     const response = await got(serverURL("/"), {
       followRedirect: false,
       headers: {
-        Cookie: "preferredlocale=SV-se",
+        Cookie: "preferredlocale=ja",
         "Accept-language": "fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5",
       },
     });
     expect(response.statusCode).toBe(302);
-    expect(response.headers.location).toBe("/sv-SE/");
+    expect(response.headers.location).toBe("/ja/");
   });
 });
 
diff --git a/testing/tests/headless.test.js b/testing/tests/headless.test.js
index 734a053a7281..c026c73b96be 100644
--- a/testing/tests/headless.test.js
+++ b/testing/tests/headless.test.js
@@ -218,10 +218,10 @@ describe("Basic viewing of functional pages", () => {
   });
 
   it("should suggest the en-US equivalent on non-en-US pages not found", async () => {
-    await page.goto(testURL("/sv-SE/docs/Web/foo"));
+    await page.goto(testURL("/ja/docs/Web/foo"));
     await expect(page).toMatch("Page not found");
-    await expect(page).toMatch("/sv-SE/docs/Web/foo could not be found");
-    // Simply by swapping the "sv-SE" for "en-US" it's able to find the index.json
+    await expect(page).toMatch("/ja/docs/Web/foo could not be found");
+    // Simply by swapping the "ja" for "en-US" it's able to find the index.json
     // for that slug and present a link to it.
     await expect(page).toMatch("Good news!");
     await expect(page).toMatchElement("a", {
diff --git a/testing/tests/redirects.test.js b/testing/tests/redirects.test.js
index e0086dc78ce0..1f6c4bf8a1b6 100644
--- a/testing/tests/redirects.test.js
+++ b/testing/tests/redirects.test.js
@@ -978,12 +978,14 @@ const LOCALE_ALIAS_URLS = [].concat(
   url_test("/en-gb/docs/Foo/bar", null, { statusCode: 404 }),
   url_test("/en_gb/docs/Foo/bar", null, { statusCode: 404 }),
 
-  url_test("/PT-PT/docs/Foo/bar", null, { statusCode: 404 }),
+  url_test("/PT-PT/docs/Foo/bar", "/en-US/docs/Foo/bar?retiredLocale=pt-PT", {
+    statusCode: 302,
+  }),
   url_test("/XY-PQ/docs/Foo/bar", null, { statusCode: 404 }),
 
   url_test("/en/docs/Foo/bar", "/en-US/docs/Foo/bar"),
   url_test("/En_uS/docs/Foo/bar", "/en-US/docs/Foo/bar"),
-  url_test("/pt/docs/Foo/bar", "/pt-PT/docs/Foo/bar"),
+  url_test("/pt/docs/Foo/bar", "/pt-BR/docs/Foo/bar"),
   url_test("/Fr-FR/docs/Foo/bar", "/fr/docs/Foo/bar"),
   url_test("/JA-JP/docs/Foo/bar", "/ja/docs/Foo/bar"),
   url_test("/JA-JA/docs/Foo/bar", "/ja/docs/Foo/bar"),
@@ -1002,6 +1004,191 @@ const LOCALE_ALIAS_URLS = [].concat(
   url_test("/zh", "/zh-CN/")
 );
 
+const RETIRED_LOCALE_URLS = [].concat(
+  url_test("/ar", "/en-US/?retiredLocale=ar", { statusCode: 302 }),
+  url_test("/ar/", "/en-US/?retiredLocale=ar", { statusCode: 302 }),
+  url_test("/bg", "/en-US/?retiredLocale=bg", { statusCode: 302 }),
+  url_test("/bg/", "/en-US/?retiredLocale=bg", { statusCode: 302 }),
+  url_test("/bn", "/en-US/?retiredLocale=bn", { statusCode: 302 }),
+  url_test("/bn/", "/en-US/?retiredLocale=bn", { statusCode: 302 }),
+  url_test("/ca", "/en-US/?retiredLocale=ca", { statusCode: 302 }),
+  url_test("/ca/", "/en-US/?retiredLocale=ca", { statusCode: 302 }),
+  url_test("/el", "/en-US/?retiredLocale=el", { statusCode: 302 }),
+  url_test("/el/", "/en-US/?retiredLocale=el", { statusCode: 302 }),
+  url_test("/fa", "/en-US/?retiredLocale=fa", { statusCode: 302 }),
+  url_test("/FA/", "/en-US/?retiredLocale=fa", { statusCode: 302 }),
+  url_test("/fi", "/en-US/?retiredLocale=fi", { statusCode: 302 }),
+  url_test("/fi/", "/en-US/?retiredLocale=fi", { statusCode: 302 }),
+  url_test("/he", "/en-US/?retiredLocale=he", { statusCode: 302 }),
+  url_test("/he/", "/en-US/?retiredLocale=he", { statusCode: 302 }),
+  url_test("/hi-In", "/en-US/?retiredLocale=hi-IN", { statusCode: 302 }),
+  url_test("/hi-IN/", "/en-US/?retiredLocale=hi-IN", { statusCode: 302 }),
+  url_test("/hu", "/en-US/?retiredLocale=hu", { statusCode: 302 }),
+  url_test("/hu/", "/en-US/?retiredLocale=hu", { statusCode: 302 }),
+  url_test("/id", "/en-US/?retiredLocale=id", { statusCode: 302 }),
+  url_test("/ID/", "/en-US/?retiredLocale=id", { statusCode: 302 }),
+  url_test("/it", "/en-US/?retiredLocale=it", { statusCode: 302 }),
+  url_test("/it/", "/en-US/?retiredLocale=it", { statusCode: 302 }),
+  url_test("/kab", "/en-US/?retiredLocale=kab", { statusCode: 302 }),
+  url_test("/KaB/", "/en-US/?retiredLocale=kab", { statusCode: 302 }),
+  url_test("/ms", "/en-US/?retiredLocale=ms", { statusCode: 302 }),
+  url_test("/ms/", "/en-US/?retiredLocale=ms", { statusCode: 302 }),
+  url_test("/my", "/en-US/?retiredLocale=my", { statusCode: 302 }),
+  url_test("/my/", "/en-US/?retiredLocale=my", { statusCode: 302 }),
+  url_test("/nl", "/en-US/?retiredLocale=nl", { statusCode: 302 }),
+  url_test("/nl/", "/en-US/?retiredLocale=nl", { statusCode: 302 }),
+  url_test("/pt-Pt", "/en-US/?retiredLocale=pt-PT", { statusCode: 302 }),
+  url_test("/pt-PT/", "/en-US/?retiredLocale=pt-PT", { statusCode: 302 }),
+  url_test("/sv-SE", "/en-US/?retiredLocale=sv-SE", { statusCode: 302 }),
+  url_test("/sv-se/", "/en-US/?retiredLocale=sv-SE", { statusCode: 302 }),
+  url_test("/th", "/en-US/?retiredLocale=th", { statusCode: 302 }),
+  url_test("/th/", "/en-US/?retiredLocale=th", { statusCode: 302 }),
+  url_test("/tr", "/en-US/?retiredLocale=tr", { statusCode: 302 }),
+  url_test("/tr/", "/en-US/?retiredLocale=tr", { statusCode: 302 }),
+  url_test("/uk", "/en-US/?retiredLocale=uk", { statusCode: 302 }),
+  url_test("/uk/", "/en-US/?retiredLocale=uk", { statusCode: 302 }),
+  url_test("/vi", "/en-US/?retiredLocale=vi", { statusCode: 302 }),
+  url_test("/vi/", "/en-US/?retiredLocale=vi", { statusCode: 302 }),
+  url_test("/ar/docs/Web", "/en-US/docs/Web?retiredLocale=ar", {
+    statusCode: 302,
+  }),
+  url_test("/bg/docs/Web/", "/en-US/docs/Web/?retiredLocale=bg", {
+    statusCode: 302,
+  }),
+  url_test("/bn/docs/Web", "/en-US/docs/Web?retiredLocale=bn", {
+    statusCode: 302,
+  }),
+  url_test("/Ca/docs/Web/", "/en-US/docs/Web/?retiredLocale=ca", {
+    statusCode: 302,
+  }),
+  url_test("/el/docs/Web", "/en-US/docs/Web?retiredLocale=el", {
+    statusCode: 302,
+  }),
+  url_test("/FA/docs/Web", "/en-US/docs/Web?retiredLocale=fa", {
+    statusCode: 302,
+  }),
+  url_test("/fi/docs/Web", "/en-US/docs/Web?retiredLocale=fi", {
+    statusCode: 302,
+  }),
+  url_test("/he/docs/Web", "/en-US/docs/Web?retiredLocale=he", {
+    statusCode: 302,
+  }),
+  url_test("/hi-IN/docs/Web", "/en-US/docs/Web?retiredLocale=hi-IN", {
+    statusCode: 302,
+  }),
+  url_test("/hu/docs/Web", "/en-US/docs/Web?retiredLocale=hu", {
+    statusCode: 302,
+  }),
+  url_test("/ID/docs/Web", "/en-US/docs/Web?retiredLocale=id", {
+    statusCode: 302,
+  }),
+  url_test("/it/docs/Web", "/en-US/docs/Web?retiredLocale=it", {
+    statusCode: 302,
+  }),
+  url_test("/KaB/docs/Web", "/en-US/docs/Web?retiredLocale=kab", {
+    statusCode: 302,
+  }),
+  url_test("/ms/docs/Web", "/en-US/docs/Web?retiredLocale=ms", {
+    statusCode: 302,
+  }),
+  url_test("/my/docs/Web", "/en-US/docs/Web?retiredLocale=my", {
+    statusCode: 302,
+  }),
+  url_test("/nl/docs/Web", "/en-US/docs/Web?retiredLocale=nl", {
+    statusCode: 302,
+  }),
+  url_test("/pt-PT/docs/Web", "/en-US/docs/Web?retiredLocale=pt-PT", {
+    statusCode: 302,
+  }),
+  url_test("/sv-se/docs/Web", "/en-US/docs/Web?retiredLocale=sv-SE", {
+    statusCode: 302,
+  }),
+  url_test("/th/docs/Web", "/en-US/docs/Web?retiredLocale=th", {
+    statusCode: 302,
+  }),
+  url_test("/tr/docs/Web", "/en-US/docs/Web?retiredLocale=tr", {
+    statusCode: 302,
+  }),
+  url_test("/uk/docs/Web", "/en-US/docs/Web?retiredLocale=uk", {
+    statusCode: 302,
+  }),
+  url_test("/vi/docs/Web", "/en-US/docs/Web?retiredLocale=vi", {
+    statusCode: 302,
+  }),
+  url_test("/ar/search?q=video", "/en-US/search?q=video&retiredLocale=ar", {
+    statusCode: 302,
+  }),
+  url_test("/bg/search?q=video", "/en-US/search?q=video&retiredLocale=bg", {
+    statusCode: 302,
+  }),
+  url_test("/bn/search?q=video", "/en-US/search?q=video&retiredLocale=bn", {
+    statusCode: 302,
+  }),
+  url_test("/Ca/search?q=video", "/en-US/search?q=video&retiredLocale=ca", {
+    statusCode: 302,
+  }),
+  url_test("/el/search?q=video", "/en-US/search?q=video&retiredLocale=el", {
+    statusCode: 302,
+  }),
+  url_test("/FA/search?q=video", "/en-US/search?q=video&retiredLocale=fa", {
+    statusCode: 302,
+  }),
+  url_test("/fi/search?q=video", "/en-US/search?q=video&retiredLocale=fi", {
+    statusCode: 302,
+  }),
+  url_test("/he/search?q=video", "/en-US/search?q=video&retiredLocale=he", {
+    statusCode: 302,
+  }),
+  url_test(
+    "/hi-IN/search?q=video",
+    "/en-US/search?q=video&retiredLocale=hi-IN",
+    { statusCode: 302 }
+  ),
+  url_test("/hu/search?q=video", "/en-US/search?q=video&retiredLocale=hu", {
+    statusCode: 302,
+  }),
+  url_test("/ID/search?q=video", "/en-US/search?q=video&retiredLocale=id", {
+    statusCode: 302,
+  }),
+  url_test("/it/search?q=video", "/en-US/search?q=video&retiredLocale=it", {
+    statusCode: 302,
+  }),
+  url_test("/KaB/search?q=video", "/en-US/search?q=video&retiredLocale=kab", {
+    statusCode: 302,
+  }),
+  url_test("/ms/search?q=video", "/en-US/search?q=video&retiredLocale=ms", {
+    statusCode: 302,
+  }),
+  url_test("/my/search?q=video", "/en-US/search?q=video&retiredLocale=my", {
+    statusCode: 302,
+  }),
+  url_test("/nl/search?q=video", "/en-US/search?q=video&retiredLocale=nl", {
+    statusCode: 302,
+  }),
+  url_test(
+    "/pt-PT/search?q=video",
+    "/en-US/search?q=video&retiredLocale=pt-PT",
+    { statusCode: 302 }
+  ),
+  url_test(
+    "/sv-se/search?q=video",
+    "/en-US/search?q=video&retiredLocale=sv-SE",
+    { statusCode: 302 }
+  ),
+  url_test("/th/search?q=video", "/en-US/search?q=video&retiredLocale=th", {
+    statusCode: 302,
+  }),
+  url_test("/tr/search?q=video", "/en-US/search?q=video&retiredLocale=tr", {
+    statusCode: 302,
+  }),
+  url_test("/uk/search?q=video", "/en-US/search?q=video&retiredLocale=uk", {
+    statusCode: 302,
+  }),
+  url_test("/vi/search?q=video", "/en-US/search?q=video&retiredLocale=vi", {
+    statusCode: 302,
+  })
+);
+
 const MISC_REDIRECT_URLS = [].concat(
   url_test("/fr/account", "/fr/settings", { statusCode: 302 }),
   url_test("/en-US/account", "/en-US/settings", { statusCode: 302 }),
@@ -1167,6 +1354,12 @@ describe("locale alias redirects", () => {
   }
 });
 
+describe("retired locale redirects", () => {
+  for (const [url, t] of RETIRED_LOCALE_URLS) {
+    it(url, t);
+  }
+});
+
 const CORE_JAVASCRIPT_1_5_URLs = [].concat(
   url_test(
     "/en-US/docs/Core_JavaScript_1.5_Reference/Operators/Special_Operators/typeof_Operator",
diff --git a/tool/cli.js b/tool/cli.js
index f46f8633def9..f529e0ecd0ff 100644
--- a/tool/cli.js
+++ b/tool/cli.js
@@ -410,8 +410,11 @@ program
       // Someplace to put the map into an object so it can be saved into `saveHistory`
       const allHistory = {};
       for (const [relPath, value] of map) {
-        allHistory[relPath] = value;
         const locale = relPath.split(path.sep)[0];
+        if (!VALID_LOCALES.has(locale)) {
+          continue;
+        }
+        allHistory[relPath] = value;
         if (!historyPerLocale[locale]) {
           historyPerLocale[locale] = {};
         }

From e74a00503f290d9a608f7e89524e7cefd3b0952d Mon Sep 17 00:00:00 2001
From: Ryan Johnson <rjohnson@mozilla.com>
Date: Mon, 3 May 2021 16:57:43 -0700
Subject: [PATCH 288/288] remove tests for obsolete search endpoints (#3688)

---
 testing/integration/headless/test_cdn.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/testing/integration/headless/test_cdn.py b/testing/integration/headless/test_cdn.py
index 57ee5d25e541..0bbdfbad97b5 100644
--- a/testing/integration/headless/test_cdn.py
+++ b/testing/integration/headless/test_cdn.py
@@ -196,8 +196,6 @@ def test_not_cached(base_url, is_behind_cdn, slug, status, expected_location):
         ("/en-US/signup", 200, None),
         ("/en-US/signin", 200, None),
         ("/en-US/settings", 200, None),
-        ("/en-US/search/xml", 200, None),
-        ("/en-US/search.json?q=yada", 301, "/api/v1/search?q=yada"),
         ("/en-US/search?q=css", 200, None),
         ("/en-US/search/?q=css", 302, "/en-US/search?q=css"),
         ("/en-US/search/?q=html", 302, "/en-US/search?q=html"),