diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 056c5364b..0ec34a869 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -5,9 +5,9 @@ name: Python package
 
 on:
     push:
-        branches: [master, bookserver]
+        branches: [master, peer_support]
     pull_request:
-        branches: [master, bookserver]
+        branches: [master, peer_support]
 
 jobs:
     build:
@@ -28,26 +28,22 @@ jobs:
               if: always()
 
             - name: Setup npm and build runestone.js
-              id: create-runestone-bundle
               run: |
                   npm install
-                  npm run build
             - name: Set up Python ${{ matrix.python-version }}
-              id: install-python
               uses: actions/setup-python@v2
               with:
                   python-version: ${{ matrix.python-version }}
             - name: Install dependencies
-              id: install-deps
               run: |
                   python -m pip install --upgrade pip
                   python -m pip install flake8 pytest
-                  pip install .
+                  # Install as editable so that tests run in cwd, instead of in wherever Python puts system lib. This is important because tests are run on the local (not system lib) files. Therefore, the npm run build produces its files locally, not in system libs; if installed in system libs, then the components won't be able to find these files.
+                  pip install -e .
                   if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
-            - name: Test with pytest
-              id: pytest
+            - name: Tests
               run: |
-                  pytest
+                pytest
 
             - uses: act10ns/slack@v1
               with:
diff --git a/package-lock.json b/package-lock.json
index bdd3887f3..54732f7cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
                 "wavedrom": "^2.0.0"
             },
             "devDependencies": {
+                "compression-webpack-plugin": "^6.0.0",
                 "copy-webpack-plugin": "^8.0.0",
                 "css-loader": "^5.0.0",
                 "css-minimizer-webpack-plugin": "^3.0.0",
@@ -29,7 +30,7 @@
                 "html-webpack-plugin": "^5.0.0",
                 "mini-css-extract-plugin": "^1.0.0",
                 "style-loader": "^2.0.0",
-                "webpack": "^5.0.0",
+                "webpack": "^5.54.0",
                 "webpack-bundle-analyzer": "^4.0.0",
                 "webpack-cli": "^4.0.0"
             }
@@ -49,9 +50,9 @@
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.14.8",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz",
-            "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==",
+            "version": "7.15.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+            "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
             "dev": true,
             "engines": {
                 "node": ">=6.9.0"
@@ -143,9 +144,9 @@
             }
         },
         "node_modules/@discoveryjs/json-ext": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
-            "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
+            "version": "0.5.5",
+            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
+            "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==",
             "dev": true,
             "engines": {
                 "node": ">=10.0.0"
@@ -171,6 +172,12 @@
                 "node": "^10.12.0 || >=12.0.0"
             }
         },
+        "node_modules/@gar/promisify": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
+            "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==",
+            "dev": true
+        },
         "node_modules/@handsontable/formulajs": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/@handsontable/formulajs/-/formulajs-2.0.2.tgz",
@@ -238,25 +245,48 @@
                 "node": ">= 8"
             }
         },
+        "node_modules/@npmcli/fs": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz",
+            "integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==",
+            "dev": true,
+            "dependencies": {
+                "@gar/promisify": "^1.0.1",
+                "semver": "^7.3.5"
+            }
+        },
+        "node_modules/@npmcli/move-file": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+            "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+            "dev": true,
+            "dependencies": {
+                "mkdirp": "^1.0.4",
+                "rimraf": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
         "node_modules/@polka/url": {
-            "version": "1.0.0-next.15",
-            "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
-            "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",
+            "version": "1.0.0-next.21",
+            "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
+            "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
             "dev": true
         },
         "node_modules/@trysound/sax": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz",
-            "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==",
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+            "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
             "dev": true,
             "engines": {
                 "node": ">=10.13.0"
             }
         },
         "node_modules/@types/eslint": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz",
-            "integrity": "sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==",
+            "version": "7.28.2",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz",
+            "integrity": "sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA==",
             "dev": true,
             "dependencies": {
                 "@types/estree": "*",
@@ -276,19 +306,18 @@
         "node_modules/@types/estree": {
             "version": "0.0.50",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-            "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
-            "dev": true
+            "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
         },
         "node_modules/@types/html-minifier-terser": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz",
-            "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.0.0.tgz",
+            "integrity": "sha512-NZwaaynfs1oIoLAV1vg18e7QMVDvw+6SQrdJc8w3BwUaoroVSf6EBj/Sk4PBWGxsq0dzhA2drbsuMC1/6C6KgQ==",
             "dev": true
         },
         "node_modules/@types/json-schema": {
-            "version": "7.0.8",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-            "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+            "version": "7.0.9",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+            "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
             "dev": true
         },
         "node_modules/@types/json-stable-stringify": {
@@ -297,9 +326,9 @@
             "integrity": "sha512-qEWiQff6q2tA5gcJGWwzplQcXdJtm+0oy6IHGHzlOf3eFAkGE/FIPXZK9ofWgNSHVp8AFFI33PJJshS0ei3Gvw=="
         },
         "node_modules/@types/node": {
-            "version": "16.4.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.0.tgz",
-            "integrity": "sha512-HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg==",
+            "version": "16.11.4",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.4.tgz",
+            "integrity": "sha512-TMgXmy0v2xWyuCSCJM6NCna2snndD8yvQF67J29ipdzMcsPa9u+o0tjF5+EQNdhcuZplYuouYqpc4zcd5I6amQ==",
             "dev": true
         },
         "node_modules/@types/pikaday": {
@@ -457,9 +486,9 @@
             }
         },
         "node_modules/@webpack-cli/configtest": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz",
-            "integrity": "sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz",
+            "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==",
             "dev": true,
             "peerDependencies": {
                 "webpack": "4.x.x || 5.x.x",
@@ -467,9 +496,9 @@
             }
         },
         "node_modules/@webpack-cli/info": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz",
-            "integrity": "sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==",
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz",
+            "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==",
             "dev": true,
             "dependencies": {
                 "envinfo": "^7.7.3"
@@ -479,9 +508,9 @@
             }
         },
         "node_modules/@webpack-cli/serve": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz",
-            "integrity": "sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==",
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz",
+            "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==",
             "dev": true,
             "peerDependencies": {
                 "webpack-cli": "4.x.x"
@@ -533,14 +562,27 @@
             }
         },
         "node_modules/acorn-walk": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz",
-            "integrity": "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==",
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+            "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
             "dev": true,
             "engines": {
                 "node": ">=0.4.0"
             }
         },
+        "node_modules/aggregate-error": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+            "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+            "dev": true,
+            "dependencies": {
+                "clean-stack": "^2.0.0",
+                "indent-string": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/ajv": {
             "version": "6.12.6",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -582,9 +624,9 @@
             }
         },
         "node_modules/ansi-regex": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-            "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
             "engines": {
                 "node": ">=8"
             }
@@ -611,9 +653,9 @@
             "peer": true
         },
         "node_modules/are-we-there-yet": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-            "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+            "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
             "optional": true,
             "peer": true,
             "dependencies": {
@@ -680,9 +722,9 @@
             }
         },
         "node_modules/bit-field": {
-            "version": "1.5.2",
-            "resolved": "https://registry.npmjs.org/bit-field/-/bit-field-1.5.2.tgz",
-            "integrity": "sha512-CYS3HRGgIlm7A6/zqGFd/KPSUIv4EoEQVQ8mWcvBEdlf0db1q3j/fj5W/PXJasBfsvN2jM0Tzw3w1C7HUoR/fg==",
+            "version": "1.5.3",
+            "resolved": "https://registry.npmjs.org/bit-field/-/bit-field-1.5.3.tgz",
+            "integrity": "sha512-bSrkdGpRwPWWi9WOrrMV9xcF1PQAKGG5HnNgVUntIaL1OFND2n7LBM4p1VGXF6OYMKap0vB/OmzOhneDfSgIpg==",
             "dependencies": {
                 "fs-extra": "^10",
                 "onml": "^2.1.0",
@@ -736,9 +778,9 @@
             }
         },
         "node_modules/bit-field/node_modules/yargs": {
-            "version": "17.0.1",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.0.1.tgz",
-            "integrity": "sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==",
+            "version": "17.2.1",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz",
+            "integrity": "sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==",
             "dependencies": {
                 "cliui": "^7.0.2",
                 "escalade": "^3.1.1",
@@ -797,16 +839,16 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.16.6",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-            "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+            "version": "4.17.5",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
+            "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
             "dev": true,
             "dependencies": {
-                "caniuse-lite": "^1.0.30001219",
-                "colorette": "^1.2.2",
-                "electron-to-chromium": "^1.3.723",
+                "caniuse-lite": "^1.0.30001271",
+                "electron-to-chromium": "^1.3.878",
                 "escalade": "^3.1.1",
-                "node-releases": "^1.1.71"
+                "node-releases": "^2.0.1",
+                "picocolors": "^1.0.0"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -820,10 +862,39 @@
             }
         },
         "node_modules/buffer-from": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-            "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-            "dev": true
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+            "dev": true
+        },
+        "node_modules/cacache": {
+            "version": "15.3.0",
+            "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+            "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+            "dev": true,
+            "dependencies": {
+                "@npmcli/fs": "^1.0.0",
+                "@npmcli/move-file": "^1.0.1",
+                "chownr": "^2.0.0",
+                "fs-minipass": "^2.0.0",
+                "glob": "^7.1.4",
+                "infer-owner": "^1.0.4",
+                "lru-cache": "^6.0.0",
+                "minipass": "^3.1.1",
+                "minipass-collect": "^1.0.2",
+                "minipass-flush": "^1.0.5",
+                "minipass-pipeline": "^1.2.2",
+                "mkdirp": "^1.0.3",
+                "p-map": "^4.0.0",
+                "promise-inflight": "^1.0.1",
+                "rimraf": "^3.0.2",
+                "ssri": "^8.0.1",
+                "tar": "^6.0.2",
+                "unique-filename": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
         },
         "node_modules/callsites": {
             "version": "3.1.0",
@@ -866,9 +937,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001246",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001246.tgz",
-            "integrity": "sha512-Tc+ff0Co/nFNbLOrziBXmMVtpt9S2c2Y+Z9Nk9Khj09J+0zR9ejvIW5qkZAErCbOrVODCx/MN+GpB5FNBs5GFA==",
+            "version": "1.0.30001271",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
+            "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
             "dev": true,
             "funding": {
                 "type": "opencollective",
@@ -901,9 +972,9 @@
             }
         },
         "node_modules/chalk": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-            "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
             "dependencies": {
                 "ansi-styles": "^4.1.0",
@@ -917,11 +988,13 @@
             }
         },
         "node_modules/chownr": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-            "optional": true,
-            "peer": true
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+            "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
         },
         "node_modules/chrome-trace-event": {
             "version": "1.0.3",
@@ -933,9 +1006,9 @@
             }
         },
         "node_modules/clean-css": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
-            "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+            "version": "4.2.4",
+            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
+            "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
             "dev": true,
             "dependencies": {
                 "source-map": "~0.6.0"
@@ -944,6 +1017,15 @@
                 "node": ">= 4.0"
             }
         },
+        "node_modules/clean-stack": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+            "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/cliui": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
@@ -1016,9 +1098,9 @@
             }
         },
         "node_modules/codemirror": {
-            "version": "5.62.2",
-            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz",
-            "integrity": "sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw=="
+            "version": "5.63.3",
+            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.3.tgz",
+            "integrity": "sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw=="
         },
         "node_modules/color-convert": {
             "version": "2.0.1",
@@ -1037,15 +1119,15 @@
             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         },
         "node_modules/colord": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/colord/-/colord-2.3.0.tgz",
-            "integrity": "sha512-0NaS8lq6xZ9Zb+cWRwQf6ql1Z/7HMIAMzPrM2pgfAqskGAhUksBcaau6W8sL+6OK0xIujcSo1TJfdctG7K85Qg==",
+            "version": "2.9.1",
+            "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.1.tgz",
+            "integrity": "sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw==",
             "dev": true
         },
         "node_modules/colorette": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-            "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+            "version": "2.0.16",
+            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+            "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
             "dev": true
         },
         "node_modules/commander": {
@@ -1057,6 +1139,35 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/commondir": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+            "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+            "dev": true
+        },
+        "node_modules/compression-webpack-plugin": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz",
+            "integrity": "sha512-BEHft9M6lwOqVIQFMS/YJGmeCYXVOakC5KzQk05TFpMBlODByh1qNsZCWjUBxCQhUP9x0WfGidxTbGkjbWO/TQ==",
+            "dev": true,
+            "dependencies": {
+                "cacache": "^15.0.5",
+                "find-cache-dir": "^3.3.1",
+                "schema-utils": "^3.0.0",
+                "serialize-javascript": "^5.0.1",
+                "webpack-sources": "^1.4.3"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.0.0 || ^5.0.0"
+            }
+        },
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -1096,9 +1207,9 @@
             }
         },
         "node_modules/core-js": {
-            "version": "3.15.2",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz",
-            "integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==",
+            "version": "3.18.3",
+            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.3.tgz",
+            "integrity": "sha512-tReEhtMReZaPFVw7dajMx0vlsz3oOb8ajgPoHVYGxr8ErnZ6PcYEvvmjGmXlfpnxpkYSdOQttjB+MvVbCGfvLw==",
             "hasInstallScript": true,
             "funding": {
                 "type": "opencollective",
@@ -1106,9 +1217,9 @@
             }
         },
         "node_modules/core-util-is": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-            "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
             "optional": true,
             "peer": true
         },
@@ -1136,9 +1247,9 @@
             }
         },
         "node_modules/css-declaration-sorter": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.0.3.tgz",
-            "integrity": "sha512-52P95mvW1SMzuRZegvpluT6yEv0FqQusydKQPZsNN5Q7hh8EwQvN8E2nwuJ16BBvNN6LcoIZXu/Bk58DAhrrxw==",
+            "version": "6.1.3",
+            "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz",
+            "integrity": "sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA==",
             "dev": true,
             "dependencies": {
                 "timsort": "^0.3.0"
@@ -1179,16 +1290,16 @@
             }
         },
         "node_modules/css-minimizer-webpack-plugin": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.0.2.tgz",
-            "integrity": "sha512-B3I5e17RwvKPJwsxjjWcdgpU/zqylzK1bPVghcmpFHRL48DXiBgrtqz1BJsn68+t/zzaLp9kYAaEDvQ7GyanFQ==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.1.1.tgz",
+            "integrity": "sha512-KlB8l5uoNcf9F7i5kXnkxoqJGd2BXH4f0+Lj2vSWSmuvMLYO1kNsJ1KHSzeDW8e45/whgSOPcKVT/3JopkT8dg==",
             "dev": true,
             "dependencies": {
                 "cssnano": "^5.0.6",
                 "jest-worker": "^27.0.2",
                 "p-limit": "^3.0.2",
                 "postcss": "^8.3.5",
-                "schema-utils": "^3.0.0",
+                "schema-utils": "^3.1.0",
                 "serialize-javascript": "^6.0.0",
                 "source-map": "^0.6.1"
             },
@@ -1208,6 +1319,9 @@
                 },
                 "csso": {
                     "optional": true
+                },
+                "esbuild": {
+                    "optional": true
                 }
             }
         },
@@ -1250,9 +1364,9 @@
             }
         },
         "node_modules/css-what": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
-            "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+            "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
             "dev": true,
             "engines": {
                 "node": ">= 6"
@@ -1274,12 +1388,12 @@
             }
         },
         "node_modules/cssnano": {
-            "version": "5.0.7",
-            "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.7.tgz",
-            "integrity": "sha512-7C0tbb298hef3rq+TtBbMuezBQ9VrFtrQEsPNuBKNVgWny/67vdRsnq8EoNu7TRjAHURgYvWlRIpCUmcMZkRzw==",
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.8.tgz",
+            "integrity": "sha512-Lda7geZU0Yu+RZi2SGpjYuQz4HI4/1Y+BhdD0jL7NXAQ5larCzVn+PUGuZbDMYz904AXXCOgO5L1teSvgu7aFg==",
             "dev": true,
             "dependencies": {
-                "cssnano-preset-default": "^5.1.3",
+                "cssnano-preset-default": "^5.1.4",
                 "is-resolvable": "^1.1.0",
                 "lilconfig": "^2.0.3",
                 "yaml": "^1.10.2"
@@ -1296,9 +1410,9 @@
             }
         },
         "node_modules/cssnano-preset-default": {
-            "version": "5.1.3",
-            "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.3.tgz",
-            "integrity": "sha512-qo9tX+t4yAAZ/yagVV3b+QBKeLklQbmgR3wI7mccrDcR+bEk9iHgZN1E7doX68y9ThznLya3RDmR+nc7l6/2WQ==",
+            "version": "5.1.4",
+            "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz",
+            "integrity": "sha512-sPpQNDQBI3R/QsYxQvfB4mXeEcWuw0wGtKtmS5eg8wudyStYMgKOQT39G07EbW1LB56AOYrinRS9f0ig4Y3MhQ==",
             "dev": true,
             "dependencies": {
                 "css-declaration-sorter": "^6.0.3",
@@ -1313,7 +1427,7 @@
                 "postcss-merge-longhand": "^5.0.2",
                 "postcss-merge-rules": "^5.0.2",
                 "postcss-minify-font-values": "^5.0.1",
-                "postcss-minify-gradients": "^5.0.1",
+                "postcss-minify-gradients": "^5.0.2",
                 "postcss-minify-params": "^5.0.1",
                 "postcss-minify-selectors": "^5.1.0",
                 "postcss-normalize-charset": "^5.0.1",
@@ -1598,9 +1712,9 @@
             }
         },
         "node_modules/deep-is": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-            "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
             "dev": true
         },
         "node_modules/delegates": {
@@ -1683,9 +1797,9 @@
             ]
         },
         "node_modules/domhandler": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
-            "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz",
+            "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==",
             "dev": true,
             "dependencies": {
                 "domelementtype": "^2.2.0"
@@ -1698,9 +1812,9 @@
             }
         },
         "node_modules/domutils": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
-            "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+            "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
             "dev": true,
             "dependencies": {
                 "dom-serializer": "^1.0.1",
@@ -1728,9 +1842,9 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.3.784",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.784.tgz",
-            "integrity": "sha512-JTPxdUibkefeomWNaYs8lI/x/Zb4cOhZWX+d7kpzsNKzUd07pNuo/AcHeNJ/qgEchxM1IAxda9aaGUhKN/poOg==",
+            "version": "1.3.878",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.878.tgz",
+            "integrity": "sha512-O6yxWCN9ph2AdspAIszBnd9v8s11hQx8ub9w4UGApzmNRnoKhbulOWqbO8THEQec/aEHtvy+donHZMlh6l1rbA==",
             "dev": true
         },
         "node_modules/emoji-regex": {
@@ -1756,9 +1870,9 @@
             }
         },
         "node_modules/enhanced-resolve": {
-            "version": "5.8.2",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
-            "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
+            "version": "5.8.3",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
+            "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
             "dev": true,
             "dependencies": {
                 "graceful-fs": "^4.2.4",
@@ -1802,9 +1916,9 @@
             }
         },
         "node_modules/es-module-lexer": {
-            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.7.1.tgz",
-            "integrity": "sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw==",
+            "version": "0.9.3",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+            "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
             "dev": true
         },
         "node_modules/escalade": {
@@ -1828,9 +1942,9 @@
             }
         },
         "node_modules/eslint": {
-            "version": "7.31.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz",
-            "integrity": "sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==",
+            "version": "7.32.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+            "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
             "dev": true,
             "dependencies": {
                 "@babel/code-frame": "7.12.11",
@@ -2099,9 +2213,9 @@
             "dev": true
         },
         "node_modules/fastq": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz",
-            "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==",
+            "version": "1.13.0",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+            "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
             "dev": true,
             "dependencies": {
                 "reusify": "^1.0.4"
@@ -2131,6 +2245,23 @@
                 "node": ">=8"
             }
         },
+        "node_modules/find-cache-dir": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+            "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+            "dev": true,
+            "dependencies": {
+                "commondir": "^1.0.1",
+                "make-dir": "^3.0.2",
+                "pkg-dir": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+            }
+        },
         "node_modules/find-up": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -2158,9 +2289,9 @@
             }
         },
         "node_modules/flatted": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.1.tgz",
-            "integrity": "sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==",
+            "version": "3.2.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+            "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
             "dev": true
         },
         "node_modules/fs-extra": {
@@ -2177,13 +2308,15 @@
             }
         },
         "node_modules/fs-minipass": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-            "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
-            "optional": true,
-            "peer": true,
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+            "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+            "dev": true,
             "dependencies": {
-                "minipass": "^2.6.0"
+                "minipass": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 8"
             }
         },
         "node_modules/fs.realpath": {
@@ -2289,9 +2422,9 @@
             }
         },
         "node_modules/glob": {
-            "version": "7.1.7",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-            "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+            "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
             "devOptional": true,
             "dependencies": {
                 "fs.realpath": "^1.0.0",
@@ -2327,9 +2460,9 @@
             "dev": true
         },
         "node_modules/globals": {
-            "version": "13.10.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-            "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
+            "version": "13.11.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+            "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
             "dev": true,
             "dependencies": {
                 "type-fest": "^0.20.2"
@@ -2371,9 +2504,9 @@
             }
         },
         "node_modules/graceful-fs": {
-            "version": "4.2.6",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-            "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
+            "version": "4.2.8",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+            "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
         },
         "node_modules/gzip-size": {
             "version": "6.0.0",
@@ -2440,12 +2573,6 @@
                 "he": "bin/he"
             }
         },
-        "node_modules/hex-color-regex": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-            "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
-            "dev": true
-        },
         "node_modules/hot-formula-parser": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/hot-formula-parser/-/hot-formula-parser-3.0.2.tgz",
@@ -2455,18 +2582,6 @@
                 "tiny-emitter": "^2.1.0"
             }
         },
-        "node_modules/hsl-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-            "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
-            "dev": true
-        },
-        "node_modules/hsla-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-            "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
-            "dev": true
-        },
         "node_modules/html-loader": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-2.1.2.tgz",
@@ -2509,13 +2624,13 @@
             }
         },
         "node_modules/html-webpack-plugin": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.3.2.tgz",
-            "integrity": "sha512-HvB33boVNCz2lTyBsSiMffsJ+m0YLIQ+pskblXgN9fnjS1BgEcuAfdInfXfGrkdXV406k9FiDi86eVCDBgJOyQ==",
+            "version": "5.4.0",
+            "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.4.0.tgz",
+            "integrity": "sha512-cSUdckNOIqKc0nOrCJG7zkvzEIUcXjzEiVbKdEdIzW3BD5T4xPK6boV1mrTrPDZiL+aAr/j45eqbNL1akU2ZRA==",
             "dev": true,
             "dependencies": {
-                "@types/html-minifier-terser": "^5.0.0",
-                "html-minifier-terser": "^5.0.1",
+                "@types/html-minifier-terser": "^6.0.0",
+                "html-minifier-terser": "^6.0.2",
                 "lodash": "^4.17.21",
                 "pretty-error": "^3.0.4",
                 "tapable": "^2.0.0"
@@ -2531,6 +2646,80 @@
                 "webpack": "^5.20.0"
             }
         },
+        "node_modules/html-webpack-plugin/node_modules/clean-css": {
+            "version": "5.2.2",
+            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz",
+            "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==",
+            "dev": true,
+            "dependencies": {
+                "source-map": "~0.6.0"
+            },
+            "engines": {
+                "node": ">= 10.0"
+            }
+        },
+        "node_modules/html-webpack-plugin/node_modules/commander": {
+            "version": "8.3.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+            "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+            "dev": true,
+            "engines": {
+                "node": ">= 12"
+            }
+        },
+        "node_modules/html-webpack-plugin/node_modules/html-minifier-terser": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.0.2.tgz",
+            "integrity": "sha512-AgYO3UGhMYQx2S/FBJT3EM0ZYcKmH6m9XL9c1v77BeK/tYJxGPxT1/AtsdUi4FcP8kZGmqqnItCcjFPcX9hk6A==",
+            "dev": true,
+            "dependencies": {
+                "camel-case": "^4.1.2",
+                "clean-css": "^5.1.5",
+                "commander": "^8.1.0",
+                "he": "^1.2.0",
+                "param-case": "^3.0.4",
+                "relateurl": "^0.2.7",
+                "terser": "^5.7.2"
+            },
+            "bin": {
+                "html-minifier-terser": "cli.js"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/html-webpack-plugin/node_modules/terser": {
+            "version": "5.9.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
+            "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
+            "dev": true,
+            "dependencies": {
+                "commander": "^2.20.0",
+                "source-map": "~0.7.2",
+                "source-map-support": "~0.5.20"
+            },
+            "bin": {
+                "terser": "bin/terser"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/html-webpack-plugin/node_modules/terser/node_modules/commander": {
+            "version": "2.20.3",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "dev": true
+        },
+        "node_modules/html-webpack-plugin/node_modules/terser/node_modules/source-map": {
+            "version": "0.7.3",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+            "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
+            }
+        },
         "node_modules/htmlparser2": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
@@ -2618,9 +2807,9 @@
             }
         },
         "node_modules/import-local": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-            "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
+            "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
             "dev": true,
             "dependencies": {
                 "pkg-dir": "^4.2.0",
@@ -2642,6 +2831,21 @@
                 "node": ">=0.8.19"
             }
         },
+        "node_modules/indent-string": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+            "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/infer-owner": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+            "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+            "dev": true
+        },
         "node_modules/inflight": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -2696,33 +2900,10 @@
                 "node": ">=8"
             }
         },
-        "node_modules/is-color-stop": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-            "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
-            "dev": true,
-            "dependencies": {
-                "css-color-names": "^0.0.4",
-                "hex-color-regex": "^1.1.0",
-                "hsl-regex": "^1.0.0",
-                "hsla-regex": "^1.0.0",
-                "rgb-regex": "^1.0.1",
-                "rgba-regex": "^1.0.0"
-            }
-        },
-        "node_modules/is-color-stop/node_modules/css-color-names": {
-            "version": "0.0.4",
-            "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-            "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-            "dev": true,
-            "engines": {
-                "node": "*"
-            }
-        },
         "node_modules/is-core-module": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
-            "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+            "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
             "dependencies": {
                 "has": "^1.0.3"
             },
@@ -2748,9 +2929,9 @@
             }
         },
         "node_modules/is-glob": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-            "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
             "dev": true,
             "dependencies": {
                 "is-extglob": "^2.1.1"
@@ -2787,12 +2968,15 @@
             "dev": true
         },
         "node_modules/is-stream": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-            "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
             "dev": true,
             "engines": {
                 "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/isarray": {
@@ -2817,9 +3001,9 @@
             }
         },
         "node_modules/jest-worker": {
-            "version": "27.0.6",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz",
-            "integrity": "sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==",
+            "version": "27.3.1",
+            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
+            "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
             "dev": true,
             "dependencies": {
                 "@types/node": "*",
@@ -2943,9 +3127,9 @@
             }
         },
         "node_modules/jstat": {
-            "version": "1.9.4",
-            "resolved": "https://registry.npmjs.org/jstat/-/jstat-1.9.4.tgz",
-            "integrity": "sha512-IiTPlI7pcrsq41EpDzrghlA1fhiC9GXxNqO4k5ogsjsM1XAWQ8zESH/bZsExLVgQsYpXE+7c11kEbbuxTLUpJQ=="
+            "version": "1.9.5",
+            "resolved": "https://registry.npmjs.org/jstat/-/jstat-1.9.5.tgz",
+            "integrity": "sha512-cWnp4vObF5GmB2XsIEzxI/1ZTcYlcfNqxQ/9Fp5KFUa0Jf/4tO0ZkGVnqoEHDisJvYgvn5n3eWZbd2xTVJJPUQ=="
         },
         "node_modules/jsuites": {
             "version": "2.8.0",
@@ -3103,6 +3287,30 @@
                 "node": ">=10"
             }
         },
+        "node_modules/make-dir": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+            "dev": true,
+            "dependencies": {
+                "semver": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/make-dir/node_modules/semver": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
         "node_modules/map-age-cleaner": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -3174,21 +3382,21 @@
             }
         },
         "node_modules/mime-db": {
-            "version": "1.48.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-            "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
+            "version": "1.50.0",
+            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
+            "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
             "dev": true,
             "engines": {
                 "node": ">= 0.6"
             }
         },
         "node_modules/mime-types": {
-            "version": "2.1.31",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-            "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+            "version": "2.1.33",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
+            "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
             "dev": true,
             "dependencies": {
-                "mime-db": "1.48.0"
+                "mime-db": "1.50.0"
             },
             "engines": {
                 "node": ">= 0.6"
@@ -3242,44 +3450,76 @@
             "devOptional": true
         },
         "node_modules/minipass": {
-            "version": "2.9.0",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-            "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-            "optional": true,
-            "peer": true,
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
+            "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
+            "dev": true,
             "dependencies": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "node_modules/minipass/node_modules/yallist": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-            "optional": true,
-            "peer": true
-        },
-        "node_modules/minizlib": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-            "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
-            "optional": true,
-            "peer": true,
+        "node_modules/minipass-collect": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+            "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+            "dev": true,
             "dependencies": {
-                "minipass": "^2.9.0"
+                "minipass": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "node_modules/mkdirp": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-            "optional": true,
-            "peer": true,
+        "node_modules/minipass-flush": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+            "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+            "dev": true,
             "dependencies": {
-                "minimist": "^1.2.5"
+                "minipass": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/minipass-pipeline": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+            "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+            "dev": true,
+            "dependencies": {
+                "minipass": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/minizlib": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+            "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+            "dev": true,
+            "dependencies": {
+                "minipass": "^3.0.0",
+                "yallist": "^4.0.0"
             },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/mkdirp": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+            "dev": true,
             "bin": {
                 "mkdirp": "bin/cmd.js"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
         "node_modules/moment": {
@@ -3297,16 +3537,22 @@
             "devOptional": true
         },
         "node_modules/nan": {
-            "version": "2.14.2",
-            "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-            "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+            "version": "2.15.0",
+            "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
+            "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
             "optional": true,
             "peer": true
         },
+        "node_modules/nanocolors": {
+            "version": "0.1.12",
+            "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.1.12.tgz",
+            "integrity": "sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==",
+            "dev": true
+        },
         "node_modules/nanoid": {
-            "version": "3.1.23",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
-            "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
+            "version": "3.1.30",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
+            "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
             "dev": true,
             "bin": {
                 "nanoid": "bin/nanoid.cjs"
@@ -3322,9 +3568,9 @@
             "dev": true
         },
         "node_modules/needle": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz",
-            "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==",
+            "version": "2.9.1",
+            "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
+            "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
             "optional": true,
             "peer": true,
             "dependencies": {
@@ -3371,9 +3617,12 @@
             }
         },
         "node_modules/node-fetch": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-            "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+            "version": "2.6.5",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
+            "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+            "dependencies": {
+                "whatwg-url": "^5.0.0"
+            },
             "engines": {
                 "node": "4.x || >=6.0.0"
             }
@@ -3401,6 +3650,57 @@
                 "node-pre-gyp": "bin/node-pre-gyp"
             }
         },
+        "node_modules/node-pre-gyp/node_modules/chownr": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+            "optional": true,
+            "peer": true
+        },
+        "node_modules/node-pre-gyp/node_modules/fs-minipass": {
+            "version": "1.2.7",
+            "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+            "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "minipass": "^2.6.0"
+            }
+        },
+        "node_modules/node-pre-gyp/node_modules/minipass": {
+            "version": "2.9.0",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+            "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+            }
+        },
+        "node_modules/node-pre-gyp/node_modules/minizlib": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+            "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "minipass": "^2.9.0"
+            }
+        },
+        "node_modules/node-pre-gyp/node_modules/mkdirp": {
+            "version": "0.5.5",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "minimist": "^1.2.5"
+            },
+            "bin": {
+                "mkdirp": "bin/cmd.js"
+            }
+        },
         "node_modules/node-pre-gyp/node_modules/rimraf": {
             "version": "2.7.1",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -3424,10 +3724,36 @@
                 "semver": "bin/semver"
             }
         },
+        "node_modules/node-pre-gyp/node_modules/tar": {
+            "version": "4.4.19",
+            "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+            "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+            "optional": true,
+            "peer": true,
+            "dependencies": {
+                "chownr": "^1.1.4",
+                "fs-minipass": "^1.2.7",
+                "minipass": "^2.9.0",
+                "minizlib": "^1.3.3",
+                "mkdirp": "^0.5.5",
+                "safe-buffer": "^5.2.1",
+                "yallist": "^3.1.1"
+            },
+            "engines": {
+                "node": ">=4.5"
+            }
+        },
+        "node_modules/node-pre-gyp/node_modules/yallist": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+            "optional": true,
+            "peer": true
+        },
         "node_modules/node-releases": {
-            "version": "1.1.73",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-            "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+            "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
             "dev": true
         },
         "node_modules/nopt": {
@@ -3520,9 +3846,9 @@
             }
         },
         "node_modules/nth-check": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
-            "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+            "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
             "dev": true,
             "dependencies": {
                 "boolbase": "^1.0.0"
@@ -3835,6 +4161,21 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/p-map": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+            "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+            "dev": true,
+            "dependencies": {
+                "aggregate-error": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/p-try": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -3922,6 +4263,12 @@
                 "node": ">=8"
             }
         },
+        "node_modules/picocolors": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+            "dev": true
+        },
         "node_modules/picomatch": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
@@ -3955,13 +4302,13 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.3.6",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz",
-            "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==",
+            "version": "8.3.11",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
+            "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
             "dev": true,
             "dependencies": {
-                "colorette": "^1.2.2",
-                "nanoid": "^3.1.23",
+                "nanoid": "^3.1.30",
+                "picocolors": "^1.0.0",
                 "source-map-js": "^0.6.2"
             },
             "engines": {
@@ -4118,13 +4465,13 @@
             }
         },
         "node_modules/postcss-minify-gradients": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.1.tgz",
-            "integrity": "sha512-odOwBFAIn2wIv+XYRpoN2hUV3pPQlgbJ10XeXPq8UY2N+9ZG42xu45lTn/g9zZ+d70NKSQD6EOi6UiCMu3FN7g==",
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz",
+            "integrity": "sha512-7Do9JP+wqSD6Prittitt2zDLrfzP9pqKs2EcLX7HJYxsxCOwrrcLt4x/ctQTsiOw+/8HYotAoqNkrzItL19SdQ==",
             "dev": true,
             "dependencies": {
+                "colord": "^2.6",
                 "cssnano-utils": "^2.0.1",
-                "is-color-stop": "^1.1.0",
                 "postcss-value-parser": "^4.1.0"
             },
             "engines": {
@@ -4501,6 +4848,12 @@
                 "node": ">=0.4.0"
             }
         },
+        "node_modules/promise-inflight": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+            "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+            "dev": true
+        },
         "node_modules/pump": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -4738,18 +5091,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/rgb-regex": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-            "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
-            "dev": true
-        },
-        "node_modules/rgba-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-            "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
-            "dev": true
-        },
         "node_modules/rimraf": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -4909,17 +5250,17 @@
             }
         },
         "node_modules/signal-exit": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-            "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+            "version": "3.0.5",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
+            "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="
         },
         "node_modules/sirv": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",
-            "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==",
+            "version": "1.0.18",
+            "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.18.tgz",
+            "integrity": "sha512-f2AOPogZmXgJ9Ma2M22ZEhc1dNtRIzcEkiflMFeVTRq+OViOZMvH1IPMVOwrKaxpSaHioBJiDR0SluRqGa7atA==",
             "dev": true,
             "dependencies": {
-                "@polka/url": "^1.0.0-next.15",
+                "@polka/url": "^1.0.0-next.20",
                 "mime": "^2.3.1",
                 "totalist": "^1.0.0"
             },
@@ -4978,9 +5319,9 @@
             }
         },
         "node_modules/source-map-support": {
-            "version": "0.5.19",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-            "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+            "version": "0.5.20",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
+            "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
             "dev": true,
             "dependencies": {
                 "buffer-from": "^1.0.0",
@@ -4998,6 +5339,18 @@
             "resolved": "https://registry.npmjs.org/sql.js/-/sql.js-1.5.0.tgz",
             "integrity": "sha512-Qqr6HgX/hCDpLFWdN0BNoNpYQ2c1tOl1c3HGI0cshjaFSAWszKICuLZ9CyFUvRFPpEGW8RzHzwuXWWvXVGTKBg=="
         },
+        "node_modules/ssri": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+            "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+            "dev": true,
+            "dependencies": {
+                "minipass": "^3.1.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
         "node_modules/stable": {
             "version": "0.1.8",
             "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
@@ -5022,24 +5375,24 @@
             "peer": true
         },
         "node_modules/string-width": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-            "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
             "dependencies": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.0"
+                "strip-ansi": "^6.0.1"
             },
             "engines": {
                 "node": ">=8"
             }
         },
         "node_modules/strip-ansi": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-            "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "dependencies": {
-                "ansi-regex": "^5.0.0"
+                "ansi-regex": "^5.0.1"
             },
             "engines": {
                 "node": ">=8"
@@ -5123,17 +5476,17 @@
             }
         },
         "node_modules/svgo": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.1.tgz",
-            "integrity": "sha512-riDDIQgXpEnn0BEl9Gvhh1LNLIyiusSpt64IR8upJu7MwxnzetmF/Y57pXQD2NMX2lVyMRzXt5f2M5rO4wG7Dw==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.7.0.tgz",
+            "integrity": "sha512-aDLsGkre4fTDCWvolyW+fs8ZJFABpzLXbtdK1y71CKnHzAnpDxKXPj2mNKj+pyOXUCzFHzuxRJ94XOFygOWV3w==",
             "dev": true,
             "dependencies": {
-                "@trysound/sax": "0.1.1",
-                "chalk": "^4.1.0",
-                "commander": "^7.1.0",
+                "@trysound/sax": "0.2.0",
+                "commander": "^7.2.0",
                 "css-select": "^4.1.3",
-                "css-tree": "^1.1.2",
+                "css-tree": "^1.1.3",
                 "csso": "^4.2.0",
+                "nanocolors": "^0.1.12",
                 "stable": "^0.1.8"
             },
             "bin": {
@@ -5153,26 +5506,26 @@
             }
         },
         "node_modules/table": {
-            "version": "6.7.1",
-            "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-            "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+            "version": "6.7.2",
+            "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
+            "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
             "dev": true,
             "dependencies": {
                 "ajv": "^8.0.1",
                 "lodash.clonedeep": "^4.5.0",
                 "lodash.truncate": "^4.4.2",
                 "slice-ansi": "^4.0.0",
-                "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.0"
+                "string-width": "^4.2.3",
+                "strip-ansi": "^6.0.1"
             },
             "engines": {
                 "node": ">=10.0.0"
             }
         },
         "node_modules/table/node_modules/ajv": {
-            "version": "8.6.2",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
-            "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
+            "version": "8.6.3",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+            "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
             "dev": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.1",
@@ -5192,40 +5545,31 @@
             "dev": true
         },
         "node_modules/tapable": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-            "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
             "dev": true,
             "engines": {
                 "node": ">=6"
             }
         },
         "node_modules/tar": {
-            "version": "4.4.13",
-            "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-            "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-            "optional": true,
-            "peer": true,
+            "version": "6.1.11",
+            "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+            "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
+            "dev": true,
             "dependencies": {
-                "chownr": "^1.1.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.8.6",
-                "minizlib": "^1.2.1",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.3"
+                "chownr": "^2.0.0",
+                "fs-minipass": "^2.0.0",
+                "minipass": "^3.0.0",
+                "minizlib": "^2.1.1",
+                "mkdirp": "^1.0.3",
+                "yallist": "^4.0.0"
             },
             "engines": {
-                "node": ">=4.5"
+                "node": ">= 10"
             }
         },
-        "node_modules/tar/node_modules/yallist": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-            "optional": true,
-            "peer": true
-        },
         "node_modules/terser": {
             "version": "4.8.0",
             "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
@@ -5244,17 +5588,17 @@
             }
         },
         "node_modules/terser-webpack-plugin": {
-            "version": "5.1.4",
-            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz",
-            "integrity": "sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==",
+            "version": "5.2.4",
+            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz",
+            "integrity": "sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==",
             "dev": true,
             "dependencies": {
-                "jest-worker": "^27.0.2",
+                "jest-worker": "^27.0.6",
                 "p-limit": "^3.1.0",
-                "schema-utils": "^3.0.0",
+                "schema-utils": "^3.1.1",
                 "serialize-javascript": "^6.0.0",
                 "source-map": "^0.6.1",
-                "terser": "^5.7.0"
+                "terser": "^5.7.2"
             },
             "engines": {
                 "node": ">= 10.13.0"
@@ -5265,6 +5609,17 @@
             },
             "peerDependencies": {
                 "webpack": "^5.1.0"
+            },
+            "peerDependenciesMeta": {
+                "@swc/core": {
+                    "optional": true
+                },
+                "esbuild": {
+                    "optional": true
+                },
+                "uglify-js": {
+                    "optional": true
+                }
             }
         },
         "node_modules/terser-webpack-plugin/node_modules/commander": {
@@ -5283,14 +5638,14 @@
             }
         },
         "node_modules/terser-webpack-plugin/node_modules/terser": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.1.tgz",
-            "integrity": "sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==",
+            "version": "5.9.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
+            "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
             "dev": true,
             "dependencies": {
                 "commander": "^2.20.0",
                 "source-map": "~0.7.2",
-                "source-map-support": "~0.5.19"
+                "source-map-support": "~0.5.20"
             },
             "bin": {
                 "terser": "bin/terser"
@@ -5370,10 +5725,15 @@
                 "node": ">=6"
             }
         },
+        "node_modules/tr46": {
+            "version": "0.0.3",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+            "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+        },
         "node_modules/tslib": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+            "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
             "dev": true
         },
         "node_modules/tspan": {
@@ -5411,6 +5771,24 @@
             "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
             "dev": true
         },
+        "node_modules/unique-filename": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+            "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+            "dev": true,
+            "dependencies": {
+                "unique-slug": "^2.0.0"
+            }
+        },
+        "node_modules/unique-slug": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+            "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+            "dev": true,
+            "dependencies": {
+                "imurmurhash": "^0.1.4"
+            }
+        },
         "node_modules/universalify": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -5865,9 +6243,9 @@
             "integrity": "sha512-Tc85J2ofMZZOsxiqDM9sbvfsa+Vdo3GwNLjEEsPOsCDeYqsUHKAlc1IpbbhPLZ6jusyM9Lk0e1izF64GGklFDg=="
         },
         "node_modules/vega-statistics": {
-            "version": "1.7.9",
-            "resolved": "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.9.tgz",
-            "integrity": "sha512-T0sd2Z08k/mHxr1Vb4ajLWytPluLFYnsYqyk4SIS5czzUs4errpP2gUu63QJ0B7CKNu33vnS9WdOMOo/Eprr/Q==",
+            "version": "1.7.10",
+            "resolved": "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.10.tgz",
+            "integrity": "sha512-QLb12gcfpDZ9K5h3TLGrlz4UXDH9wSPyg9LLfOJZacxvvJEPohacUQNrGEAVtFO9ccUCerRfH9cs25ZtHsOZrw==",
             "dependencies": {
                 "d3-array": "^2.7.1"
             }
@@ -5901,17 +6279,33 @@
             }
         },
         "node_modules/vega-typings": {
-            "version": "0.21.0",
-            "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.21.0.tgz",
-            "integrity": "sha512-dG0RtnJUn3+BQMO4NjjTdcp5UTBR56yQsLXPPCAFUHeLuycEVKlyhBa/kbvAZv2r+QxdeEYwKUNYy9CQotF5KA==",
+            "version": "0.22.1",
+            "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.22.1.tgz",
+            "integrity": "sha512-88cIrjmoTxo/0nWTf+GuitkFhirHWVWCfymADiCUXt6s9arpQ6XPP5xjrN5KDc0LZd9xr7p4FIiEgADghgLTgw==",
             "dependencies": {
+                "vega-event-selector": "^3.0.0",
+                "vega-expression": "^5.0.0",
                 "vega-util": "^1.15.2"
             }
         },
+        "node_modules/vega-typings/node_modules/vega-event-selector": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-3.0.0.tgz",
+            "integrity": "sha512-Gls93/+7tEJGE3kUuUnxrBIxtvaNeF01VIFB2Q2Of2hBIBvtHX74jcAdDtkh5UhhoYGD8Q1J30P5cqEBEwtPoQ=="
+        },
+        "node_modules/vega-typings/node_modules/vega-expression": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/vega-expression/-/vega-expression-5.0.0.tgz",
+            "integrity": "sha512-y5+c2frq0tGwJ7vYXzZcfVcIRF/QGfhf2e+bV1Z0iQs+M2lI1II1GPDdmOcMKimpoCVp/D61KUJDIGE1DSmk2w==",
+            "dependencies": {
+                "@types/estree": "^0.0.50",
+                "vega-util": "^1.16.0"
+            }
+        },
         "node_modules/vega-util": {
-            "version": "1.16.1",
-            "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.16.1.tgz",
-            "integrity": "sha512-FdgD72fmZMPJE99FxvFXth0IL4BbLA93WmBg/lvcJmfkK4Uf90WIlvGwaIUdSePIsdpkZjBPyQcHMQ8OcS8Smg=="
+            "version": "1.17.0",
+            "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.17.0.tgz",
+            "integrity": "sha512-HTaydZd9De3yf+8jH66zL4dXJ1d1p5OIFyoBzFiOli4IJbwkL1jrefCKz6AHDm1kYBzDJ0X4bN+CzZSCTvNk1w=="
         },
         "node_modules/vega-view": {
             "version": "3.4.1",
@@ -5983,20 +6377,25 @@
             }
         },
         "node_modules/wavedrom": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/wavedrom/-/wavedrom-2.8.1.tgz",
-            "integrity": "sha512-UTU27qnkfv+qLCwilm+T+m6zcPzSFP7i5HgtZkihbDeVIUasa3npnWhK3ogJ6gmOYhTK1lIh8KDztEuod2CM/g==",
+            "version": "2.9.0",
+            "resolved": "https://registry.npmjs.org/wavedrom/-/wavedrom-2.9.0.tgz",
+            "integrity": "sha512-PazQFmo/DFJU5AoZt+1LxKTEkgokK8Q1Nsc1s/6Y6LEY9z4WKv8RWn6uvh+p6Jh1sLezknACZTCrTasvpwEaiQ==",
             "dependencies": {
-                "bit-field": "^1.5.1",
+                "bit-field": "^1.5.3",
                 "logidrom": "^0.3.1",
                 "onml": "^2.1.0",
                 "tspan": "^0.4.0"
             }
         },
+        "node_modules/webidl-conversions": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+            "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
         "node_modules/webpack": {
-            "version": "5.46.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.46.0.tgz",
-            "integrity": "sha512-qxD0t/KTedJbpcXUmvMxY5PUvXDbF8LsThCzqomeGaDlCA6k998D8yYVwZMvO8sSM3BTEOaD4uzFniwpHaTIJw==",
+            "version": "5.59.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.59.1.tgz",
+            "integrity": "sha512-I01IQV9K96FlpXX3V0L4nvd7gb0r7thfuu1IfT2P4uOHOA77nKARAKDYGe/tScSHKnffNIyQhLC8kRXzY4KEHQ==",
             "dev": true,
             "dependencies": {
                 "@types/eslint-scope": "^3.7.0",
@@ -6005,10 +6404,11 @@
                 "@webassemblyjs/wasm-edit": "1.11.1",
                 "@webassemblyjs/wasm-parser": "1.11.1",
                 "acorn": "^8.4.1",
+                "acorn-import-assertions": "^1.7.6",
                 "browserslist": "^4.14.5",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.8.0",
-                "es-module-lexer": "^0.7.1",
+                "enhanced-resolve": "^5.8.3",
+                "es-module-lexer": "^0.9.0",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",
                 "glob-to-regexp": "^0.4.1",
@@ -6021,7 +6421,7 @@
                 "tapable": "^2.1.1",
                 "terser-webpack-plugin": "^5.1.3",
                 "watchpack": "^2.2.0",
-                "webpack-sources": "^2.3.1"
+                "webpack-sources": "^3.2.0"
             },
             "bin": {
                 "webpack": "bin/webpack.js"
@@ -6040,15 +6440,15 @@
             }
         },
         "node_modules/webpack-bundle-analyzer": {
-            "version": "4.4.2",
-            "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz",
-            "integrity": "sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ==",
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz",
+            "integrity": "sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==",
             "dev": true,
             "dependencies": {
                 "acorn": "^8.0.4",
                 "acorn-walk": "^8.0.0",
                 "chalk": "^4.1.0",
-                "commander": "^6.2.0",
+                "commander": "^7.2.0",
                 "gzip-size": "^6.0.0",
                 "lodash": "^4.17.20",
                 "opener": "^1.5.2",
@@ -6063,9 +6463,9 @@
             }
         },
         "node_modules/webpack-bundle-analyzer/node_modules/acorn": {
-            "version": "8.4.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-            "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+            "version": "8.5.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
+            "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
             "dev": true,
             "bin": {
                 "acorn": "bin/acorn"
@@ -6075,32 +6475,31 @@
             }
         },
         "node_modules/webpack-bundle-analyzer/node_modules/commander": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-            "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
             "dev": true,
             "engines": {
-                "node": ">= 6"
+                "node": ">= 10"
             }
         },
         "node_modules/webpack-cli": {
-            "version": "4.7.2",
-            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz",
-            "integrity": "sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz",
+            "integrity": "sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==",
             "dev": true,
             "dependencies": {
                 "@discoveryjs/json-ext": "^0.5.0",
-                "@webpack-cli/configtest": "^1.0.4",
-                "@webpack-cli/info": "^1.3.0",
-                "@webpack-cli/serve": "^1.5.1",
-                "colorette": "^1.2.1",
+                "@webpack-cli/configtest": "^1.1.0",
+                "@webpack-cli/info": "^1.4.0",
+                "@webpack-cli/serve": "^1.6.0",
+                "colorette": "^2.0.14",
                 "commander": "^7.0.0",
                 "execa": "^5.0.0",
                 "fastest-levenshtein": "^1.0.12",
                 "import-local": "^3.0.2",
                 "interpret": "^2.2.0",
                 "rechoir": "^0.7.0",
-                "v8-compile-cache": "^2.2.0",
                 "webpack-merge": "^5.7.3"
             },
             "bin": {
@@ -6160,9 +6559,9 @@
             }
         },
         "node_modules/webpack/node_modules/acorn": {
-            "version": "8.4.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-            "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+            "version": "8.5.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
+            "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
             "dev": true,
             "bin": {
                 "acorn": "bin/acorn"
@@ -6171,19 +6570,33 @@
                 "node": ">=0.4.0"
             }
         },
+        "node_modules/webpack/node_modules/acorn-import-assertions": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
+            "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
+            "dev": true,
+            "peerDependencies": {
+                "acorn": "^8"
+            }
+        },
         "node_modules/webpack/node_modules/webpack-sources": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-            "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz",
+            "integrity": "sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA==",
             "dev": true,
-            "dependencies": {
-                "source-list-map": "^2.0.1",
-                "source-map": "^0.6.1"
-            },
             "engines": {
                 "node": ">=10.13.0"
             }
         },
+        "node_modules/whatwg-url": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+            "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+            "dependencies": {
+                "tr46": "~0.0.3",
+                "webidl-conversions": "^3.0.0"
+            }
+        },
         "node_modules/which": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -6205,75 +6618,28 @@
             "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
         },
         "node_modules/wide-align": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-            "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
             "optional": true,
             "peer": true,
             "dependencies": {
-                "string-width": "^1.0.2 || 2"
-            }
-        },
-        "node_modules/wide-align/node_modules/ansi-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-            "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-            "optional": true,
-            "peer": true,
-            "engines": {
-                "node": ">=4"
+                "string-width": "^1.0.2 || 2 || 3 || 4"
             }
         },
-        "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
+        "node_modules/wildcard": {
             "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-            "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-            "optional": true,
-            "peer": true,
+            "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+            "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+            "dev": true
+        },
+        "node_modules/word-wrap": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+            "dev": true,
             "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/wide-align/node_modules/string-width": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-            "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-            "optional": true,
-            "peer": true,
-            "dependencies": {
-                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/wide-align/node_modules/strip-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-            "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-            "optional": true,
-            "peer": true,
-            "dependencies": {
-                "ansi-regex": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/wildcard": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-            "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-            "dev": true
-        },
-        "node_modules/word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
+                "node": ">=0.10.0"
             }
         },
         "node_modules/wrap-ansi": {
@@ -6337,9 +6703,9 @@
             "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         },
         "node_modules/ws": {
-            "version": "7.5.3",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-            "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+            "version": "7.5.5",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+            "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
             "dev": true,
             "engines": {
                 "node": ">=8.3.0"
@@ -6541,9 +6907,9 @@
             }
         },
         "@babel/helper-validator-identifier": {
-            "version": "7.14.8",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz",
-            "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==",
+            "version": "7.15.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+            "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
             "dev": true
         },
         "@babel/highlight": {
@@ -6616,9 +6982,9 @@
             }
         },
         "@discoveryjs/json-ext": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz",
-            "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
+            "version": "0.5.5",
+            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
+            "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==",
             "dev": true
         },
         "@eslint/eslintrc": {
@@ -6638,6 +7004,12 @@
                 "strip-json-comments": "^3.1.1"
             }
         },
+        "@gar/promisify": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz",
+            "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==",
+            "dev": true
+        },
         "@handsontable/formulajs": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/@handsontable/formulajs/-/formulajs-2.0.2.tgz",
@@ -6690,22 +7062,42 @@
                 "fastq": "^1.6.0"
             }
         },
+        "@npmcli/fs": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.0.0.tgz",
+            "integrity": "sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ==",
+            "dev": true,
+            "requires": {
+                "@gar/promisify": "^1.0.1",
+                "semver": "^7.3.5"
+            }
+        },
+        "@npmcli/move-file": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+            "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+            "dev": true,
+            "requires": {
+                "mkdirp": "^1.0.4",
+                "rimraf": "^3.0.2"
+            }
+        },
         "@polka/url": {
-            "version": "1.0.0-next.15",
-            "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
-            "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",
+            "version": "1.0.0-next.21",
+            "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
+            "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
             "dev": true
         },
         "@trysound/sax": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz",
-            "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==",
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+            "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
             "dev": true
         },
         "@types/eslint": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz",
-            "integrity": "sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==",
+            "version": "7.28.2",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz",
+            "integrity": "sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA==",
             "dev": true,
             "requires": {
                 "@types/estree": "*",
@@ -6725,19 +7117,18 @@
         "@types/estree": {
             "version": "0.0.50",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-            "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
-            "dev": true
+            "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
         },
         "@types/html-minifier-terser": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz",
-            "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.0.0.tgz",
+            "integrity": "sha512-NZwaaynfs1oIoLAV1vg18e7QMVDvw+6SQrdJc8w3BwUaoroVSf6EBj/Sk4PBWGxsq0dzhA2drbsuMC1/6C6KgQ==",
             "dev": true
         },
         "@types/json-schema": {
-            "version": "7.0.8",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
-            "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
+            "version": "7.0.9",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+            "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
             "dev": true
         },
         "@types/json-stable-stringify": {
@@ -6746,9 +7137,9 @@
             "integrity": "sha512-qEWiQff6q2tA5gcJGWwzplQcXdJtm+0oy6IHGHzlOf3eFAkGE/FIPXZK9ofWgNSHVp8AFFI33PJJshS0ei3Gvw=="
         },
         "@types/node": {
-            "version": "16.4.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.0.tgz",
-            "integrity": "sha512-HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg==",
+            "version": "16.11.4",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.4.tgz",
+            "integrity": "sha512-TMgXmy0v2xWyuCSCJM6NCna2snndD8yvQF67J29ipdzMcsPa9u+o0tjF5+EQNdhcuZplYuouYqpc4zcd5I6amQ==",
             "dev": true
         },
         "@types/pikaday": {
@@ -6906,25 +7297,25 @@
             }
         },
         "@webpack-cli/configtest": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.4.tgz",
-            "integrity": "sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz",
+            "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==",
             "dev": true,
             "requires": {}
         },
         "@webpack-cli/info": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.3.0.tgz",
-            "integrity": "sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==",
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz",
+            "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==",
             "dev": true,
             "requires": {
                 "envinfo": "^7.7.3"
             }
         },
         "@webpack-cli/serve": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.5.1.tgz",
-            "integrity": "sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==",
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz",
+            "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==",
             "dev": true,
             "requires": {}
         },
@@ -6961,11 +7352,21 @@
             "requires": {}
         },
         "acorn-walk": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.1.tgz",
-            "integrity": "sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w==",
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+            "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
             "dev": true
         },
+        "aggregate-error": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+            "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+            "dev": true,
+            "requires": {
+                "clean-stack": "^2.0.0",
+                "indent-string": "^4.0.0"
+            }
+        },
         "ajv": {
             "version": "6.12.6",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -6998,9 +7399,9 @@
             "dev": true
         },
         "ansi-regex": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-            "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
         },
         "ansi-styles": {
             "version": "4.3.0",
@@ -7018,9 +7419,9 @@
             "peer": true
         },
         "are-we-there-yet": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-            "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+            "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
             "optional": true,
             "peer": true,
             "requires": {
@@ -7072,9 +7473,9 @@
             "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA=="
         },
         "bit-field": {
-            "version": "1.5.2",
-            "resolved": "https://registry.npmjs.org/bit-field/-/bit-field-1.5.2.tgz",
-            "integrity": "sha512-CYS3HRGgIlm7A6/zqGFd/KPSUIv4EoEQVQ8mWcvBEdlf0db1q3j/fj5W/PXJasBfsvN2jM0Tzw3w1C7HUoR/fg==",
+            "version": "1.5.3",
+            "resolved": "https://registry.npmjs.org/bit-field/-/bit-field-1.5.3.tgz",
+            "integrity": "sha512-bSrkdGpRwPWWi9WOrrMV9xcF1PQAKGG5HnNgVUntIaL1OFND2n7LBM4p1VGXF6OYMKap0vB/OmzOhneDfSgIpg==",
             "requires": {
                 "fs-extra": "^10",
                 "onml": "^2.1.0",
@@ -7113,9 +7514,9 @@
                     "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
                 },
                 "yargs": {
-                    "version": "17.0.1",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.0.1.tgz",
-                    "integrity": "sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==",
+                    "version": "17.2.1",
+                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz",
+                    "integrity": "sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==",
                     "requires": {
                         "cliui": "^7.0.2",
                         "escalade": "^3.1.1",
@@ -7164,23 +7565,49 @@
             }
         },
         "browserslist": {
-            "version": "4.16.6",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-            "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+            "version": "4.17.5",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
+            "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
             "dev": true,
             "requires": {
-                "caniuse-lite": "^1.0.30001219",
-                "colorette": "^1.2.2",
-                "electron-to-chromium": "^1.3.723",
+                "caniuse-lite": "^1.0.30001271",
+                "electron-to-chromium": "^1.3.878",
                 "escalade": "^3.1.1",
-                "node-releases": "^1.1.71"
+                "node-releases": "^2.0.1",
+                "picocolors": "^1.0.0"
             }
         },
         "buffer-from": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-            "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-            "dev": true
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+            "dev": true
+        },
+        "cacache": {
+            "version": "15.3.0",
+            "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+            "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+            "dev": true,
+            "requires": {
+                "@npmcli/fs": "^1.0.0",
+                "@npmcli/move-file": "^1.0.1",
+                "chownr": "^2.0.0",
+                "fs-minipass": "^2.0.0",
+                "glob": "^7.1.4",
+                "infer-owner": "^1.0.4",
+                "lru-cache": "^6.0.0",
+                "minipass": "^3.1.1",
+                "minipass-collect": "^1.0.2",
+                "minipass-flush": "^1.0.5",
+                "minipass-pipeline": "^1.2.2",
+                "mkdirp": "^1.0.3",
+                "p-map": "^4.0.0",
+                "promise-inflight": "^1.0.1",
+                "rimraf": "^3.0.2",
+                "ssri": "^8.0.1",
+                "tar": "^6.0.2",
+                "unique-filename": "^1.1.1"
+            }
         },
         "callsites": {
             "version": "3.1.0",
@@ -7217,9 +7644,9 @@
             }
         },
         "caniuse-lite": {
-            "version": "1.0.30001246",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001246.tgz",
-            "integrity": "sha512-Tc+ff0Co/nFNbLOrziBXmMVtpt9S2c2Y+Z9Nk9Khj09J+0zR9ejvIW5qkZAErCbOrVODCx/MN+GpB5FNBs5GFA==",
+            "version": "1.0.30001271",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
+            "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
             "dev": true
         },
         "canvas": {
@@ -7243,9 +7670,9 @@
             }
         },
         "chalk": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-            "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
             "dev": true,
             "requires": {
                 "ansi-styles": "^4.1.0",
@@ -7253,11 +7680,10 @@
             }
         },
         "chownr": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-            "optional": true,
-            "peer": true
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+            "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+            "dev": true
         },
         "chrome-trace-event": {
             "version": "1.0.3",
@@ -7266,14 +7692,20 @@
             "dev": true
         },
         "clean-css": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
-            "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+            "version": "4.2.4",
+            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
+            "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
             "dev": true,
             "requires": {
                 "source-map": "~0.6.0"
             }
         },
+        "clean-stack": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+            "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+            "dev": true
+        },
         "cliui": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
@@ -7330,9 +7762,9 @@
             "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
         },
         "codemirror": {
-            "version": "5.62.2",
-            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.2.tgz",
-            "integrity": "sha512-tVFMUa4J3Q8JUd1KL9yQzQB0/BJt7ZYZujZmTPgo/54Lpuq3ez4C8x/ATUY/wv7b7X3AUq8o3Xd+2C5ZrCGWHw=="
+            "version": "5.63.3",
+            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.63.3.tgz",
+            "integrity": "sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw=="
         },
         "color-convert": {
             "version": "2.0.1",
@@ -7348,15 +7780,15 @@
             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         },
         "colord": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/colord/-/colord-2.3.0.tgz",
-            "integrity": "sha512-0NaS8lq6xZ9Zb+cWRwQf6ql1Z/7HMIAMzPrM2pgfAqskGAhUksBcaau6W8sL+6OK0xIujcSo1TJfdctG7K85Qg==",
+            "version": "2.9.1",
+            "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.1.tgz",
+            "integrity": "sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw==",
             "dev": true
         },
         "colorette": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-            "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+            "version": "2.0.16",
+            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+            "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
             "dev": true
         },
         "commander": {
@@ -7365,6 +7797,25 @@
             "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
             "dev": true
         },
+        "commondir": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+            "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+            "dev": true
+        },
+        "compression-webpack-plugin": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz",
+            "integrity": "sha512-BEHft9M6lwOqVIQFMS/YJGmeCYXVOakC5KzQk05TFpMBlODByh1qNsZCWjUBxCQhUP9x0WfGidxTbGkjbWO/TQ==",
+            "dev": true,
+            "requires": {
+                "cacache": "^15.0.5",
+                "find-cache-dir": "^3.3.1",
+                "schema-utils": "^3.0.0",
+                "serialize-javascript": "^5.0.1",
+                "webpack-sources": "^1.4.3"
+            }
+        },
         "concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -7394,14 +7845,14 @@
             }
         },
         "core-js": {
-            "version": "3.15.2",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz",
-            "integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q=="
+            "version": "3.18.3",
+            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.3.tgz",
+            "integrity": "sha512-tReEhtMReZaPFVw7dajMx0vlsz3oOb8ajgPoHVYGxr8ErnZ6PcYEvvmjGmXlfpnxpkYSdOQttjB+MvVbCGfvLw=="
         },
         "core-util-is": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-            "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
             "optional": true,
             "peer": true
         },
@@ -7423,9 +7874,9 @@
             "dev": true
         },
         "css-declaration-sorter": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.0.3.tgz",
-            "integrity": "sha512-52P95mvW1SMzuRZegvpluT6yEv0FqQusydKQPZsNN5Q7hh8EwQvN8E2nwuJ16BBvNN6LcoIZXu/Bk58DAhrrxw==",
+            "version": "6.1.3",
+            "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz",
+            "integrity": "sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA==",
             "dev": true,
             "requires": {
                 "timsort": "^0.3.0"
@@ -7450,16 +7901,16 @@
             }
         },
         "css-minimizer-webpack-plugin": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.0.2.tgz",
-            "integrity": "sha512-B3I5e17RwvKPJwsxjjWcdgpU/zqylzK1bPVghcmpFHRL48DXiBgrtqz1BJsn68+t/zzaLp9kYAaEDvQ7GyanFQ==",
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.1.1.tgz",
+            "integrity": "sha512-KlB8l5uoNcf9F7i5kXnkxoqJGd2BXH4f0+Lj2vSWSmuvMLYO1kNsJ1KHSzeDW8e45/whgSOPcKVT/3JopkT8dg==",
             "dev": true,
             "requires": {
                 "cssnano": "^5.0.6",
                 "jest-worker": "^27.0.2",
                 "p-limit": "^3.0.2",
                 "postcss": "^8.3.5",
-                "schema-utils": "^3.0.0",
+                "schema-utils": "^3.1.0",
                 "serialize-javascript": "^6.0.0",
                 "source-map": "^0.6.1"
             },
@@ -7499,9 +7950,9 @@
             }
         },
         "css-what": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
-            "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
+            "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
             "dev": true
         },
         "cssesc": {
@@ -7511,21 +7962,21 @@
             "dev": true
         },
         "cssnano": {
-            "version": "5.0.7",
-            "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.7.tgz",
-            "integrity": "sha512-7C0tbb298hef3rq+TtBbMuezBQ9VrFtrQEsPNuBKNVgWny/67vdRsnq8EoNu7TRjAHURgYvWlRIpCUmcMZkRzw==",
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.8.tgz",
+            "integrity": "sha512-Lda7geZU0Yu+RZi2SGpjYuQz4HI4/1Y+BhdD0jL7NXAQ5larCzVn+PUGuZbDMYz904AXXCOgO5L1teSvgu7aFg==",
             "dev": true,
             "requires": {
-                "cssnano-preset-default": "^5.1.3",
+                "cssnano-preset-default": "^5.1.4",
                 "is-resolvable": "^1.1.0",
                 "lilconfig": "^2.0.3",
                 "yaml": "^1.10.2"
             }
         },
         "cssnano-preset-default": {
-            "version": "5.1.3",
-            "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.3.tgz",
-            "integrity": "sha512-qo9tX+t4yAAZ/yagVV3b+QBKeLklQbmgR3wI7mccrDcR+bEk9iHgZN1E7doX68y9ThznLya3RDmR+nc7l6/2WQ==",
+            "version": "5.1.4",
+            "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz",
+            "integrity": "sha512-sPpQNDQBI3R/QsYxQvfB4mXeEcWuw0wGtKtmS5eg8wudyStYMgKOQT39G07EbW1LB56AOYrinRS9f0ig4Y3MhQ==",
             "dev": true,
             "requires": {
                 "css-declaration-sorter": "^6.0.3",
@@ -7540,7 +7991,7 @@
                 "postcss-merge-longhand": "^5.0.2",
                 "postcss-merge-rules": "^5.0.2",
                 "postcss-minify-font-values": "^5.0.1",
-                "postcss-minify-gradients": "^5.0.1",
+                "postcss-minify-gradients": "^5.0.2",
                 "postcss-minify-params": "^5.0.1",
                 "postcss-minify-selectors": "^5.1.0",
                 "postcss-normalize-charset": "^5.0.1",
@@ -7789,9 +8240,9 @@
             "peer": true
         },
         "deep-is": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-            "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+            "version": "0.1.4",
+            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
             "dev": true
         },
         "delegates": {
@@ -7853,18 +8304,18 @@
             "dev": true
         },
         "domhandler": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz",
-            "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==",
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz",
+            "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==",
             "dev": true,
             "requires": {
                 "domelementtype": "^2.2.0"
             }
         },
         "domutils": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz",
-            "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==",
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+            "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
             "dev": true,
             "requires": {
                 "dom-serializer": "^1.0.1",
@@ -7889,9 +8340,9 @@
             "dev": true
         },
         "electron-to-chromium": {
-            "version": "1.3.784",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.784.tgz",
-            "integrity": "sha512-JTPxdUibkefeomWNaYs8lI/x/Zb4cOhZWX+d7kpzsNKzUd07pNuo/AcHeNJ/qgEchxM1IAxda9aaGUhKN/poOg==",
+            "version": "1.3.878",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.878.tgz",
+            "integrity": "sha512-O6yxWCN9ph2AdspAIszBnd9v8s11hQx8ub9w4UGApzmNRnoKhbulOWqbO8THEQec/aEHtvy+donHZMlh6l1rbA==",
             "dev": true
         },
         "emoji-regex": {
@@ -7914,9 +8365,9 @@
             }
         },
         "enhanced-resolve": {
-            "version": "5.8.2",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz",
-            "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==",
+            "version": "5.8.3",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
+            "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
             "dev": true,
             "requires": {
                 "graceful-fs": "^4.2.4",
@@ -7945,9 +8396,9 @@
             "dev": true
         },
         "es-module-lexer": {
-            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.7.1.tgz",
-            "integrity": "sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw==",
+            "version": "0.9.3",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+            "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
             "dev": true
         },
         "escalade": {
@@ -7962,9 +8413,9 @@
             "dev": true
         },
         "eslint": {
-            "version": "7.31.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz",
-            "integrity": "sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==",
+            "version": "7.32.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+            "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "7.12.11",
@@ -8174,9 +8625,9 @@
             "dev": true
         },
         "fastq": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz",
-            "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==",
+            "version": "1.13.0",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+            "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
             "dev": true,
             "requires": {
                 "reusify": "^1.0.4"
@@ -8200,6 +8651,17 @@
                 "to-regex-range": "^5.0.1"
             }
         },
+        "find-cache-dir": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+            "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+            "dev": true,
+            "requires": {
+                "commondir": "^1.0.1",
+                "make-dir": "^3.0.2",
+                "pkg-dir": "^4.1.0"
+            }
+        },
         "find-up": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -8221,9 +8683,9 @@
             }
         },
         "flatted": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.1.tgz",
-            "integrity": "sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==",
+            "version": "3.2.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+            "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
             "dev": true
         },
         "fs-extra": {
@@ -8237,13 +8699,12 @@
             }
         },
         "fs-minipass": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-            "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
-            "optional": true,
-            "peer": true,
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+            "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+            "dev": true,
             "requires": {
-                "minipass": "^2.6.0"
+                "minipass": "^3.0.0"
             }
         },
         "fs.realpath": {
@@ -8333,9 +8794,9 @@
             "dev": true
         },
         "glob": {
-            "version": "7.1.7",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-            "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+            "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
             "devOptional": true,
             "requires": {
                 "fs.realpath": "^1.0.0",
@@ -8362,9 +8823,9 @@
             "dev": true
         },
         "globals": {
-            "version": "13.10.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
-            "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
+            "version": "13.11.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+            "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
             "dev": true,
             "requires": {
                 "type-fest": "^0.20.2"
@@ -8393,9 +8854,9 @@
             }
         },
         "graceful-fs": {
-            "version": "4.2.6",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-            "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
+            "version": "4.2.8",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+            "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
         },
         "gzip-size": {
             "version": "6.0.0",
@@ -8446,12 +8907,6 @@
             "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
             "dev": true
         },
-        "hex-color-regex": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-            "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
-            "dev": true
-        },
         "hot-formula-parser": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/hot-formula-parser/-/hot-formula-parser-3.0.2.tgz",
@@ -8461,18 +8916,6 @@
                 "tiny-emitter": "^2.1.0"
             }
         },
-        "hsl-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-            "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
-            "dev": true
-        },
-        "hsla-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-            "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
-            "dev": true
-        },
         "html-loader": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-2.1.2.tgz",
@@ -8499,16 +8942,73 @@
             }
         },
         "html-webpack-plugin": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.3.2.tgz",
-            "integrity": "sha512-HvB33boVNCz2lTyBsSiMffsJ+m0YLIQ+pskblXgN9fnjS1BgEcuAfdInfXfGrkdXV406k9FiDi86eVCDBgJOyQ==",
+            "version": "5.4.0",
+            "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.4.0.tgz",
+            "integrity": "sha512-cSUdckNOIqKc0nOrCJG7zkvzEIUcXjzEiVbKdEdIzW3BD5T4xPK6boV1mrTrPDZiL+aAr/j45eqbNL1akU2ZRA==",
             "dev": true,
             "requires": {
-                "@types/html-minifier-terser": "^5.0.0",
-                "html-minifier-terser": "^5.0.1",
+                "@types/html-minifier-terser": "^6.0.0",
+                "html-minifier-terser": "^6.0.2",
                 "lodash": "^4.17.21",
                 "pretty-error": "^3.0.4",
                 "tapable": "^2.0.0"
+            },
+            "dependencies": {
+                "clean-css": {
+                    "version": "5.2.2",
+                    "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz",
+                    "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==",
+                    "dev": true,
+                    "requires": {
+                        "source-map": "~0.6.0"
+                    }
+                },
+                "commander": {
+                    "version": "8.3.0",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+                    "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+                    "dev": true
+                },
+                "html-minifier-terser": {
+                    "version": "6.0.2",
+                    "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.0.2.tgz",
+                    "integrity": "sha512-AgYO3UGhMYQx2S/FBJT3EM0ZYcKmH6m9XL9c1v77BeK/tYJxGPxT1/AtsdUi4FcP8kZGmqqnItCcjFPcX9hk6A==",
+                    "dev": true,
+                    "requires": {
+                        "camel-case": "^4.1.2",
+                        "clean-css": "^5.1.5",
+                        "commander": "^8.1.0",
+                        "he": "^1.2.0",
+                        "param-case": "^3.0.4",
+                        "relateurl": "^0.2.7",
+                        "terser": "^5.7.2"
+                    }
+                },
+                "terser": {
+                    "version": "5.9.0",
+                    "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
+                    "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
+                    "dev": true,
+                    "requires": {
+                        "commander": "^2.20.0",
+                        "source-map": "~0.7.2",
+                        "source-map-support": "~0.5.20"
+                    },
+                    "dependencies": {
+                        "commander": {
+                            "version": "2.20.3",
+                            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+                            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+                            "dev": true
+                        },
+                        "source-map": {
+                            "version": "0.7.3",
+                            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+                            "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+                            "dev": true
+                        }
+                    }
+                }
             }
         },
         "htmlparser2": {
@@ -8571,9 +9071,9 @@
             }
         },
         "import-local": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-            "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
+            "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
             "dev": true,
             "requires": {
                 "pkg-dir": "^4.2.0",
@@ -8586,6 +9086,18 @@
             "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
             "dev": true
         },
+        "indent-string": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+            "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+            "dev": true
+        },
+        "infer-owner": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+            "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+            "dev": true
+        },
         "inflight": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -8631,32 +9143,10 @@
             "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
             "dev": true
         },
-        "is-color-stop": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-            "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
-            "dev": true,
-            "requires": {
-                "css-color-names": "^0.0.4",
-                "hex-color-regex": "^1.1.0",
-                "hsl-regex": "^1.0.0",
-                "hsla-regex": "^1.0.0",
-                "rgb-regex": "^1.0.1",
-                "rgba-regex": "^1.0.0"
-            },
-            "dependencies": {
-                "css-color-names": {
-                    "version": "0.0.4",
-                    "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-                    "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-                    "dev": true
-                }
-            }
-        },
         "is-core-module": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
-            "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
+            "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
             "requires": {
                 "has": "^1.0.3"
             }
@@ -8673,9 +9163,9 @@
             "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
         },
         "is-glob": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-            "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
             "dev": true,
             "requires": {
                 "is-extglob": "^2.1.1"
@@ -8703,9 +9193,9 @@
             "dev": true
         },
         "is-stream": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-            "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
             "dev": true
         },
         "isarray": {
@@ -8727,9 +9217,9 @@
             "dev": true
         },
         "jest-worker": {
-            "version": "27.0.6",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz",
-            "integrity": "sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==",
+            "version": "27.3.1",
+            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
+            "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
             "dev": true,
             "requires": {
                 "@types/node": "*",
@@ -8832,9 +9322,9 @@
             "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
         },
         "jstat": {
-            "version": "1.9.4",
-            "resolved": "https://registry.npmjs.org/jstat/-/jstat-1.9.4.tgz",
-            "integrity": "sha512-IiTPlI7pcrsq41EpDzrghlA1fhiC9GXxNqO4k5ogsjsM1XAWQ8zESH/bZsExLVgQsYpXE+7c11kEbbuxTLUpJQ=="
+            "version": "1.9.5",
+            "resolved": "https://registry.npmjs.org/jstat/-/jstat-1.9.5.tgz",
+            "integrity": "sha512-cWnp4vObF5GmB2XsIEzxI/1ZTcYlcfNqxQ/9Fp5KFUa0Jf/4tO0ZkGVnqoEHDisJvYgvn5n3eWZbd2xTVJJPUQ=="
         },
         "jsuites": {
             "version": "2.8.0",
@@ -8967,6 +9457,23 @@
                 "yallist": "^4.0.0"
             }
         },
+        "make-dir": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+            "dev": true,
+            "requires": {
+                "semver": "^6.0.0"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+                    "dev": true
+                }
+            }
+        },
         "map-age-cleaner": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -9020,18 +9527,18 @@
             "dev": true
         },
         "mime-db": {
-            "version": "1.48.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-            "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
+            "version": "1.50.0",
+            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz",
+            "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==",
             "dev": true
         },
         "mime-types": {
-            "version": "2.1.31",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-            "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+            "version": "2.1.33",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz",
+            "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==",
             "dev": true,
             "requires": {
-                "mime-db": "1.48.0"
+                "mime-db": "1.50.0"
             }
         },
         "mimic-fn": {
@@ -9066,45 +9573,57 @@
             "devOptional": true
         },
         "minipass": {
-            "version": "2.9.0",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-            "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-            "optional": true,
-            "peer": true,
+            "version": "3.1.5",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
+            "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
+            "dev": true,
             "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
-            },
-            "dependencies": {
-                "yallist": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-                    "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-                    "optional": true,
-                    "peer": true
-                }
+                "yallist": "^4.0.0"
             }
         },
-        "minizlib": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-            "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
-            "optional": true,
-            "peer": true,
+        "minipass-collect": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+            "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+            "dev": true,
             "requires": {
-                "minipass": "^2.9.0"
+                "minipass": "^3.0.0"
             }
         },
-        "mkdirp": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-            "optional": true,
-            "peer": true,
+        "minipass-flush": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+            "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+            "dev": true,
             "requires": {
-                "minimist": "^1.2.5"
+                "minipass": "^3.0.0"
             }
         },
+        "minipass-pipeline": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+            "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+            "dev": true,
+            "requires": {
+                "minipass": "^3.0.0"
+            }
+        },
+        "minizlib": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+            "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+            "dev": true,
+            "requires": {
+                "minipass": "^3.0.0",
+                "yallist": "^4.0.0"
+            }
+        },
+        "mkdirp": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+            "dev": true
+        },
         "moment": {
             "version": "2.20.1",
             "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
@@ -9117,16 +9636,22 @@
             "devOptional": true
         },
         "nan": {
-            "version": "2.14.2",
-            "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-            "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+            "version": "2.15.0",
+            "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
+            "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
             "optional": true,
             "peer": true
         },
+        "nanocolors": {
+            "version": "0.1.12",
+            "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.1.12.tgz",
+            "integrity": "sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==",
+            "dev": true
+        },
         "nanoid": {
-            "version": "3.1.23",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
-            "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
+            "version": "3.1.30",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
+            "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
             "dev": true
         },
         "natural-compare": {
@@ -9136,9 +9661,9 @@
             "dev": true
         },
         "needle": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/needle/-/needle-2.8.0.tgz",
-            "integrity": "sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==",
+            "version": "2.9.1",
+            "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz",
+            "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==",
             "optional": true,
             "peer": true,
             "requires": {
@@ -9181,9 +9706,12 @@
             }
         },
         "node-fetch": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-            "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+            "version": "2.6.5",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
+            "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+            "requires": {
+                "whatwg-url": "^5.0.0"
+            }
         },
         "node-pre-gyp": {
             "version": "0.10.3",
@@ -9204,6 +9732,54 @@
                 "tar": "^4"
             },
             "dependencies": {
+                "chownr": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+                    "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+                    "optional": true,
+                    "peer": true
+                },
+                "fs-minipass": {
+                    "version": "1.2.7",
+                    "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+                    "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+                    "optional": true,
+                    "peer": true,
+                    "requires": {
+                        "minipass": "^2.6.0"
+                    }
+                },
+                "minipass": {
+                    "version": "2.9.0",
+                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+                    "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+                    "optional": true,
+                    "peer": true,
+                    "requires": {
+                        "safe-buffer": "^5.1.2",
+                        "yallist": "^3.0.0"
+                    }
+                },
+                "minizlib": {
+                    "version": "1.3.3",
+                    "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+                    "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+                    "optional": true,
+                    "peer": true,
+                    "requires": {
+                        "minipass": "^2.9.0"
+                    }
+                },
+                "mkdirp": {
+                    "version": "0.5.5",
+                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+                    "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+                    "optional": true,
+                    "peer": true,
+                    "requires": {
+                        "minimist": "^1.2.5"
+                    }
+                },
                 "rimraf": {
                     "version": "2.7.1",
                     "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -9220,13 +9796,36 @@
                     "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
                     "optional": true,
                     "peer": true
+                },
+                "tar": {
+                    "version": "4.4.19",
+                    "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+                    "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+                    "optional": true,
+                    "peer": true,
+                    "requires": {
+                        "chownr": "^1.1.4",
+                        "fs-minipass": "^1.2.7",
+                        "minipass": "^2.9.0",
+                        "minizlib": "^1.3.3",
+                        "mkdirp": "^0.5.5",
+                        "safe-buffer": "^5.2.1",
+                        "yallist": "^3.1.1"
+                    }
+                },
+                "yallist": {
+                    "version": "3.1.1",
+                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+                    "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+                    "optional": true,
+                    "peer": true
                 }
             }
         },
         "node-releases": {
-            "version": "1.1.73",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-            "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
+            "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
             "dev": true
         },
         "nopt": {
@@ -9304,9 +9903,9 @@
             }
         },
         "nth-check": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
-            "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+            "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
             "dev": true,
             "requires": {
                 "boolbase": "^1.0.0"
@@ -9536,6 +10135,15 @@
                 }
             }
         },
+        "p-map": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+            "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+            "dev": true,
+            "requires": {
+                "aggregate-error": "^3.0.0"
+            }
+        },
         "p-try": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -9605,6 +10213,12 @@
             "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
             "dev": true
         },
+        "picocolors": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+            "dev": true
+        },
         "picomatch": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
@@ -9629,13 +10243,13 @@
             }
         },
         "postcss": {
-            "version": "8.3.6",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz",
-            "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==",
+            "version": "8.3.11",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
+            "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
             "dev": true,
             "requires": {
-                "colorette": "^1.2.2",
-                "nanoid": "^3.1.23",
+                "nanoid": "^3.1.30",
+                "picocolors": "^1.0.0",
                 "source-map-js": "^0.6.2"
             }
         },
@@ -9732,13 +10346,13 @@
             }
         },
         "postcss-minify-gradients": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.1.tgz",
-            "integrity": "sha512-odOwBFAIn2wIv+XYRpoN2hUV3pPQlgbJ10XeXPq8UY2N+9ZG42xu45lTn/g9zZ+d70NKSQD6EOi6UiCMu3FN7g==",
+            "version": "5.0.2",
+            "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz",
+            "integrity": "sha512-7Do9JP+wqSD6Prittitt2zDLrfzP9pqKs2EcLX7HJYxsxCOwrrcLt4x/ctQTsiOw+/8HYotAoqNkrzItL19SdQ==",
             "dev": true,
             "requires": {
+                "colord": "^2.6",
                 "cssnano-utils": "^2.0.1",
-                "is-color-stop": "^1.1.0",
                 "postcss-value-parser": "^4.1.0"
             }
         },
@@ -9982,6 +10596,12 @@
             "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
             "dev": true
         },
+        "promise-inflight": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+            "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+            "dev": true
+        },
         "pump": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -10164,18 +10784,6 @@
             "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
             "dev": true
         },
-        "rgb-regex": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-            "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
-            "dev": true
-        },
-        "rgba-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-            "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
-            "dev": true
-        },
         "rimraf": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -10279,17 +10887,17 @@
             "dev": true
         },
         "signal-exit": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-            "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+            "version": "3.0.5",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
+            "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="
         },
         "sirv": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",
-            "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==",
+            "version": "1.0.18",
+            "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.18.tgz",
+            "integrity": "sha512-f2AOPogZmXgJ9Ma2M22ZEhc1dNtRIzcEkiflMFeVTRq+OViOZMvH1IPMVOwrKaxpSaHioBJiDR0SluRqGa7atA==",
             "dev": true,
             "requires": {
-                "@polka/url": "^1.0.0-next.15",
+                "@polka/url": "^1.0.0-next.20",
                 "mime": "^2.3.1",
                 "totalist": "^1.0.0"
             }
@@ -10330,9 +10938,9 @@
             "dev": true
         },
         "source-map-support": {
-            "version": "0.5.19",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
-            "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+            "version": "0.5.20",
+            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
+            "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
             "dev": true,
             "requires": {
                 "buffer-from": "^1.0.0",
@@ -10350,6 +10958,15 @@
             "resolved": "https://registry.npmjs.org/sql.js/-/sql.js-1.5.0.tgz",
             "integrity": "sha512-Qqr6HgX/hCDpLFWdN0BNoNpYQ2c1tOl1c3HGI0cshjaFSAWszKICuLZ9CyFUvRFPpEGW8RzHzwuXWWvXVGTKBg=="
         },
+        "ssri": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+            "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+            "dev": true,
+            "requires": {
+                "minipass": "^3.1.1"
+            }
+        },
         "stable": {
             "version": "0.1.8",
             "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
@@ -10376,21 +10993,21 @@
             }
         },
         "string-width": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-            "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
             "requires": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.0"
+                "strip-ansi": "^6.0.1"
             }
         },
         "strip-ansi": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-            "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
             "requires": {
-                "ansi-regex": "^5.0.0"
+                "ansi-regex": "^5.0.1"
             }
         },
         "strip-eof": {
@@ -10440,17 +11057,17 @@
             }
         },
         "svgo": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.3.1.tgz",
-            "integrity": "sha512-riDDIQgXpEnn0BEl9Gvhh1LNLIyiusSpt64IR8upJu7MwxnzetmF/Y57pXQD2NMX2lVyMRzXt5f2M5rO4wG7Dw==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.7.0.tgz",
+            "integrity": "sha512-aDLsGkre4fTDCWvolyW+fs8ZJFABpzLXbtdK1y71CKnHzAnpDxKXPj2mNKj+pyOXUCzFHzuxRJ94XOFygOWV3w==",
             "dev": true,
             "requires": {
-                "@trysound/sax": "0.1.1",
-                "chalk": "^4.1.0",
-                "commander": "^7.1.0",
+                "@trysound/sax": "0.2.0",
+                "commander": "^7.2.0",
                 "css-select": "^4.1.3",
-                "css-tree": "^1.1.2",
+                "css-tree": "^1.1.3",
                 "csso": "^4.2.0",
+                "nanocolors": "^0.1.12",
                 "stable": "^0.1.8"
             },
             "dependencies": {
@@ -10463,23 +11080,23 @@
             }
         },
         "table": {
-            "version": "6.7.1",
-            "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
-            "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+            "version": "6.7.2",
+            "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
+            "integrity": "sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==",
             "dev": true,
             "requires": {
                 "ajv": "^8.0.1",
                 "lodash.clonedeep": "^4.5.0",
                 "lodash.truncate": "^4.4.2",
                 "slice-ansi": "^4.0.0",
-                "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.0"
+                "string-width": "^4.2.3",
+                "strip-ansi": "^6.0.1"
             },
             "dependencies": {
                 "ajv": {
-                    "version": "8.6.2",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
-                    "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
+                    "version": "8.6.3",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+                    "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
                     "dev": true,
                     "requires": {
                         "fast-deep-equal": "^3.1.1",
@@ -10497,34 +11114,23 @@
             }
         },
         "tapable": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-            "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
             "dev": true
         },
         "tar": {
-            "version": "4.4.13",
-            "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-            "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-            "optional": true,
-            "peer": true,
+            "version": "6.1.11",
+            "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+            "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
+            "dev": true,
             "requires": {
-                "chownr": "^1.1.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.8.6",
-                "minizlib": "^1.2.1",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.3"
-            },
-            "dependencies": {
-                "yallist": {
-                    "version": "3.1.1",
-                    "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-                    "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-                    "optional": true,
-                    "peer": true
-                }
+                "chownr": "^2.0.0",
+                "fs-minipass": "^2.0.0",
+                "minipass": "^3.0.0",
+                "minizlib": "^2.1.1",
+                "mkdirp": "^1.0.3",
+                "yallist": "^4.0.0"
             }
         },
         "terser": {
@@ -10547,17 +11153,17 @@
             }
         },
         "terser-webpack-plugin": {
-            "version": "5.1.4",
-            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz",
-            "integrity": "sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==",
+            "version": "5.2.4",
+            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz",
+            "integrity": "sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==",
             "dev": true,
             "requires": {
-                "jest-worker": "^27.0.2",
+                "jest-worker": "^27.0.6",
                 "p-limit": "^3.1.0",
-                "schema-utils": "^3.0.0",
+                "schema-utils": "^3.1.1",
                 "serialize-javascript": "^6.0.0",
                 "source-map": "^0.6.1",
-                "terser": "^5.7.0"
+                "terser": "^5.7.2"
             },
             "dependencies": {
                 "commander": {
@@ -10576,14 +11182,14 @@
                     }
                 },
                 "terser": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.1.tgz",
-                    "integrity": "sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==",
+                    "version": "5.9.0",
+                    "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
+                    "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
                     "dev": true,
                     "requires": {
                         "commander": "^2.20.0",
                         "source-map": "~0.7.2",
-                        "source-map-support": "~0.5.19"
+                        "source-map-support": "~0.5.20"
                     },
                     "dependencies": {
                         "source-map": {
@@ -10643,10 +11249,15 @@
             "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
             "dev": true
         },
+        "tr46": {
+            "version": "0.0.3",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+            "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+        },
         "tslib": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+            "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
             "dev": true
         },
         "tspan": {
@@ -10675,6 +11286,24 @@
             "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
             "dev": true
         },
+        "unique-filename": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+            "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+            "dev": true,
+            "requires": {
+                "unique-slug": "^2.0.0"
+            }
+        },
+        "unique-slug": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+            "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+            "dev": true,
+            "requires": {
+                "imurmurhash": "^0.1.4"
+            }
+        },
         "universalify": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -11082,9 +11711,9 @@
             "integrity": "sha512-Tc85J2ofMZZOsxiqDM9sbvfsa+Vdo3GwNLjEEsPOsCDeYqsUHKAlc1IpbbhPLZ6jusyM9Lk0e1izF64GGklFDg=="
         },
         "vega-statistics": {
-            "version": "1.7.9",
-            "resolved": "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.9.tgz",
-            "integrity": "sha512-T0sd2Z08k/mHxr1Vb4ajLWytPluLFYnsYqyk4SIS5czzUs4errpP2gUu63QJ0B7CKNu33vnS9WdOMOo/Eprr/Q==",
+            "version": "1.7.10",
+            "resolved": "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.10.tgz",
+            "integrity": "sha512-QLb12gcfpDZ9K5h3TLGrlz4UXDH9wSPyg9LLfOJZacxvvJEPohacUQNrGEAVtFO9ccUCerRfH9cs25ZtHsOZrw==",
             "requires": {
                 "d3-array": "^2.7.1"
             }
@@ -11115,17 +11744,35 @@
             }
         },
         "vega-typings": {
-            "version": "0.21.0",
-            "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.21.0.tgz",
-            "integrity": "sha512-dG0RtnJUn3+BQMO4NjjTdcp5UTBR56yQsLXPPCAFUHeLuycEVKlyhBa/kbvAZv2r+QxdeEYwKUNYy9CQotF5KA==",
+            "version": "0.22.1",
+            "resolved": "https://registry.npmjs.org/vega-typings/-/vega-typings-0.22.1.tgz",
+            "integrity": "sha512-88cIrjmoTxo/0nWTf+GuitkFhirHWVWCfymADiCUXt6s9arpQ6XPP5xjrN5KDc0LZd9xr7p4FIiEgADghgLTgw==",
             "requires": {
+                "vega-event-selector": "^3.0.0",
+                "vega-expression": "^5.0.0",
                 "vega-util": "^1.15.2"
+            },
+            "dependencies": {
+                "vega-event-selector": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-3.0.0.tgz",
+                    "integrity": "sha512-Gls93/+7tEJGE3kUuUnxrBIxtvaNeF01VIFB2Q2Of2hBIBvtHX74jcAdDtkh5UhhoYGD8Q1J30P5cqEBEwtPoQ=="
+                },
+                "vega-expression": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/vega-expression/-/vega-expression-5.0.0.tgz",
+                    "integrity": "sha512-y5+c2frq0tGwJ7vYXzZcfVcIRF/QGfhf2e+bV1Z0iQs+M2lI1II1GPDdmOcMKimpoCVp/D61KUJDIGE1DSmk2w==",
+                    "requires": {
+                        "@types/estree": "^0.0.50",
+                        "vega-util": "^1.16.0"
+                    }
+                }
             }
         },
         "vega-util": {
-            "version": "1.16.1",
-            "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.16.1.tgz",
-            "integrity": "sha512-FdgD72fmZMPJE99FxvFXth0IL4BbLA93WmBg/lvcJmfkK4Uf90WIlvGwaIUdSePIsdpkZjBPyQcHMQ8OcS8Smg=="
+            "version": "1.17.0",
+            "resolved": "https://registry.npmjs.org/vega-util/-/vega-util-1.17.0.tgz",
+            "integrity": "sha512-HTaydZd9De3yf+8jH66zL4dXJ1d1p5OIFyoBzFiOli4IJbwkL1jrefCKz6AHDm1kYBzDJ0X4bN+CzZSCTvNk1w=="
         },
         "vega-view": {
             "version": "3.4.1",
@@ -11190,20 +11837,25 @@
             }
         },
         "wavedrom": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/wavedrom/-/wavedrom-2.8.1.tgz",
-            "integrity": "sha512-UTU27qnkfv+qLCwilm+T+m6zcPzSFP7i5HgtZkihbDeVIUasa3npnWhK3ogJ6gmOYhTK1lIh8KDztEuod2CM/g==",
+            "version": "2.9.0",
+            "resolved": "https://registry.npmjs.org/wavedrom/-/wavedrom-2.9.0.tgz",
+            "integrity": "sha512-PazQFmo/DFJU5AoZt+1LxKTEkgokK8Q1Nsc1s/6Y6LEY9z4WKv8RWn6uvh+p6Jh1sLezknACZTCrTasvpwEaiQ==",
             "requires": {
-                "bit-field": "^1.5.1",
+                "bit-field": "^1.5.3",
                 "logidrom": "^0.3.1",
                 "onml": "^2.1.0",
                 "tspan": "^0.4.0"
             }
         },
+        "webidl-conversions": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+            "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
         "webpack": {
-            "version": "5.46.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.46.0.tgz",
-            "integrity": "sha512-qxD0t/KTedJbpcXUmvMxY5PUvXDbF8LsThCzqomeGaDlCA6k998D8yYVwZMvO8sSM3BTEOaD4uzFniwpHaTIJw==",
+            "version": "5.59.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.59.1.tgz",
+            "integrity": "sha512-I01IQV9K96FlpXX3V0L4nvd7gb0r7thfuu1IfT2P4uOHOA77nKARAKDYGe/tScSHKnffNIyQhLC8kRXzY4KEHQ==",
             "dev": true,
             "requires": {
                 "@types/eslint-scope": "^3.7.0",
@@ -11212,10 +11864,11 @@
                 "@webassemblyjs/wasm-edit": "1.11.1",
                 "@webassemblyjs/wasm-parser": "1.11.1",
                 "acorn": "^8.4.1",
+                "acorn-import-assertions": "^1.7.6",
                 "browserslist": "^4.14.5",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.8.0",
-                "es-module-lexer": "^0.7.1",
+                "enhanced-resolve": "^5.8.3",
+                "es-module-lexer": "^0.9.0",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",
                 "glob-to-regexp": "^0.4.1",
@@ -11228,37 +11881,40 @@
                 "tapable": "^2.1.1",
                 "terser-webpack-plugin": "^5.1.3",
                 "watchpack": "^2.2.0",
-                "webpack-sources": "^2.3.1"
+                "webpack-sources": "^3.2.0"
             },
             "dependencies": {
                 "acorn": {
-                    "version": "8.4.1",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-                    "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+                    "version": "8.5.0",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
+                    "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
                     "dev": true
                 },
-                "webpack-sources": {
-                    "version": "2.3.1",
-                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-                    "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+                "acorn-import-assertions": {
+                    "version": "1.8.0",
+                    "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
+                    "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
                     "dev": true,
-                    "requires": {
-                        "source-list-map": "^2.0.1",
-                        "source-map": "^0.6.1"
-                    }
+                    "requires": {}
+                },
+                "webpack-sources": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz",
+                    "integrity": "sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA==",
+                    "dev": true
                 }
             }
         },
         "webpack-bundle-analyzer": {
-            "version": "4.4.2",
-            "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz",
-            "integrity": "sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ==",
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz",
+            "integrity": "sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==",
             "dev": true,
             "requires": {
                 "acorn": "^8.0.4",
                 "acorn-walk": "^8.0.0",
                 "chalk": "^4.1.0",
-                "commander": "^6.2.0",
+                "commander": "^7.2.0",
                 "gzip-size": "^6.0.0",
                 "lodash": "^4.17.20",
                 "opener": "^1.5.2",
@@ -11267,37 +11923,36 @@
             },
             "dependencies": {
                 "acorn": {
-                    "version": "8.4.1",
-                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz",
-                    "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==",
+                    "version": "8.5.0",
+                    "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
+                    "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
                     "dev": true
                 },
                 "commander": {
-                    "version": "6.2.1",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-                    "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+                    "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
                     "dev": true
                 }
             }
         },
         "webpack-cli": {
-            "version": "4.7.2",
-            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.7.2.tgz",
-            "integrity": "sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz",
+            "integrity": "sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==",
             "dev": true,
             "requires": {
                 "@discoveryjs/json-ext": "^0.5.0",
-                "@webpack-cli/configtest": "^1.0.4",
-                "@webpack-cli/info": "^1.3.0",
-                "@webpack-cli/serve": "^1.5.1",
-                "colorette": "^1.2.1",
+                "@webpack-cli/configtest": "^1.1.0",
+                "@webpack-cli/info": "^1.4.0",
+                "@webpack-cli/serve": "^1.6.0",
+                "colorette": "^2.0.14",
                 "commander": "^7.0.0",
                 "execa": "^5.0.0",
                 "fastest-levenshtein": "^1.0.12",
                 "import-local": "^3.0.2",
                 "interpret": "^2.2.0",
                 "rechoir": "^0.7.0",
-                "v8-compile-cache": "^2.2.0",
                 "webpack-merge": "^5.7.3"
             },
             "dependencies": {
@@ -11329,6 +11984,15 @@
                 "source-map": "~0.6.1"
             }
         },
+        "whatwg-url": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+            "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+            "requires": {
+                "tr46": "~0.0.3",
+                "webidl-conversions": "^3.0.0"
+            }
+        },
         "which": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -11344,50 +12008,13 @@
             "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
         },
         "wide-align": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-            "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
             "optional": true,
             "peer": true,
             "requires": {
-                "string-width": "^1.0.2 || 2"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-                    "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-                    "optional": true,
-                    "peer": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-                    "optional": true,
-                    "peer": true
-                },
-                "string-width": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-                    "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-                    "optional": true,
-                    "peer": true,
-                    "requires": {
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^4.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-                    "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-                    "optional": true,
-                    "peer": true,
-                    "requires": {
-                        "ansi-regex": "^3.0.0"
-                    }
-                }
+                "string-width": "^1.0.2 || 2 || 3 || 4"
             }
         },
         "wildcard": {
@@ -11450,9 +12077,9 @@
             "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         },
         "ws": {
-            "version": "7.5.3",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
-            "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
+            "version": "7.5.5",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+            "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
             "dev": true,
             "requires": {}
         },
diff --git a/package.json b/package.json
index 01b941dd3..854d15850 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,11 @@
     "author": "",
     "license": "ISC",
     "devDependencies": {
+        "@babel/core": "^7.0.0",
+        "@babel/preset-env": "^7.15.4",
+        "babel-loader": "^8.2.2",
         "copy-webpack-plugin": "^8.0.0",
+        "compression-webpack-plugin": "^6.0.0",
         "css-loader": "^5.0.0",
         "css-minimizer-webpack-plugin": "^3.0.0",
         "eslint": "^7.0.0",
@@ -26,7 +30,7 @@
         "html-webpack-plugin": "^5.0.0",
         "mini-css-extract-plugin": "^1.0.0",
         "style-loader": "^2.0.0",
-        "webpack": "^5.0.0",
+        "webpack": "^5.54.0",
         "webpack-bundle-analyzer": "^4.0.0",
         "webpack-cli": "^4.0.0"
     },
diff --git a/runestone/activecode/js/livecode.js b/runestone/activecode/js/livecode.js
index efa26195c..18a8e84d9 100644
--- a/runestone/activecode/js/livecode.js
+++ b/runestone/activecode/js/livecode.js
@@ -29,7 +29,7 @@ export default class LiveCode extends ActiveCode {
         }
         this.createErrorOutput();
     }
-    outputfun(a) {}
+    outputfun(a) { }
     createInputElement() {
         var label = document.createElement("label");
         label.for = this.divid + "_stdin";
@@ -43,12 +43,20 @@ export default class LiveCode extends ActiveCode {
         this.outerDiv.appendChild(input);
         this.stdin_el = input;
     }
-    createErrorOutput() {}
+    createErrorOutput() { }
 
     /*  Main runProg method for livecode
      *
      */
-    async runProg() {
+    async runProg(noUI, logResults) {
+        if (typeof logResults === "undefined") {
+            this.logResults = true;
+        } else {
+            this.logResults = logResults;
+        }
+        if (typeof noUI !== "boolean") {
+            noUI = false;
+        }
         await this.runSetup();
         try {
             let res = await this.submitToJobe();
@@ -197,9 +205,9 @@ export default class LiveCode extends ActiveCode {
             public static void main(String[] args) {
                 CodeTestHelper.resetFinalResults();
                 Result result = JUnitCore.runClasses(${testdrivername.replace(
-                    ".java",
-                    ".class"
-                )});
+            ".java",
+            ".class"
+        )});
                 System.out.println(CodeTestHelper.getFinalResults());
 
                 int total = result.getRunCount();
diff --git a/runestone/common/js/bookfuncs.js b/runestone/common/js/bookfuncs.js
index c950c69ac..ccb0fe227 100644
--- a/runestone/common/js/bookfuncs.js
+++ b/runestone/common/js/bookfuncs.js
@@ -58,9 +58,8 @@ function addReadingList() {
                 name: "link",
                 class: "btn btn-lg ' + 'buttonConfirmCompletion'",
                 href: nxt_link,
-                text: `Continue to page ${
-                    position + 2
-                } of ${num_readings} in the reading assignment.`,
+                text: `Continue to page ${position + 2
+                    } of ${num_readings} in the reading assignment.`,
             });
         } else {
             l = $("<div />", {
@@ -154,7 +153,7 @@ class PageProgressBar {
             if (
                 val == 100.0 &&
                 $("#completionButton").text().toLowerCase() ===
-                    "mark as completed"
+                "mark as completed"
             ) {
                 $("#completionButton").click();
             }
@@ -190,10 +189,15 @@ async function handlePageSetup() {
         mess = `username: ${eBookConfig.username}`;
         if (!eBookConfig.isInstructor) {
             $("#ip_dropdown_link").remove();
+            $("#inst_peer_link").remove();
         }
         $(document).trigger("runestone:login");
         addReadingList();
-        timedRefresh();
+        // Avoid the timedRefresh on the grading page.
+        if ((window.location.pathname.indexOf("/admin/grading") == -1)
+            && (window.location.pathname.indexOf("/peer/") == -1)) {
+            timedRefresh();
+        }
     } else {
         mess = "Not logged in";
         $(document).trigger("runestone:logout");
@@ -221,6 +225,7 @@ function setupNavbarLoggedOut() {
         $("#profilelink").hide();
         $("#passwordlink").hide();
         $("#ip_dropdown_link").hide();
+        $("#inst_peer_link").hide();
         $("li.loginout").html(
             '<a href="' + eBookConfig.app + '/default/user/login">Login</a>'
         );
diff --git a/runestone/common/js/runestonebase.js b/runestone/common/js/runestonebase.js
index bf7cc3c85..9d9d2268d 100644
--- a/runestone/common/js/runestonebase.js
+++ b/runestone/common/js/runestonebase.js
@@ -140,7 +140,6 @@ export default class RunestoneBase {
         }
         return post_return;
     }
-
     // .. _logRunEvent:
     //
     // logRunEvent
diff --git a/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
index 202031d8f..cb5667e7b 100644
--- a/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
+++ b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
@@ -150,6 +150,8 @@
             <li class="divider"></li>
             <li><a href='/{{appname}}/assignments/chooseAssignment.html'>Assignments</a></li>
             <li><a href='/{{appname}}/assignments/practice'>Practice</a></li>
+            <li id="inst_peer_link"><a href='/{{appname}}/peer/instructor.html'>Peer Instruction (Instructor)</a></li>            
+            <li><a href='/{{appname}}/peer/student.html'>Peer Instruction (Student)</a></li>            
             <li class="divider"></li>
             {% if minimal_outside_links != 'True' %}
             <li><a href='/{{appname}}/default/courses'>Change Course</a></li>
diff --git a/runestone/common/project_template/conf.tmpl b/runestone/common/project_template/conf.tmpl
index d38d3c9b3..6fe101343 100644
--- a/runestone/common/project_template/conf.tmpl
+++ b/runestone/common/project_template/conf.tmpl
@@ -103,7 +103,7 @@ rst_prolog = (
 # For fill-in-the-blank questions, provide a convenient means to indicate a blank.
 """
 
-.. |blank| replace:: :blank:`x`
+.. |blank| replace:: :blank:`-`
 """
 
 # For literate programming files, provide a convenient way to refer to a source file's name. See `runestone.lp.lp._docname_role`.
diff --git a/runestone/conftest.py b/runestone/conftest.py
index 7b8fc5f21..baf1c5873 100644
--- a/runestone/conftest.py
+++ b/runestone/conftest.py
@@ -57,8 +57,8 @@
 # Run this once, before all tests, to update the webpacked JS.
 @pytest.fixture(scope="session", autouse=True)
 def run_webpack():
-    # Note that Windows requires ``shell=True``, since the command to execute is ``npm.cmd``.
-    p = subprocess.run(["npm", "run", "build"], text=True, shell=IS_WINDOWS, capture_output=True)
+    # Note that Windows requires ``shell=True``, since the command to execute is ``npm.cmd``. Use the ``--`` to pass following args to the script (webpack), per the `npm docs <https://docs.npmjs.com/cli/v7/commands/npm-run-script>`_. Use ``--env test`` to tell webpack to do a test build of the Runestone Components (see `RAND_FUNC <RAND_FUNC>`).
+    p = subprocess.run(["npm", "run", "build", "--", "--env", "test"], text=True, shell=IS_WINDOWS, capture_output=True)
     print(p.stderr + p.stdout)
     assert not p.returncode
 
@@ -82,10 +82,21 @@ def selenium_driver_session(selenium_module_fixture):
     return selenium_module_fixture.driver
 
 
+# Extend the Selenium driver with client-specific methods.
+class _SeleniumClientUtils(_SeleniumUtils):
+    def inject_random_values(self, value_array):
+        self.driver.execute_script("""
+            rs_test_rand = function() {
+                let index = 0;
+                return () => [%s][index++];
+            }();
+        """ % (", ".join([str(i) for i in value_array])))
+
+
 # Present ``_SeleniumUser`` as a fixture.
 @pytest.fixture
 def selenium_utils(selenium_driver):  # noqa: F811
-    return _SeleniumUtils(selenium_driver, HOST_URL)
+    return _SeleniumClientUtils(selenium_driver, HOST_URL)
 
 
 # Provide a fixture which loads the ``index.html`` page.
diff --git a/runestone/fitb/dynamic_problems.rst b/runestone/fitb/dynamic_problems.rst
new file mode 100644
index 000000000..60cfc649e
--- /dev/null
+++ b/runestone/fitb/dynamic_problems.rst
@@ -0,0 +1,48 @@
+****************
+Dynamic problems
+****************
+The fill-in-the-blank problem type supports standard (static) problem; it also supports dynamic problems, where a new problem is randomly generated based on a template provided by the dynamic problem. This document discusses the design of the dynamic problem additions.
+
+Types of dynamic problems
+=========================
+There are three cases for both traditional static problems and for dynamic problems:
+
+-   Client-side (when the ``use_services`` in ``pavement.py`` is false): grading is done on the client and results stored only on the client. For dynamic problems, a random seed and the problem text is generated on the client.
+-   Server-side: (when ``use_services`` is true): grading is done on the client, but the student answer and the graded result are stored on the server (if available) and on the client. Problem state is restored first from the server (if available) then from the client. For dynamic problems, a random seed is generated on the server. Problem text is generated from this server-supplied seed on the client.
+-   Server-side graded (``use_services`` is true and ``runestone_server_side_grading`` in ``conf.py`` is True): grading is done on the server; the student answer and the graded result are stored on the server (if available) and on the client. Problem state is restored first from the server (if available) then from the client. Both the random seed and the problem text are generated on the server.
+
+Design
+======
+The following principles guided the design of dynamic problems
+
+Server-side problem generation
+------------------------------
+The purpose of server-side grading is to improve the security of grading problems, typically for high-stakes assessments such as a test. Client-side grading means the client both knows the correct answers and is responsible for correctly grading answers, both of which provide many opportunities for attack.
+
+Therefore, server-side grading of dynamic problems requires that all problem generation and grading occur on the server, since problem generation often begins with choosing a solution, then proceeds to compute the problem from this known solution. For example, a problem on the quadratic equation begins by selecting two roots, :math:`r_1` and :math:`r_2`. We therefore know that :math:`\left(x - r_1 \right) \left(x - r_2 \right) = 0`, giving :math:`x^2 - \left(r_1 + r_2 \right) x + r_1 r_2 = 0`. Assigning :math:`a = 1`, :math:`b = -\left(r_1 + r_2 \right)`, and :math:`c = r_1 r_2` provides a student-facing problem of :math:`ax^2 + bx + c = 0`. Starting from the solution of :math:`x = \frac{-b \pm \sqrt{b^2 - 4ac}}{2a}` requires ensuring randomly chosen values for :math:`a`, :math:`b`, and :math:`c` produce real, integral roots, which is a more difficult task.
+
+Programming language for dynamic problems
+-----------------------------------------
+The extensive `WeBWorK system <https://webwork.maa.org/>`_ contains 20,000 dynamic problems developed in Perl, making this an attractive option. However, Perl lacks much as a language; the 2021 Stack Overflow survey reports that 2.46% of the surveyed developers work in Perl, while JavaScript captures 65% and Python 48%. Perl v5 was released in 2000 and remains at v5 today (not counting Perl v6, since it became a separate language called Raku). In addition, there are few good options for executing Perl in the browser.
+
+While Python is attractive, the options for running it in the client are limited and require large downloads. JavaScript in a web broswer; the `Js2Py <https://github.com/PiotrDabkowski/Js2Py>`_ Python package provides a working JavaScript v5.1 engine that should be sufficient to run dynamic problems. Therefore, JavaScript was selected as the programming language for dynamic problems.
+
+Templates
+---------
+Dynamic problems need the ability to insert generated values into the text of the problem and into problem feedback. The `EJS <https://ejs.co/>`_ library allows authors to insert the results of evaluating JavaScript into problems. This frees authors from learning (yet another) template language.
+
+Summary
+-------
+Based on these choices:
+
+-   Dynamic problems are authored in JavaScript, with text using EJS_ templates.
+-   Dynamic problems are rendered and graded in the browser for client-side or server-side operation. They are rendered and graded on the server for server-side graded operation.
+
+
+Architecture
+============
+-   The Python server must be able to evaluate JavaScript to generate problem text and grade problems.
+-   The same JavaScript code used to generate a problem and grade a problem run on both the client (when not doing server-side grading) and the server (for server-side grading). Webpack is used to build the same code into a client bundle and a server bundle.
+-   Per-problem random seeds are generated on the client for client-side operation; they are generated on the server for server-side operation.
+
+On the client side, a primary challenge is to create a coherent plan for what data is stored where and at what point in the lifecycle of a problem. See `js/fitb.js` for these details.
\ No newline at end of file
diff --git a/runestone/fitb/fitb.py b/runestone/fitb/fitb.py
index 1112d00d3..8fc5a4086 100644
--- a/runestone/fitb/fitb.py
+++ b/runestone/fitb/fitb.py
@@ -68,55 +68,79 @@ def __init__(self, content, **kwargs):
 
 
 def visit_fitb_node(self, node):
+    # Save the HTML that's been generated so far. We want to know only what's generated inside this directive.
+    self.context.append(self.body)
+    self.body = []
 
-    node.delimiter = "_start__{}_".format(node.runestone_options["divid"])
-    self.body.append(node.delimiter)
-
-    res = node.template_start % node.runestone_options
-    self.body.append(res)
 
 
 def depart_fitb_node(self, node):
-    # If there were fewer blanks than feedback items, add blanks at the end of the question.
-    blankCount = 0
-    for _ in node.traverse(BlankNode):
-        blankCount += 1
-    while blankCount < len(node.feedbackArray):
+    # If there were fewer blanks than feedback items, add blanks at the end of the question. Also, determine the names of each blank.
+    blank_names = {}
+    blank_count = 0
+    for blank_node in node.traverse(BlankNode):
+        # Empty blanks have a "name" of ``-``.
+        name = blank_node["input_name"]
+        if name != "-":
+            # Map from the blank's name to its index in the array of blanks. Don't include unnamed blanks.
+            blank_names[name] = blank_count
+        blank_count += 1
+    while blank_count < len(node.feedbackArray):
         visit_blank_node(self, None)
-        blankCount += 1
+        blank_count += 1
 
     # Warn if there are fewer feedback items than blanks.
-    if len(node.feedbackArray) < blankCount:
+    if len(node.feedbackArray) < blank_count:
         # Taken from the example in the `logging API <http://www.sphinx-doc.org/en/stable/extdev/logging.html#logging-api>`_.
         logger = logging.getLogger(__name__)
         logger.warning(
             "Not enough feedback for the number of blanks supplied.", location=node
         )
 
+    # Capture HTML generated inside this directive.
+    inner_html = self.body
+    self.body = self.context.pop()
+
     # Generate the HTML.
-    json_feedback = json.dumps(node.feedbackArray)
+    server_json = json.dumps({
+        "problemHtml": "".join(inner_html),
+        "dyn_vars": node.dynamic,
+        "blankNames": blank_names,
+        "feedbackArray": node.feedbackArray
+    })
     # Some nodes (for example, those in a timed node) have their ``document == None``. Find a valid ``document``.
     node_with_document = node
     while not node_with_document.document:
         node_with_document = node_with_document.parent
     # Supply client-side grading info if we're not grading on the server.
-    node.runestone_options["json"] = (
-        "false"
-        if node_with_document.document.settings.env.config.runestone_server_side_grading
-        else json_feedback
-    )
-    res = node.template_end % node.runestone_options
-    self.body.append(res)
+    if node_with_document.document.settings.env.config.runestone_server_side_grading:
+        if node.dynamic:
+            # Server-side graded dynamic problems render and provide the problem's HTML on the server; just tell the client it's a dynamic problem.
+            client_json = json.dumps(dict(dyn_vars=True))
+        else:
+            # Other server-side graded problems need the problem's HTML.
+            client_json = json.dumps(dict(problemHtml="".join(inner_html)))
+    else:
+        client_json = server_json
+    node.runestone_options["client_json"] = client_json
+    outer_html = """
+        <div class="%(divclass)s">
+            <div data-component="fillintheblank" data-question_label="%(question_label)s" id="%(divid)s" %(optional)s style="visibility: hidden;">
+                <script type="application/json">
+                    %(client_json)s
+                </script>
+            </div>
+        </div>
+            """ % node.runestone_options
 
     # add HTML to the Database and clean up
     addHTMLToDB(
         node.runestone_options["divid"],
         node.runestone_options["basecourse"],
-        "".join(self.body[self.body.index(node.delimiter) + 1 :]),
-        json_feedback,
+        outer_html,
+        server_json,
     )
-
-    self.body.remove(node.delimiter)
+    self.body.append(outer_html)
 
 
 class FillInTheBlank(RunestoneIdDirective):
@@ -141,7 +165,10 @@ class FillInTheBlank(RunestoneIdDirective):
     option_spec = RunestoneIdDirective.option_spec.copy()
     option_spec.update(
         {
-            "casei": directives.flag,  # case insensitive matching
+            # For dynamic problems, this contains JavaScript code which defines the variables used in template substitution in the problem. If this option isn't present, the problem will be a static problem.
+            "dyn_vars": directives.unchanged,
+            # case insensitive matching
+            "casei": directives.flag,
         }
     )
 
@@ -155,39 +182,28 @@ def run(self):
 
         super(FillInTheBlank, self).run()
 
-        TEMPLATE_START = """
-        <div class="%(divclass)s">
-        <div data-component="fillintheblank" data-question_label="%(question_label)s" id="%(divid)s" %(optional)s style="visibility: hidden;">
-            """
-
-        TEMPLATE_END = """
-        <script type="application/json">
-            %(json)s
-        </script>
-
-        </div>
-        </div>
-            """
-
         addQuestionToDB(self)
 
         fitbNode = FITBNode(self.options, rawsource=self.block_text)
         fitbNode.source, fitbNode.line = self.state_machine.get_source_and_line(
             self.lineno
         )
-        fitbNode.template_start = TEMPLATE_START
-        fitbNode.template_end = TEMPLATE_END
 
         self.updateContent()
 
-        self.state.nested_parse(self.content, self.content_offset, fitbNode)
+        # Process dynamic problem content.
         env = self.state.document.settings.env
+        dyn_vars = self.options.get("dyn_vars")
+        # Store the dynamic code, or None if it's a static problem.
+        fitbNode.dynamic = dyn_vars
+
+        self.state.nested_parse(self.content, self.content_offset, fitbNode)
         self.options["divclass"] = env.config.fitb_div_class
 
         # Expected _`structure`, with assigned variable names and transformations made:
         #
         # .. code-block::
-        #   :number-lines:
+        #   :linenos:
         #
         #   fitbNode = FITBNode()
         #       Item 1 of problem text
@@ -206,14 +222,16 @@ def run(self):
         # This becomes a data structure:
         #
         # .. code-block::
-        #   :number-lines:
+        #   :linenos:
         #
         #   self.feedbackArray = [
         #       [   # blankArray
         #           { # blankFeedbackDict: feedback 1
-        #               "regex" : feedback_field_name   # (An answer, as a regex;
-        #               "regexFlags" : "x"              # "i" if ``:casei:`` was specified, otherwise "".) OR
-        #               "number" : [min, max]           # a range of correct numeric answers.
+        #               "regex" : feedback_field_name,      # (An answer, as a regex;
+        #               "regexFlags" : "x",                 # "i" if ``:casei:`` was specified, otherwise "".) OR
+        #               "number" : [min, max],              # a range of correct numeric answers OR
+        #               "solution_code" : source_code,      # For dynamic problems -- an expression which evaluates
+        #                                                   # to true or false to determine if the solution was correct.
         #               "feedback": feedback_field_body (after being rendered as HTML)  # Provides feedback for this answer.
         #           },
         #           { # Feedback 2
@@ -221,13 +239,14 @@ def run(self):
         #           }
         #       ],
         #       [  # Blank 2, same as above.
-        #       ]
+        #       ],
+        #       ...,
         #   ]
         #
         # ...and a transformed node structure:
         #
         # .. code-block::
-        #   :number-lines:
+        #   :linenos:
         #
         #   fitbNode = FITBNode()
         #       Item 1 of problem text
@@ -263,47 +282,49 @@ def run(self):
                 feedback_field_name = feedback_field[0]
                 assert isinstance(feedback_field_name, nodes.field_name)
                 feedback_field_name_raw = feedback_field_name.rawsource
-                # See if this is a number, optinonally followed by a tolerance.
-                try:
-                    # Parse the number. In Python 3 syntax, this would be ``str_num, *list_tol = feedback_field_name_raw.split()``.
-                    tmp = feedback_field_name_raw.split()
-                    str_num = tmp[0]
-                    list_tol = tmp[1:]
-                    num = ast.literal_eval(str_num)
-                    assert isinstance(num, Number)
-                    # If no tolerance is given, use a tolarance of 0.
-                    if len(list_tol) == 0:
-                        tol = 0
-                    else:
-                        assert len(list_tol) == 1
-                        tol = ast.literal_eval(list_tol[0])
-                        assert isinstance(tol, Number)
-                    # We have the number and a tolerance. Save that.
-                    blankFeedbackDict = {"number": [num - tol, num + tol]}
-                except (SyntaxError, ValueError, AssertionError):
-                    # We can't parse this as a number, so assume it's a regex.
-                    regex = (
-                        # The given regex must match the entire string, from the beginning (which may be preceded by whitespaces) ...
-                        r"^\s*"
-                        +
-                        # ... to the contents (where a single space in the provided pattern is treated as one or more whitespaces in the student's answer) ...
-                        feedback_field_name.rawsource.replace(" ", r"\s+")
-                        # ... to the end (also with optional spaces).
-                        + r"\s*$"
-                    )
-                    blankFeedbackDict = {
-                        "regex": regex,
-                        "regexFlags": "i" if "casei" in self.options else "",
-                    }
-                    # Test out the regex to make sure it compiles without an error.
+                # Simply store the solution code for a dynamic problem.
+                if dyn_vars:
+                    blankFeedbackDict = {"solution_code": feedback_field_name_raw}
+                else:
+                    # See if this is a number, optionally followed by a tolerance.
                     try:
-                        re.compile(regex)
-                    except Exception as ex:
-                        raise self.error(
-                            'Error when compiling regex "{}": {}.'.format(
-                                regex, str(ex)
-                            )
+                        # Parse the number.
+                        str_num, *list_tol = feedback_field_name_raw.split()
+                        num = ast.literal_eval(str_num)
+                        assert isinstance(num, Number)
+                        # If no tolerance is given, use a tolerance of 0.
+                        if len(list_tol) == 0:
+                            tol = 0
+                        else:
+                            assert len(list_tol) == 1
+                            tol = ast.literal_eval(list_tol[0])
+                            assert isinstance(tol, Number)
+                        # We have the number and a tolerance. Save that.
+                        blankFeedbackDict = {"number": [num - tol, num + tol]}
+                    except (SyntaxError, ValueError, AssertionError):
+                        # We can't parse this as a number, so assume it's a regex.
+                        regex = (
+                            # The given regex must match the entire string, from the beginning (which may be preceded by whitespaces) ...
+                            r"^\s*"
+                            +
+                            # ... to the contents (where a single space in the provided pattern is treated as one or more whitespaces in the student's answer) ...
+                            feedback_field_name.rawsource.replace(" ", r"\s+")
+                            # ... to the end (also with optional spaces).
+                            + r"\s*$"
                         )
+                        blankFeedbackDict = {
+                            "regex": regex,
+                            "regexFlags": "i" if "casei" in self.options else "",
+                        }
+                        # Test out the regex to make sure it compiles without an error.
+                        try:
+                            re.compile(regex)
+                        except Exception as ex:
+                            raise self.error(
+                                'Error when compiling regex "{}": {}.'.format(
+                                    regex, str(ex)
+                                )
+                            )
                 blankArray.append(blankFeedbackDict)
 
                 feedback_field_body = feedback_field[1]
@@ -334,7 +355,7 @@ def run(self):
 def BlankRole(
     # _`roleName`: the local name of the interpreted role, the role name actually used in the document.
     roleName,
-    # _`rawtext` is a string containing the enitre interpreted text input, including the role and markup. Return it as a problematic node linked to a system message if a problem is encountered.
+    # _`rawtext` is a string containing the entire interpreted text input, including the role and markup. Return it as a problematic node linked to a system message if a problem is encountered.
     rawtext,
     # The interpreted _`text` content.
     text,
@@ -348,9 +369,7 @@ def BlankRole(
     content=[],
 ):
 
-    # Blanks ignore all arguments, just inserting a blank.
-    blank_node = BlankNode(rawtext)
-    blank_node.line = lineno
+    blank_node = BlankNode(rawtext, input_name=text)
     return [blank_node], []
 
 
@@ -359,7 +378,11 @@ class BlankNode(nodes.Inline, nodes.TextElement, RunestoneNode):
 
 
 def visit_blank_node(self, node):
-    self.body.append('<input type="text">')
+    # Note that the fitb visit code may call this with ``node = None``.
+    name = node["input_name"] if node else ""
+    # If the blank contained a name, use that as the name of the input element. A name of ``-`` (the default value for ``|blank|``, since there's no way to pass an empty value) is treated as an unnamed input element.
+    html_name = "" if name == "-" else f" name={repr(name)}"
+    self.body.append(f'<input type="text"{html_name} />')
 
 
 def depart_blank_node(self, node):
diff --git a/runestone/fitb/fitb_html_structure.html b/runestone/fitb/fitb_html_structure.html
new file mode 100644
index 000000000..a636146db
--- /dev/null
+++ b/runestone/fitb/fitb_html_structure.html
@@ -0,0 +1,278 @@
+<!--
+*********************************************************
+|docname| - HTML format for a fill-in-the-blank component
+*********************************************************
+This is the HTML format for creating a fill-in-the-blank Runestone Component. For legibility, newlines were added, which aren't allowed in pure JSON. For more information on this problem, see the `Runestone author's manual <https://runestone.academy/runestone/books/published/overview/Assessments/fitb.html>`_.
+
+
+Server-side grading
+===================
+All of the following problem types may be graded either on the client (offering the best user experience due to rapid grading) or on the server (offering better security by not sending solutions to problems across the network, storing them on the server, or assuming the client's grading is correct). Server-side grading requires the use of a server, so it cannot be enabled for books built to function without a server. To request server-side grading, see the documentation below for which elements of the JSON-encoded dictionary to omit. Instead, store the full and complete dictionary in the Runestone database's ``questions.feedback`` field so the server can access this information when it grades a problem.
+
+
+Dynamic problems
+================
+The following gives an example of the HTML generated for the following dynamic problem:
+
+.. fillintheblank:: fitb_dynamic_1
+    :dyn_vars:
+        v.a = Math.floor(rand()*10);
+        v.b = Math.floor(rand()*10);
+        v.types = {c: Number};
+
+    What is [%= a %] + [%= b %]? :blank:`c`
+
+    -   :c === a + b: Correct; [%= a %] + [%= b %] is [%= c %]. Note that
+            [%= ans %] or [%= ans_array[0] %] also works.
+        :c === a - b: That's subtraction.
+        :c === a * b: That's multiplication.
+        :x: I don't know what you're doing.
+
+
+The reStructuredText used to generate this problem is:
+
+.. literalinclude:: fitb_html_structure.html
+    :language: rest
+    :linenos:
+    :start-at: fitb_dynamic_1
+    :end-before: The reStructuredText
+
+
+The (annotated) HTML for the problem is:
+-->
+
+<div class="runestone">
+    <div
+        data-component="fillintheblank"
+        data-question_label="7"
+        id="fitb_dynamic_1"
+        style="visibility: hidden"
+    >
+        <script type="application/json">
+            // To request server-side grading for this problem type, replace this dictionary with the dict ``{ "dyn_vars": true }``.
+            {
+                "problemHtml":
+                // This string contains templated HTML for the problem body.
+                "<p>
+                    Before-14-After: What is {%= a %} + {%= b %}?
+                    <input type="text" name='c'>
+                 </p>",
+
+                "dyn_vars":
+                // This is a string containing JavaScript code to set up variables.
+                "v.a = Math.floor(rand()*10);
+                 v.b = Math.floor(rand()*10);
+                 v.types = {c: Number};",
+
+                "blankNames":
+                // This is a dict of {blank_name: blank_index}.
+                {
+                    // The blank named "c" is the first blank, so its array
+                    // index is 0.
+                    "c": 0
+                },
+
+                "feedbackArray":
+                // This element is an array of solutions (one per blank) for client-side grading.
+                [
+                    // This is the solution for the first (and in this case only) blank.
+                    [
+                        // The first feedback possibility, if it matches, means the problem will be graded as correct.
+                        {
+                            // A JavaScript expression; if true, it matches.
+                            "solution_code": "c === a + b",
+                            // The feedback to display for this match, in templated HTML.
+                            "feedback":
+                            "<p>
+                                Correct; {%= a %} + {%= b %} is {%= c %}. Note
+                                that {%= ans %} or {%= ans_array[0] %} also
+                                works.
+                             </p>\n"
+                        },
+                        // The second and following feedback items are all graded as incorrect.
+                        {
+                            "solution_code": "c === a - b",
+                            "feedback":"<p>That's subtraction.</p>\n"
+                        },
+                        {
+                            "solution_code": "c === a * b",
+                            "feedback": "<p>That's multiplication.</p>\n"
+                        },
+                        // The final feedback item always matches.
+                        {
+                            "solution_code": "x",
+                            "feedback":
+                            "<p>
+                                I don't know what you're doing.
+                             </p>\n"
+                        }
+                    ]
+                ]
+            }
+        </script>
+    </div>
+</div>
+
+<!--
+Regex problems
+==============
+.. fillintheblank:: test_fitb_string
+
+    Fill in the blanks to make the following sentence: "The red car drove
+    away."
+
+    The |blank| car drove |blank|.
+
+    -   :red: Correct.
+        :x: Incorrect. Try 'red'.
+    -   :away: Correct.
+        :x: Incorrect. Try 'away'.
+
+
+The reStructuredText used to generate this problem is:
+
+.. literalinclude:: fitb_html_structure.html
+    :language: rest
+    :linenos:
+    :start-at: test_fitb_string
+    :end-before: The reStructuredText
+
+
+The (annotated) HTML for the problem is:
+-->
+
+<div class="runestone">
+    <div
+        data-component="fillintheblank"
+        data-question_label="1"
+        id="test_fitb_string"
+        style="visibility: hidden"
+    >
+        <script type="application/json">
+            // To request server-side grading for this problem type, omit all items from this dictionary except for the ``problemHtml`` key and its value.
+            {
+                // Note that templates are not evaluated for this problem, since only dynamic problems define variables for use by the template.
+                "problemHtml":
+                "<p>
+                    Fill in the blanks to make the following sentence:
+                    \"The red car drove away.\"
+                 </p>
+                 <p>
+                    The <input type=\"text\" /> car drove <input type=\"text\" />.
+                 </p>\n",
+
+                // This is not a dynamic problem.
+                "dyn_vars": null,
+
+                // While it's possible to name blanks for other problem types, only dynamic problems can make ues of the names provided. Therefore, it's let blank for other problem types.
+                "blankNames": {},
+
+                // All FITB problems must contain a feedback array.
+                "feedbackArray": [
+                    // Blank 0 ("red "in "The red car")
+                    [
+                        // Feedback for the correct answer must always come first.
+                        {
+                            // The reStructured text translator creates a "generous" regex, allowing arbitrary white before and answer the provided answer. This isn't required, however; any valid `regular expression <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions>`_ is acceptable. Refer to https://regex101.com for a user-friendly method of creating and testing a regex.
+                            "regex": "^\\s*red\\s*$",
+                            // While any `regex flag <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#advanced_searching_with_flags>`_ could be used, the most useful is ``i``, enabling case-insensitive matches. In this example, the match is case-sensitive; the answer "RED" is wrong.
+                            "regexFlags": "",
+                            // The feedback is arbitrary HTML; again, templates aren't supported for this problem type.
+                            "feedback": "<p>Correct.</p>\n"
+                        },
+                        // Since this is the last answer, it always matches and grades the provided answer as incorrect.
+                        {
+                            "regex": "^\\s*x\\s*$",
+                            "regexFlags": "",
+                            "feedback": "<p>Incorrect. Try \"red\".</p>\n"
+                        }
+                    ],
+                    // Blank 1 (the "away" in "drove away")
+                    [
+                        // The format is exactly the same as blank 0.
+                        {
+                            "regex": "^\\s*away\\s*$",
+                            "regexFlags": "",
+                            "feedback": "<p>Correct.</p>\n"
+                        }, {
+                            "regex": "^\\s*x\\s*$",
+                            "regexFlags": "",
+                            "feedback": "<p>Incorrect. Try \"away\".</p>\n"
+                        }
+                    ]
+                ]
+            }
+        </script>
+    </div>
+</div>
+
+<!--
+Numeric problem
+===============
+.. fillintheblank:: test_fitb_number
+
+    What is the solution to the following?
+
+    :math:`2 * \pi =` |blank|.
+
+    -   :6.28 0.005: Good job.
+        :.*: Incorrect. Try again.
+
+
+The reStructuredText used to generate this problem is:
+
+.. literalinclude:: fitb_html_structure.html
+    :language: rest
+    :linenos:
+    :start-at: test_fitb_number
+    :end-before: The reStructuredText
+
+
+The (annotated) HTML for the problem is:
+-->
+
+<div class="runestone">
+    <div
+        data-component="fillintheblank"
+        data-question_label="2"
+        id="test_fitb_number"
+        style="visibility: hidden"
+    >
+        <script type="application/json">
+            // To request server-side grading for this problem type, omit all items from this dictionary except for the ``problemHtml`` key and its value.
+            {
+                // The format for this matches the format of the previous example; comments on the details are omitted here for brevity.
+                "problemHtml":
+                "<p>
+                    What is the solution to the following?
+                 </p>\n
+                 <p>
+                    <span class=\"math notranslate nohighlight\">
+                        \\(2 * \\pi =\\)
+                    </span>
+                    <input type=\"text\" />.
+                 </p>\n",
+
+                "dyn_vars": null,
+
+                "blankNames": {},
+
+                "feedbackArray": [
+                    [
+                        // Any number in the range (6.275, 6.285) matches.
+                        {
+                            "number": [6.275, 6.285],
+                            "feedback": "<p>Good job.</p>\n"
+                        },
+                        // The next answer is regex. You may switch between answer types freely.
+                        {
+                            "regex": "^\\s*.*\\s*$",
+                            "regexFlags": "",
+                            "feedback": "<p>Incorrect. Try again.</p>\n"
+                        }
+                    ]
+                ]
+            }
+        </script>
+    </div>
+</div>
diff --git a/runestone/fitb/js/ejs/lib/ejs.js b/runestone/fitb/js/ejs/lib/ejs.js
new file mode 100644
index 000000000..87bc7b535
--- /dev/null
+++ b/runestone/fitb/js/ejs/lib/ejs.js
@@ -0,0 +1,940 @@
+/*
+ * EJS Embedded JavaScript templates
+ * Copyright 2112 Matthew Eernisse (mde@fleegix.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+
+'use strict';
+
+/**
+ * @file Embedded JavaScript templating engine. {@link http://ejs.co}
+ * @author Matthew Eernisse <mde@fleegix.org>
+ * @author Tiancheng "Timothy" Gu <timothygu99@gmail.com>
+ * @project EJS
+ * @license {@link http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0}
+ */
+
+/**
+ * EJS internal functions.
+ *
+ * Technically this "module" lies in the same file as {@link module:ejs}, for
+ * the sake of organization all the private functions re grouped into this
+ * module.
+ *
+ * @module ejs-internal
+ * @private
+ */
+
+/**
+ * Embedded JavaScript templating engine.
+ *
+ * @module ejs
+ * @public
+ */
+
+var fs = require('fs');
+var path = require('path');
+var utils = require('./utils');
+
+var scopeOptionWarned = false;
+/** @type {string} */
+var _VERSION_STRING = require('../package.json').version;
+var _DEFAULT_OPEN_DELIMITER = '<';
+var _DEFAULT_CLOSE_DELIMITER = '>';
+var _DEFAULT_DELIMITER = '%';
+var _DEFAULT_LOCALS_NAME = 'locals';
+var _NAME = 'ejs';
+var _REGEX_STRING = '(<%%|%%>|<%=|<%-|<%_|<%#|<%|%>|-%>|_%>)';
+var _OPTS_PASSABLE_WITH_DATA = ['delimiter', 'scope', 'context', 'debug', 'compileDebug',
+  'client', '_with', 'rmWhitespace', 'strict', 'filename', 'async'];
+// We don't allow 'cache' option to be passed in the data obj for
+// the normal `render` call, but this is where Express 2 & 3 put it
+// so we make an exception for `renderFile`
+var _OPTS_PASSABLE_WITH_DATA_EXPRESS = _OPTS_PASSABLE_WITH_DATA.concat('cache');
+var _BOM = /^\uFEFF/;
+
+/**
+ * EJS template function cache. This can be a LRU object from lru-cache NPM
+ * module. By default, it is {@link module:utils.cache}, a simple in-process
+ * cache that grows continuously.
+ *
+ * @type {Cache}
+ */
+
+exports.cache = utils.cache;
+
+/**
+ * Custom file loader. Useful for template preprocessing or restricting access
+ * to a certain part of the filesystem.
+ *
+ * @type {fileLoader}
+ */
+
+exports.fileLoader = fs.readFileSync;
+
+/**
+ * Name of the object containing the locals.
+ *
+ * This variable is overridden by {@link Options}`.localsName` if it is not
+ * `undefined`.
+ *
+ * @type {String}
+ * @public
+ */
+
+exports.localsName = _DEFAULT_LOCALS_NAME;
+
+/**
+ * Promise implementation -- defaults to the native implementation if available
+ * This is mostly just for testability
+ *
+ * @type {PromiseConstructorLike}
+ * @public
+ */
+
+exports.promiseImpl = (new Function('return this;'))().Promise;
+
+/**
+ * Get the path to the included file from the parent file path and the
+ * specified path.
+ *
+ * @param {String}  name     specified path
+ * @param {String}  filename parent file path
+ * @param {Boolean} [isDir=false] whether the parent file path is a directory
+ * @return {String}
+ */
+exports.resolveInclude = function(name, filename, isDir) {
+  var dirname = path.dirname;
+  var extname = path.extname;
+  var resolve = path.resolve;
+  var includePath = resolve(isDir ? filename : dirname(filename), name);
+  var ext = extname(name);
+  if (!ext) {
+    includePath += '.ejs';
+  }
+  return includePath;
+};
+
+/**
+ * Try to resolve file path on multiple directories
+ *
+ * @param  {String}        name  specified path
+ * @param  {Array<String>} paths list of possible parent directory paths
+ * @return {String}
+ */
+function resolvePaths(name, paths) {
+  var filePath;
+  if (paths.some(function (v) {
+    filePath = exports.resolveInclude(name, v, true);
+    return fs.existsSync(filePath);
+  })) {
+    return filePath;
+  }
+}
+
+/**
+ * Get the path to the included file by Options
+ *
+ * @param  {String}  path    specified path
+ * @param  {Options} options compilation options
+ * @return {String}
+ */
+function getIncludePath(path, options) {
+  var includePath;
+  var filePath;
+  var views = options.views;
+  var match = /^[A-Za-z]+:\\|^\//.exec(path);
+
+  // Abs path
+  if (match && match.length) {
+    path = path.replace(/^\/*/, '');
+    if (Array.isArray(options.root)) {
+      includePath = resolvePaths(path, options.root);
+    } else {
+      includePath = exports.resolveInclude(path, options.root || '/', true);
+    }
+  }
+  // Relative paths
+  else {
+    // Look relative to a passed filename first
+    if (options.filename) {
+      filePath = exports.resolveInclude(path, options.filename);
+      if (fs.existsSync(filePath)) {
+        includePath = filePath;
+      }
+    }
+    // Then look in any views directories
+    if (!includePath && Array.isArray(views)) {
+      includePath = resolvePaths(path, views);
+    }
+    if (!includePath && typeof options.includer !== 'function') {
+      throw new Error('Could not find the include file "' +
+          options.escapeFunction(path) + '"');
+    }
+  }
+  return includePath;
+}
+
+/**
+ * Get the template from a string or a file, either compiled on-the-fly or
+ * read from cache (if enabled), and cache the template if needed.
+ *
+ * If `template` is not set, the file specified in `options.filename` will be
+ * read.
+ *
+ * If `options.cache` is true, this function reads the file from
+ * `options.filename` so it must be set prior to calling this function.
+ *
+ * @memberof module:ejs-internal
+ * @param {Options} options   compilation options
+ * @param {String} [template] template source
+ * @return {(TemplateFunction|ClientFunction)}
+ * Depending on the value of `options.client`, either type might be returned.
+ * @static
+ */
+
+function handleCache(options, template) {
+  var func;
+  var filename = options.filename;
+  var hasTemplate = arguments.length > 1;
+
+  if (options.cache) {
+    if (!filename) {
+      throw new Error('cache option requires a filename');
+    }
+    func = exports.cache.get(filename);
+    if (func) {
+      return func;
+    }
+    if (!hasTemplate) {
+      template = fileLoader(filename).toString().replace(_BOM, '');
+    }
+  }
+  else if (!hasTemplate) {
+    // istanbul ignore if: should not happen at all
+    if (!filename) {
+      throw new Error('Internal EJS error: no file name or template '
+                    + 'provided');
+    }
+    template = fileLoader(filename).toString().replace(_BOM, '');
+  }
+  func = exports.compile(template, options);
+  if (options.cache) {
+    exports.cache.set(filename, func);
+  }
+  return func;
+}
+
+/**
+ * Try calling handleCache with the given options and data and call the
+ * callback with the result. If an error occurs, call the callback with
+ * the error. Used by renderFile().
+ *
+ * @memberof module:ejs-internal
+ * @param {Options} options    compilation options
+ * @param {Object} data        template data
+ * @param {RenderFileCallback} cb callback
+ * @static
+ */
+
+function tryHandleCache(options, data, cb) {
+  var result;
+  if (!cb) {
+    if (typeof exports.promiseImpl == 'function') {
+      return new exports.promiseImpl(function (resolve, reject) {
+        try {
+          result = handleCache(options)(data);
+          resolve(result);
+        }
+        catch (err) {
+          reject(err);
+        }
+      });
+    }
+    else {
+      throw new Error('Please provide a callback function');
+    }
+  }
+  else {
+    try {
+      result = handleCache(options)(data);
+    }
+    catch (err) {
+      return cb(err);
+    }
+
+    cb(null, result);
+  }
+}
+
+/**
+ * fileLoader is independent
+ *
+ * @param {String} filePath ejs file path.
+ * @return {String} The contents of the specified file.
+ * @static
+ */
+
+function fileLoader(filePath){
+  return exports.fileLoader(filePath);
+}
+
+/**
+ * Get the template function.
+ *
+ * If `options.cache` is `true`, then the template is cached.
+ *
+ * @memberof module:ejs-internal
+ * @param {String}  path    path for the specified file
+ * @param {Options} options compilation options
+ * @return {(TemplateFunction|ClientFunction)}
+ * Depending on the value of `options.client`, either type might be returned
+ * @static
+ */
+
+function includeFile(path, options) {
+  var opts = utils.shallowCopy({}, options);
+  opts.filename = getIncludePath(path, opts);
+  if (typeof options.includer === 'function') {
+    var includerResult = options.includer(path, opts.filename);
+    if (includerResult) {
+      if (includerResult.filename) {
+        opts.filename = includerResult.filename;
+      }
+      if (includerResult.template) {
+        return handleCache(opts, includerResult.template);
+      }
+    }
+  }
+  return handleCache(opts);
+}
+
+/**
+ * Re-throw the given `err` in context to the `str` of ejs, `filename`, and
+ * `lineno`.
+ *
+ * @implements {RethrowCallback}
+ * @memberof module:ejs-internal
+ * @param {Error}  err      Error object
+ * @param {String} str      EJS source
+ * @param {String} flnm     file name of the EJS file
+ * @param {Number} lineno   line number of the error
+ * @param {EscapeCallback} esc
+ * @static
+ */
+
+function rethrow(err, str, flnm, lineno, esc) {
+  var lines = str.split('\n');
+  var start = Math.max(lineno - 3, 0);
+  var end = Math.min(lines.length, lineno + 3);
+  var filename = esc(flnm);
+  // Error context
+  var context = lines.slice(start, end).map(function (line, i){
+    var curr = i + start + 1;
+    return (curr == lineno ? ' >> ' : '    ')
+      + curr
+      + '| '
+      + line;
+  }).join('\n');
+
+  // Alter exception message
+  err.path = filename;
+  err.message = (filename || 'ejs') + ':'
+    + lineno + '\n'
+    + context + '\n\n'
+    + err.message;
+
+  throw err;
+}
+
+function stripSemi(str){
+  return str.replace(/;(\s*$)/, '$1');
+}
+
+/**
+ * Compile the given `str` of ejs into a template function.
+ *
+ * @param {String}  template EJS template
+ *
+ * @param {Options} [opts] compilation options
+ *
+ * @return {(TemplateFunction|ClientFunction)}
+ * Depending on the value of `opts.client`, either type might be returned.
+ * Note that the return type of the function also depends on the value of `opts.async`.
+ * @public
+ */
+
+exports.compile = function compile(template, opts) {
+  var templ;
+
+  // v1 compat
+  // 'scope' is 'context'
+  // FIXME: Remove this in a future version
+  if (opts && opts.scope) {
+    if (!scopeOptionWarned){
+      console.warn('`scope` option is deprecated and will be removed in EJS 3');
+      scopeOptionWarned = true;
+    }
+    if (!opts.context) {
+      opts.context = opts.scope;
+    }
+    delete opts.scope;
+  }
+  templ = new Template(template, opts);
+  return templ.compile();
+};
+
+/**
+ * Render the given `template` of ejs.
+ *
+ * If you would like to include options but not data, you need to explicitly
+ * call this function with `data` being an empty object or `null`.
+ *
+ * @param {String}   template EJS template
+ * @param {Object}  [data={}] template data
+ * @param {Options} [opts={}] compilation and rendering options
+ * @return {(String|Promise<String>)}
+ * Return value type depends on `opts.async`.
+ * @public
+ */
+
+exports.render = function (template, d, o) {
+  var data = d || {};
+  var opts = o || {};
+
+  // No options object -- if there are optiony names
+  // in the data, copy them to options
+  if (arguments.length == 2) {
+    utils.shallowCopyFromList(opts, data, _OPTS_PASSABLE_WITH_DATA);
+  }
+
+  return handleCache(opts, template)(data);
+};
+
+/**
+ * Render an EJS file at the given `path` and callback `cb(err, str)`.
+ *
+ * If you would like to include options but not data, you need to explicitly
+ * call this function with `data` being an empty object or `null`.
+ *
+ * @param {String}             path     path to the EJS file
+ * @param {Object}            [data={}] template data
+ * @param {Options}           [opts={}] compilation and rendering options
+ * @param {RenderFileCallback} cb callback
+ * @public
+ */
+
+exports.renderFile = function () {
+  var args = Array.prototype.slice.call(arguments);
+  var filename = args.shift();
+  var cb;
+  var opts = {filename: filename};
+  var data;
+  var viewOpts;
+
+  // Do we have a callback?
+  if (typeof arguments[arguments.length - 1] == 'function') {
+    cb = args.pop();
+  }
+  // Do we have data/opts?
+  if (args.length) {
+    // Should always have data obj
+    data = args.shift();
+    // Normal passed opts (data obj + opts obj)
+    if (args.length) {
+      // Use shallowCopy so we don't pollute passed in opts obj with new vals
+      utils.shallowCopy(opts, args.pop());
+    }
+    // Special casing for Express (settings + opts-in-data)
+    else {
+      // Express 3 and 4
+      if (data.settings) {
+        // Pull a few things from known locations
+        if (data.settings.views) {
+          opts.views = data.settings.views;
+        }
+        if (data.settings['view cache']) {
+          opts.cache = true;
+        }
+        // Undocumented after Express 2, but still usable, esp. for
+        // items that are unsafe to be passed along with data, like `root`
+        viewOpts = data.settings['view options'];
+        if (viewOpts) {
+          utils.shallowCopy(opts, viewOpts);
+        }
+      }
+      // Express 2 and lower, values set in app.locals, or people who just
+      // want to pass options in their data. NOTE: These values will override
+      // anything previously set in settings  or settings['view options']
+      utils.shallowCopyFromList(opts, data, _OPTS_PASSABLE_WITH_DATA_EXPRESS);
+    }
+    opts.filename = filename;
+  }
+  else {
+    data = {};
+  }
+
+  return tryHandleCache(opts, data, cb);
+};
+
+/**
+ * Clear intermediate JavaScript cache. Calls {@link Cache#reset}.
+ * @public
+ */
+
+/**
+ * EJS template class
+ * @public
+ */
+exports.Template = Template;
+
+exports.clearCache = function () {
+  exports.cache.reset();
+};
+
+function Template(text, opts) {
+  opts = opts || {};
+  var options = {};
+  this.templateText = text;
+  /** @type {string | null} */
+  this.mode = null;
+  this.truncate = false;
+  this.currentLine = 1;
+  this.source = '';
+  options.client = opts.client || false;
+  options.escapeFunction = opts.escape || opts.escapeFunction || utils.escapeXML;
+  options.compileDebug = opts.compileDebug !== false;
+  options.debug = !!opts.debug;
+  options.filename = opts.filename;
+  options.openDelimiter = opts.openDelimiter || exports.openDelimiter || _DEFAULT_OPEN_DELIMITER;
+  options.closeDelimiter = opts.closeDelimiter || exports.closeDelimiter || _DEFAULT_CLOSE_DELIMITER;
+  options.delimiter = opts.delimiter || exports.delimiter || _DEFAULT_DELIMITER;
+  options.strict = opts.strict || false;
+  options.context = opts.context;
+  options.cache = opts.cache || false;
+  options.rmWhitespace = opts.rmWhitespace;
+  options.root = opts.root;
+  options.includer = opts.includer;
+  options.outputFunctionName = opts.outputFunctionName;
+  options.localsName = opts.localsName || exports.localsName || _DEFAULT_LOCALS_NAME;
+  options.views = opts.views;
+  options.async = opts.async;
+  options.destructuredLocals = opts.destructuredLocals;
+  options.legacyInclude = typeof opts.legacyInclude != 'undefined' ? !!opts.legacyInclude : true;
+
+  if (options.strict) {
+    options._with = false;
+  }
+  else {
+    options._with = typeof opts._with != 'undefined' ? opts._with : true;
+  }
+
+  this.opts = options;
+
+  this.regex = this.createRegex();
+}
+
+Template.modes = {
+  EVAL: 'eval',
+  ESCAPED: 'escaped',
+  RAW: 'raw',
+  COMMENT: 'comment',
+  LITERAL: 'literal'
+};
+
+Template.prototype = {
+  createRegex: function () {
+    var str = _REGEX_STRING;
+    var delim = utils.escapeRegExpChars(this.opts.delimiter);
+    var open = utils.escapeRegExpChars(this.opts.openDelimiter);
+    var close = utils.escapeRegExpChars(this.opts.closeDelimiter);
+    str = str.replace(/%/g, delim)
+      .replace(/</g, open)
+      .replace(/>/g, close);
+    return new RegExp(str);
+  },
+
+  compile: function () {
+    /** @type {string} */
+    var src;
+    /** @type {ClientFunction} */
+    var fn;
+    var opts = this.opts;
+    var prepended = '';
+    var appended = '';
+    /** @type {EscapeCallback} */
+    var escapeFn = opts.escapeFunction;
+    /** @type {FunctionConstructor} */
+    var ctor;
+    /** @type {string} */
+    var sanitizedFilename = opts.filename ? JSON.stringify(opts.filename) : 'undefined';
+
+    if (!this.source) {
+      this.generateSource();
+      prepended +=
+        '  var __output = "";\n' +
+        '  function __append(s) { if (s !== undefined && s !== null) __output += s }\n';
+      if (opts.outputFunctionName) {
+        prepended += '  var ' + opts.outputFunctionName + ' = __append;' + '\n';
+      }
+      if (opts.destructuredLocals && opts.destructuredLocals.length) {
+        var destructuring = '  var __locals = (' + opts.localsName + ' || {}),\n';
+        for (var i = 0; i < opts.destructuredLocals.length; i++) {
+          var name = opts.destructuredLocals[i];
+          if (i > 0) {
+            destructuring += ',\n  ';
+          }
+          destructuring += name + ' = __locals.' + name;
+        }
+        prepended += destructuring + ';\n';
+      }
+      if (opts._with === false) {
+        prepended += '  Function.apply(null, ["__append", "escapeFn"].concat(Object.keys(' + opts.localsName + ' || {}), [\n';
+        appended += '])).apply(null, [__append, escapeFn].concat(Object.values(' + opts.localsName + ' || {})));\n';
+        this.source = JSON.stringify(this.source);
+      }
+      appended += '  return __output;' + '\n';
+      this.source = prepended + this.source + appended;
+    }
+
+    if (opts.compileDebug) {
+      src = 'var __line = 1' + '\n'
+        + '  , __lines = ' + JSON.stringify(this.templateText) + '\n'
+        + '  , __filename = ' + sanitizedFilename + ';' + '\n'
+        + 'try {' + '\n'
+        + this.source
+        + '} catch (e) {' + '\n'
+        + '  rethrow(e, __lines, __filename, __line, escapeFn);' + '\n'
+        + '}' + '\n';
+    }
+    else {
+      src = this.source;
+    }
+
+    if (opts.client) {
+      src = 'escapeFn = escapeFn || ' + escapeFn.toString() + ';' + '\n' + src;
+      if (opts.compileDebug) {
+        src = 'rethrow = rethrow || ' + rethrow.toString() + ';' + '\n' + src;
+      }
+    }
+
+    if (opts.strict) {
+      src = '"use strict";\n' + src;
+    }
+    if (opts.debug) {
+      console.log(src);
+    }
+    if (opts.compileDebug && opts.filename) {
+      src = src + '\n'
+        + '//# sourceURL=' + sanitizedFilename + '\n';
+    }
+
+    try {
+      if (opts.async) {
+        // Have to use generated function for this, since in envs without support,
+        // it breaks in parsing
+        try {
+          ctor = (new Function('return (async function(){}).constructor;'))();
+        }
+        catch(e) {
+          if (e instanceof SyntaxError) {
+            throw new Error('This environment does not support async/await');
+          }
+          else {
+            throw e;
+          }
+        }
+      }
+      else {
+        ctor = Function;
+      }
+      fn = new ctor(opts.localsName + ', escapeFn, include, rethrow', src);
+    }
+    catch(e) {
+      // istanbul ignore else
+      if (e instanceof SyntaxError) {
+        if (opts.filename) {
+          e.message += ' in ' + opts.filename;
+        }
+        e.message += ' while compiling ejs\n\n';
+        e.message += 'If the above error is not helpful, you may want to try EJS-Lint:\n';
+        e.message += 'https://github.com/RyanZim/EJS-Lint';
+        if (!opts.async) {
+          e.message += '\n';
+          e.message += 'Or, if you meant to create an async function, pass `async: true` as an option.';
+        }
+      }
+      throw e;
+    }
+
+    // Return a callable function which will execute the function
+    // created by the source-code, with the passed data as locals
+    // Adds a local `include` function which allows full recursive include
+    var returnedFn = opts.client ? fn : function anonymous(data) {
+      var include = function (path, includeData) {
+        var d = utils.shallowCopy({}, data);
+        if (includeData) {
+          d = utils.shallowCopy(d, includeData);
+        }
+        return includeFile(path, opts)(d);
+      };
+      return fn.apply(opts.context, [data || {}, escapeFn, include, rethrow]);
+    };
+    if (opts.filename && typeof Object.defineProperty === 'function') {
+      var filename = opts.filename;
+      var basename = path.basename(filename, path.extname(filename));
+      try {
+        Object.defineProperty(returnedFn, 'name', {
+          value: basename,
+          writable: false,
+          enumerable: false,
+          configurable: true
+        });
+      } catch (e) {/* ignore */}
+    }
+    return returnedFn;
+  },
+
+  generateSource: function () {
+    var opts = this.opts;
+
+    if (opts.rmWhitespace) {
+      // Have to use two separate replace here as `^` and `$` operators don't
+      // work well with `\r` and empty lines don't work well with the `m` flag.
+      this.templateText =
+        this.templateText.replace(/[\r\n]+/g, '\n').replace(/^\s+|\s+$/gm, '');
+    }
+
+    // Slurp spaces and tabs before <%_ and after _%>
+    this.templateText =
+      this.templateText.replace(/[ \t]*<%_/gm, '<%_').replace(/_%>[ \t]*/gm, '_%>');
+
+    var self = this;
+    var matches = this.parseTemplateText();
+    var d = this.opts.delimiter;
+    var o = this.opts.openDelimiter;
+    var c = this.opts.closeDelimiter;
+
+    if (matches && matches.length) {
+      matches.forEach(function (line, index) {
+        var closing;
+        // If this is an opening tag, check for closing tags
+        // FIXME: May end up with some false positives here
+        // Better to store modes as k/v with openDelimiter + delimiter as key
+        // Then this can simply check against the map
+        if ( line.indexOf(o + d) === 0        // If it is a tag
+          && line.indexOf(o + d + d) !== 0) { // and is not escaped
+          closing = matches[index + 2];
+          if (!(closing == d + c || closing == '-' + d + c || closing == '_' + d + c)) {
+            throw new Error('Could not find matching close tag for "' + line + '".');
+          }
+        }
+        self.scanLine(line);
+      });
+    }
+
+  },
+
+  parseTemplateText: function () {
+    var str = this.templateText;
+    var pat = this.regex;
+    var result = pat.exec(str);
+    var arr = [];
+    var firstPos;
+
+    while (result) {
+      firstPos = result.index;
+
+      if (firstPos !== 0) {
+        arr.push(str.substring(0, firstPos));
+        str = str.slice(firstPos);
+      }
+
+      arr.push(result[0]);
+      str = str.slice(result[0].length);
+      result = pat.exec(str);
+    }
+
+    if (str) {
+      arr.push(str);
+    }
+
+    return arr;
+  },
+
+  _addOutput: function (line) {
+    if (this.truncate) {
+      // Only replace single leading linebreak in the line after
+      // -%> tag -- this is the single, trailing linebreak
+      // after the tag that the truncation mode replaces
+      // Handle Win / Unix / old Mac linebreaks -- do the \r\n
+      // combo first in the regex-or
+      line = line.replace(/^(?:\r\n|\r|\n)/, '');
+      this.truncate = false;
+    }
+    if (!line) {
+      return line;
+    }
+
+    // Preserve literal slashes
+    line = line.replace(/\\/g, '\\\\');
+
+    // Convert linebreaks
+    line = line.replace(/\n/g, '\\n');
+    line = line.replace(/\r/g, '\\r');
+
+    // Escape double-quotes
+    // - this will be the delimiter during execution
+    line = line.replace(/"/g, '\\"');
+    this.source += '    ; __append("' + line + '")' + '\n';
+  },
+
+  scanLine: function (line) {
+    var self = this;
+    var d = this.opts.delimiter;
+    var o = this.opts.openDelimiter;
+    var c = this.opts.closeDelimiter;
+    var newLineCount = 0;
+
+    newLineCount = (line.split('\n').length - 1);
+
+    switch (line) {
+    case o + d:
+    case o + d + '_':
+      this.mode = Template.modes.EVAL;
+      break;
+    case o + d + '=':
+      this.mode = Template.modes.ESCAPED;
+      break;
+    case o + d + '-':
+      this.mode = Template.modes.RAW;
+      break;
+    case o + d + '#':
+      this.mode = Template.modes.COMMENT;
+      break;
+    case o + d + d:
+      this.mode = Template.modes.LITERAL;
+      this.source += '    ; __append("' + line.replace(o + d + d, o + d) + '")' + '\n';
+      break;
+    case d + d + c:
+      this.mode = Template.modes.LITERAL;
+      this.source += '    ; __append("' + line.replace(d + d + c, d + c) + '")' + '\n';
+      break;
+    case d + c:
+    case '-' + d + c:
+    case '_' + d + c:
+      if (this.mode == Template.modes.LITERAL) {
+        this._addOutput(line);
+      }
+
+      this.mode = null;
+      this.truncate = line.indexOf('-') === 0 || line.indexOf('_') === 0;
+      break;
+    default:
+      // In script mode, depends on type of tag
+      if (this.mode) {
+        // If '//' is found without a line break, add a line break.
+        switch (this.mode) {
+        case Template.modes.EVAL:
+        case Template.modes.ESCAPED:
+        case Template.modes.RAW:
+          if (line.lastIndexOf('//') > line.lastIndexOf('\n')) {
+            line += '\n';
+          }
+        }
+        switch (this.mode) {
+        // Just executing code
+        case Template.modes.EVAL:
+          this.source += '    ; ' + line + '\n';
+          break;
+          // Exec, esc, and output
+        case Template.modes.ESCAPED:
+          this.source += '    ; __append(escapeFn(' + stripSemi(line) + '))' + '\n';
+          break;
+          // Exec and output
+        case Template.modes.RAW:
+          this.source += '    ; __append(' + stripSemi(line) + ')' + '\n';
+          break;
+        case Template.modes.COMMENT:
+          // Do nothing
+          break;
+          // Literal <%% mode, append as raw output
+        case Template.modes.LITERAL:
+          this._addOutput(line);
+          break;
+        }
+      }
+      // In string mode, just add the output
+      else {
+        this._addOutput(line);
+      }
+    }
+
+    if (self.opts.compileDebug && newLineCount) {
+      this.currentLine += newLineCount;
+      this.source += '    ; __line = ' + this.currentLine + '\n';
+    }
+  }
+};
+
+/**
+ * Escape characters reserved in XML.
+ *
+ * This is simply an export of {@link module:utils.escapeXML}.
+ *
+ * If `markup` is `undefined` or `null`, the empty string is returned.
+ *
+ * @param {String} markup Input string
+ * @return {String} Escaped string
+ * @public
+ * @func
+ * */
+exports.escapeXML = utils.escapeXML;
+
+/**
+ * Express.js support.
+ *
+ * This is an alias for {@link module:ejs.renderFile}, in order to support
+ * Express.js out-of-the-box.
+ *
+ * @func
+ */
+
+exports.__express = exports.renderFile;
+
+/**
+ * Version of EJS.
+ *
+ * @readonly
+ * @type {String}
+ * @public
+ */
+
+exports.VERSION = _VERSION_STRING;
+
+/**
+ * Name for detection of EJS.
+ *
+ * @readonly
+ * @type {String}
+ * @public
+ */
+
+exports.name = _NAME;
+
+/* istanbul ignore if */
+if (typeof window != 'undefined') {
+  window.ejs = exports;
+}
diff --git a/runestone/fitb/js/ejs/lib/utils.js b/runestone/fitb/js/ejs/lib/utils.js
new file mode 100644
index 000000000..4de799a66
--- /dev/null
+++ b/runestone/fitb/js/ejs/lib/utils.js
@@ -0,0 +1,179 @@
+/*
+ * EJS Embedded JavaScript templates
+ * Copyright 2112 Matthew Eernisse (mde@fleegix.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+
+/**
+ * Private utility functions
+ * @module utils
+ * @private
+ */
+
+'use strict';
+
+var regExpChars = /[|\\{}()[\]^$+*?.]/g;
+
+/**
+ * Escape characters reserved in regular expressions.
+ *
+ * If `string` is `undefined` or `null`, the empty string is returned.
+ *
+ * @param {String} string Input string
+ * @return {String} Escaped string
+ * @static
+ * @private
+ */
+exports.escapeRegExpChars = function (string) {
+  // istanbul ignore if
+  if (!string) {
+    return '';
+  }
+  return String(string).replace(regExpChars, function(match) { return "\\" + match; });
+};
+
+var _ENCODE_HTML_RULES = {
+  '&': '&amp;',
+  '<': '&lt;',
+  '>': '&gt;',
+  '"': '&#34;',
+  "'": '&#39;'
+};
+var _MATCH_HTML = /[&<>'"]/g;
+
+function encode_char(c) {
+  return _ENCODE_HTML_RULES[c] || c;
+}
+
+/**
+ * Stringified version of constants used by {@link module:utils.escapeXML}.
+ *
+ * It is used in the process of generating {@link ClientFunction}s.
+ *
+ * @readonly
+ * @type {String}
+ */
+
+var escapeFuncStr =
+  'var _ENCODE_HTML_RULES = {\n'
++ '      "&": "&amp;"\n'
++ '    , "<": "&lt;"\n'
++ '    , ">": "&gt;"\n'
++ '    , \'"\': "&#34;"\n'
++ '    , "\'": "&#39;"\n'
++ '    }\n'
++ '  , _MATCH_HTML = /[&<>\'"]/g;\n'
++ 'function encode_char(c) {\n'
++ '  return _ENCODE_HTML_RULES[c] || c;\n'
++ '};\n';
+
+/**
+ * Escape characters reserved in XML.
+ *
+ * If `markup` is `undefined` or `null`, the empty string is returned.
+ *
+ * @implements {EscapeCallback}
+ * @param {String} markup Input string
+ * @return {String} Escaped string
+ * @static
+ * @private
+ */
+
+exports.escapeXML = function (markup) {
+  return markup == undefined
+    ? ''
+    : String(markup)
+      .replace(_MATCH_HTML, encode_char);
+};
+exports.escapeXML.toString = function () {
+  return Function.prototype.toString.call(this) + ';\n' + escapeFuncStr;
+};
+
+/**
+ * Naive copy of properties from one object to another.
+ * Does not recurse into non-scalar properties
+ * Does not check to see if the property has a value before copying
+ *
+ * @param  {Object} to   Destination object
+ * @param  {Object} from Source object
+ * @return {Object}      Destination object
+ * @static
+ * @private
+ */
+exports.shallowCopy = function (to, from) {
+  from = from || {};
+  for (var p in from) {
+    to[p] = from[p];
+  }
+  return to;
+};
+
+/**
+ * Naive copy of a list of key names, from one object to another.
+ * Only copies property if it is actually defined
+ * Does not recurse into non-scalar properties
+ *
+ * @param  {Object} to   Destination object
+ * @param  {Object} from Source object
+ * @param  {Array} list List of properties to copy
+ * @return {Object}      Destination object
+ * @static
+ * @private
+ */
+exports.shallowCopyFromList = function (to, from, list) {
+  for (var i = 0; i < list.length; i++) {
+    var p = list[i];
+    if (typeof from[p] != 'undefined') {
+      to[p] = from[p];
+    }
+  }
+  return to;
+};
+
+/**
+ * Simple in-process cache implementation. Does not implement limits of any
+ * sort.
+ *
+ * @implements {Cache}
+ * @static
+ * @private
+ */
+exports.cache = {
+  _data: {},
+  set: function (key, val) {
+    this._data[key] = val;
+  },
+  get: function (key) {
+    return this._data[key];
+  },
+  remove: function (key) {
+    delete this._data[key];
+  },
+  reset: function () {
+    this._data = {};
+  }
+};
+
+/**
+ * Transforms hyphen case variable into camel case.
+ *
+ * @param {String} string Hyphen case string
+ * @return {String} Camel case string
+ * @static
+ * @private
+ */
+exports.hyphenToCamel = function (str) {
+  return str.replace(/-[a-z]/g, function (match) { return match[1].toUpperCase(); });
+};
diff --git a/runestone/fitb/js/ejs/package.json b/runestone/fitb/js/ejs/package.json
new file mode 100644
index 000000000..c2b036bea
--- /dev/null
+++ b/runestone/fitb/js/ejs/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "ejs",
+  "description": "Embedded JavaScript templates",
+  "keywords": [
+    "template",
+    "engine",
+    "ejs"
+  ],
+  "version": "3.1.6",
+  "author": "Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)",
+  "license": "Apache-2.0",
+  "bin": {
+    "ejs": "./bin/cli.js"
+  },
+  "main": "./lib/ejs.js",
+  "jsdelivr": "ejs.min.js",
+  "unpkg": "ejs.min.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/mde/ejs.git"
+  },
+  "bugs": "https://github.com/mde/ejs/issues",
+  "homepage": "https://github.com/mde/ejs",
+  "dependencies": {
+    "jake": "^10.6.1"
+  },
+  "devDependencies": {
+    "browserify": "^16.5.1",
+    "eslint": "^6.8.0",
+    "git-directory-deploy": "^1.5.1",
+    "jsdoc": "^3.6.4",
+    "lru-cache": "^4.0.1",
+    "mocha": "^7.1.1",
+    "uglify-js": "^3.3.16"
+  },
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "test": "mocha"
+  }
+}
diff --git a/runestone/fitb/js/fitb-i18n.en.js b/runestone/fitb/js/fitb-i18n.en.js
index cc949cd7f..31d8e00f7 100644
--- a/runestone/fitb/js/fitb-i18n.en.js
+++ b/runestone/fitb/js/fitb-i18n.en.js
@@ -3,5 +3,6 @@ $.i18n().load({
         msg_no_answer: "No answer provided.",
         msg_fitb_check_me: "Check me",
         msg_fitb_compare_me: "Compare me",
+        msg_fitb_randomize: "Randomize"
     },
 });
diff --git a/runestone/fitb/js/fitb-utils.js b/runestone/fitb/js/fitb-utils.js
new file mode 100644
index 000000000..83d590ddb
--- /dev/null
+++ b/runestone/fitb/js/fitb-utils.js
@@ -0,0 +1,242 @@
+// ********************************************************
+// |docname| - grading-related utilities for FITB questions
+// ********************************************************
+// This code runs both on the server (for server-side grading) and on the client. It's placed here as a set of functions specifically for this purpose.
+
+
+"use strict";
+
+// Includes
+// ========
+// This is an edited copy of `EJS <https://ejs.co/>`_:
+//
+// -    It contains the improvement mentioned in `this issue <https://github.com/mde/ejs/issues/624>`_.
+// -    It also contains a workaround for a `js2py v0.71 bug <https://github.com/PiotrDabkowski/Js2Py/pull/265>`_. The fix is merged, but not yet released.
+//
+// If both issues are merged and released, then use EJS from NPM.
+import { render as ejs_render } from "./ejs/lib/ejs.js";
+
+
+// Globals
+// =======
+// Standard options to use for EJS templates.
+const EJS_OPTIONS = {
+    strict: true,
+    // Not needed, but might reduce confusion -- you can access the variable ``a`` as ``a`` or ``v.a``.
+    localsName: "v",
+    // Avoid the default delimiters of ``<`` and ``>``, which get translated to HTML entities by Sphinx.
+    openDelimiter: "[",
+    closeDelimiter: "]"
+};
+
+
+// Functions
+// =========
+// Update the problem's description based on dynamically-generated content.
+export function renderDynamicContent(seed, dyn_vars, html_in) {
+    // Initialize RNG with ``this.seed``. Taken from `SO <https://stackoverflow.com/a/47593316/16038919>`_.
+    const rand = function mulberry32(a) {
+        return function() {
+            var t = a += 0x6D2B79F5;
+            t = Math.imul(t ^ t >>> 15, t | 1);
+            t ^= t + Math.imul(t ^ t >>> 7, t | 61);
+            return ((t ^ t >>> 14) >>> 0) / 4294967296;
+        }
+    }(seed);
+
+    // See `RAND_FUNC <RAND_FUNC>`_, which refers to ``rand`` above.
+    const dyn_vars_eval = window.Function("v", "rand", `"use strict";\n${dyn_vars};\nreturn v;`)({}, RAND_FUNC);
+    let html_out = "";
+    try {
+        html_out = ejs_render(html_in, dyn_vars_eval, EJS_OPTIONS);
+    } catch (err) {
+        html_out += `<pre style="color: red">${err}</pre>`;
+    }
+
+    return [html_out, dyn_vars_eval];
+}
+
+// Given student answers, grade them and provide feedback.
+//
+// Outputs:
+//
+// -    ``displayFeed`` is an array of HTML feedback.
+// -    ``isCorrectArray`` is an array of true, false, or null (the question wasn't answered).
+// -    ``correct`` is true, false, or null (the question wasn't answered).
+// -    ``percent`` is the percentage of correct answers (from 0 to 1, not 0 to 100).
+export function evaluateAnswersCore(
+    // _`blankNamesDict`: An dict of {blank_name, blank_index} specifying the name for each (named) blank.
+    blankNamesDict,
+    // _`given_arr`: An array of strings containing student-provided answers for each blank.
+    given_arr,
+    // A 2-D array of strings giving feedback for each blank.
+    feedbackArray,
+    // _`dyn_vars_eval`: A dict produced by evaluating the JavaScript for a dynamic exercise.
+    dyn_vars_eval,
+    // True if this is running on the server, to work around a `js2py v0.71 bug <https://github.com/PiotrDabkowski/Js2Py/pull/266>`_ fixed in master. When a new version is released, remove this.
+    is_server=false,
+) {
+    // Keep track if all answers are correct or not.
+    let correct = true;
+    let isCorrectArray = [];
+    let displayFeed = [];
+    for (var i = 0; i < given_arr.length; i++) {
+        var given = given_arr[i];
+        // If this blank is empty, provide no feedback for it.
+        if (given === "") {
+            isCorrectArray.push(null);
+            // TODO: was $.i18n("msg_no_answer").
+            displayFeed.push("No answer provided.");
+            correct = false;
+        } else {
+            // Look through all feedback for this blank. The last element in the array always matches. If no feedback for this blank exists, use an empty list.
+            var fbl = feedbackArray[i] || [];
+            for (var j = 0; j < fbl.length; j++) {
+                // The last item of feedback always matches.
+                if (j === fbl.length - 1) {
+                    displayFeed.push(fbl[j]["feedback"]);
+                    break;
+                }
+                // If this is a dynamic solution...
+                if (dyn_vars_eval) {
+                    // Prepare the needed inputs for calling the grading function.
+                    //
+                    // Provide a dict of {blank_name, converter_answer_value}.
+                    const blankValues = getBlankValues(given_arr, blankNamesDict, dyn_vars_eval);
+                    // Compute an array of [blank_0_name, ...].
+                    let given_arr_names = [];
+                    for (const [k, v] of Object.entries(blankNamesDict)) {
+                        given_arr_names[v] = k;
+                    }
+                    // Compute an array of [converted_blank_0_val, ...].
+                    const given_arr_converted = given_arr.map((value, index) => type_convert(given_arr_names[index], value, index, dyn_vars_eval));
+                    // Create a function to wrap the expression to evaluate. See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/Function.
+                    // Pass the answer, array of all answers, then all entries in ``this.dyn_vars_eval`` dict as function parameters.
+                    let is_correct = window.Function(
+                        "ans",
+                        "ans_array",
+                        // Not necessary, but allows access of a variable such as ``a`` using ``v.a`` (or as ``a``).
+                        "v",
+                        ...Object.keys(dyn_vars_eval),
+                        ...Object.keys(blankValues),
+                        `"use strict;"\nreturn ${fbl[j]["solution_code"]};`
+                    )(
+                        given_arr_converted[j],
+                        given_arr_converted,
+                        Object.assign({}, dyn_vars_eval, blankValues),
+                        ...Object.values(dyn_vars_eval),
+                        ...Object.values(blankValues)
+                    );
+                    if (is_correct) {
+                        displayFeed.push(fbl[j]["feedback"]);
+                        break;
+                    }
+                } else
+                // If this is a regexp...
+                if ("regex" in fbl[j]) {
+                    var patt = RegExp(
+                        fbl[j]["regex"],
+                        fbl[j]["regexFlags"]
+                    );
+                    if (patt.test(given)) {
+                        displayFeed.push(fbl[j]["feedback"]);
+                        break;
+                    }
+                } else {
+                    // This is a number.
+                    console.assert("number" in fbl[j]);
+                    var [min, max] = fbl[j]["number"];
+                    // Convert the given string to a number. While there are `lots of ways <https://coderwall.com/p/5tlhmw/converting-strings-to-number-in-javascript-pitfalls>`_ to do this; this version supports other bases (hex/binary/octal) as well as floats.
+                    var actual = +given;
+                    if (actual >= min && actual <= max) {
+                        displayFeed.push(fbl[j]["feedback"]);
+                        break;
+                    }
+                }
+            }
+
+            // js2py seems to increment j in the for loop **after** encountering a break statement. Aargh. Work around this.
+            if (is_server) {
+                --j;
+            }
+            // The answer is correct if it matched the first element in the array. A special case: if only one answer is provided, count it wrong; this is a misformed problem.
+            let is_correct = j === 0 && fbl.length > 1;
+            isCorrectArray.push(is_correct);
+            if (!is_correct) {
+                correct = false;
+            }
+        }
+    }
+
+    const percent = isCorrectArray.filter(Boolean).length / isCorrectArray.length;
+    return [displayFeed, correct, isCorrectArray, percent];
+}
+
+
+// Render the feedback for a dynamic problem.
+export function renderDynamicFeedback(
+    // See blankNamesDict_.
+    blankNamesDict,
+    // See given_arr_.
+    given_arr,
+    // The index of this blank in given_arr_.
+    index,
+    // The feedback for this blank, containing a template to be rendered.
+    displayFeed_i,
+    // See dyn_vars_eval_.
+    dyn_vars_eval
+) {
+    // Use the answer, an array of all answers, the value of all named blanks, and all solution variables for the template.
+    const blankValues = getBlankValues(given_arr, blankNamesDict, dyn_vars_eval);
+    const sol_vars_plus = Object.assign({
+        ans: given_arr[index],
+        ans_array: given_arr
+    },
+        dyn_vars_eval,
+        blankValues,
+    );
+    try {
+        displayFeed_i = ejs_render(displayFeed_i, sol_vars_plus, EJS_OPTIONS);
+    } catch (err) {
+        displayFeed_i += `<pre style="color: red">${err}</pre>`;
+    }
+
+    return displayFeed_i;
+}
+
+
+// Utilities
+// ---------
+// For each named blank, get the value for the blank: the value of each ``blankName`` gives the index of the blank for that name.
+function getBlankValues(given_arr, blankNamesDict, dyn_vars_eval) {
+    let blankValues = {};
+    for (let [blank_name, blank_index] of Object.entries(blankNamesDict)) {
+        blankValues[blank_name] = type_convert(blank_name, given_arr[blank_index], blank_index, dyn_vars_eval);
+    }
+    return blankValues;
+}
+
+
+// Convert a value given its type.
+function type_convert(name, value, index, dyn_vars_eval) {
+    // The converter can be defined by index, name, or by a single value (which applies to all blanks). If not provided, just pass the data through.
+    const types = dyn_vars_eval.types || pass_through;
+    let converter = types[name] || types[index] || types;
+    // ES5 hack: it doesn't support binary values, and js2py doesn't allow me to override the ``Number`` class. So, define the workaround class ``Number_`` and use it if available.
+    console.log([converter, Number, converter === Number, typeof Number_, name, value, index, dyn_vars_eval]);
+    if (converter === Number && typeof Number_ !== "undefined") {
+        converter = Number_;
+    }
+    try {
+        return converter(value);
+    } catch (err) {
+        console.log(`Error converting blank named "${name}" with value "${value}" at blank index ${index} using converter ${converter.name}: ${err}.`);
+        return value;
+    }
+}
+
+
+// A pass-through "converter".
+function pass_through(val) {
+    return val;
+}
\ No newline at end of file
diff --git a/runestone/fitb/js/fitb.js b/runestone/fitb/js/fitb.js
index cea20fc42..9de714aac 100644
--- a/runestone/fitb/js/fitb.js
+++ b/runestone/fitb/js/fitb.js
@@ -1,15 +1,80 @@
-// *********
-// |docname|
-// *********
+// ***********************************************
+// |docname| -- fill-in-the-blank client-side code
+// ***********************************************
 // This file contains the JS for the Runestone fillintheblank component. It was created By Isaiah Mayerchak and Kirby Olson, 6/4/15 then revised by Brad Miller, 2/7/20.
+//
+// Data storage notes
+// ==================
+//
+// Initial problem restore
+// -----------------------
+// Client restores the problem, server sends or local storage has:
+//
+// -    seed (used only for dynamic problems)
+// -    answer
+// -    displayFeed (server-side grading only)
+// -    correct (SSG)
+// -    isCorrectArray (SSG)
+// -    problemHtml (SSG with dynamic problems only)
+//
+// If any of the answers are true, then the client shows feedback. This is implemented in restoreAnswers_.
+//
+// Grading
+// -------
+// When the user presses the "Check me" button, the logCurrentAnswer_ function:
+//
+// -    Saves the following to local storage:
+//
+//      -   seed
+//      -   answer
+//      -   timestamp
+//      -   problemHtml
+//
+//      Note that there's no point in saving displayFeed, correct, or isCorrectArray, since these values applied to the previous answer, not the new answer just submitted.
+//
+// -    Sends the following to the server; stop after this for client-side grading:
+//
+//      -   seed (ignored for server-side grading)
+//      -   answer
+//      -   correct (ignored for SSG)
+//      -   percent (ignored for SSG)
+//
+// -    Receives the following from the server:
+//
+//      -   timestamp
+//      -   displayFeed
+//      -   correct
+//      -   isCorrectArray
+//
+// -    Saves the following to local storage:
+//
+//      -   seed
+//      -   answer
+//      -   timestamp
+//      -   problemHtml
+//      -   displayFeed (SSG only)
+//      -   correct (SSG only)
+//      -   isCorrectArray (SSG only)
+//
+// Randomize
+// ---------
+// When the user presses the "Randomize" button (which is only available for dynamic problems), the randomize_ function:
+//
+// -    For the client-side case, sets the seed to a new, random value. For the server-side case, requests a new seed and problemHtml from the server.
+// -    Sets the answer to an array of empty strings.
+// -    Saves the usual local data.
+
+
 "use strict";
 
 import RunestoneBase from "../../common/js/runestonebase.js";
+import { renderDynamicContent, evaluateAnswersCore, renderDynamicFeedback } from "./fitb-utils.js";
 import "./fitb-i18n.en.js";
 import "./fitb-i18n.pt-br.js";
 import "../css/fitb.css";
 
-export var FITBList = {}; // Object containing all instances of FITB that aren't a child of a timed assessment.
+// Object containing all instances of FITB that aren't a child of a timed assessment.
+export var FITBList = {};
 
 // FITB constructor
 export default class FITB extends RunestoneBase {
@@ -22,14 +87,28 @@ export default class FITB extends RunestoneBase {
         this.correct = null;
         // See comments in fitb.py for the format of ``feedbackArray`` (which is identical in both files).
         //
-        // Find the script tag containing JSON and parse it. See `SO <https://stackoverflow.com/questions/9320427/best-practice-for-embedding-arbitrary-json-in-the-dom>`_. If this parses to ``false``, then no feedback is available; server-side grading will be performed.
-        this.feedbackArray = JSON.parse(
-            this.scriptSelector(this.origElem).html()
-        );
+        // Find the script tag containing JSON and parse it. See `SO <https://stackoverflow.com/questions/9320427/best-practice-for-embedding-arbitrary-json-in-the-dom>`__. If this tag doesn't exist, then no feedback is available; server-side grading will be performed.
+        //
+        // A destructuring assignment would be perfect, but they don't work with ``this.blah`` and ``with`` statements aren't supported in strict mode.
+        const json_element = this.scriptSelector(this.origElem);
+        const dict_ = JSON.parse(json_element.html());
+        json_element.remove();
+        this.problemHtml = dict_.problemHtml;
+        this.dyn_vars = dict_.dyn_vars;
+        this.blankNames = dict_.blankNames;
+        this.feedbackArray = dict_.feedbackArray;
+
         this.createFITBElement();
+        this.setupBlanks();
         this.caption = "Fill in the Blank";
         this.addCaption("runestone");
-        this.checkServer("fillb", true);
+        this.checkServer("fillb", false).then(() => {
+            // If there's no seed for a client-side dynamic problem after this check, create one and render it.
+            if (typeof this.dyn_vars === "string" && this.seed === undefined) {
+                this.randomize();
+            }
+            this.indicate_component_ready();
+        });
     }
     // Find the script tag containing JSON in a given root DOM node.
     scriptSelector(root_node) {
@@ -50,31 +129,22 @@ export default class FITB extends RunestoneBase {
         this.containerDiv = document.createElement("div");
         $(this.containerDiv).addClass("alert alert-warning");
         this.containerDiv.id = this.divid;
-        // Copy the original elements to the container holding what the user will see.
-        $(this.origElem).children().clone().appendTo(this.containerDiv);
-        // Remove the script tag.
-        this.scriptSelector(this.containerDiv).remove();
-        // Set the class for the text inputs, then store references to them.
-        let ba = $(this.containerDiv).find(":input");
-        ba.attr("class", "form form-control selectwidthauto");
-        ba.attr("aria-label", "input area");
-        this.blankArray = ba.toArray();
-        // When a blank is changed mark this component as interacted with.
-        // And set a class on the component in case we want to render components that have been used
-        // differently
-        for (let blank of this.blankArray) {
-            $(blank).change(this.recordAnswered.bind(this));
+        // Create another container which stores the problem description.
+        this.descriptionDiv = document.createElement("div");
+        this.containerDiv.appendChild(this.descriptionDiv)
+        // Copy the original elements to the container holding what the user will see (client-side grading only).
+        if (this.problemHtml) {
+            this.descriptionDiv.innerHTML = this.problemHtml;
+            // Save original HTML (with templates) used in dynamic problems.
+            this.descriptionDiv.origInnerHTML = this.problemHtml;
         }
     }
 
-    recordAnswered() {
-        this.isAnswered = true;
-        //let rcontainer = this.containerDiv.closest(".runestone");
-        //rcontainer.addClass("answered");
-    }
-
     renderFITBButtons() {
-        // "submit" button and "compare me" button
+        this.containerDiv.appendChild(document.createElement("br"));
+        this.containerDiv.appendChild(document.createElement("br"));
+
+        // "submit" button
         this.submitButton = document.createElement("button");
         this.submitButton.textContent = $.i18n("msg_fitb_check_me");
         $(this.submitButton).attr({
@@ -84,15 +154,15 @@ export default class FITB extends RunestoneBase {
         });
         this.submitButton.addEventListener(
             "click",
-            function () {
+            async function () {
                 this.checkCurrentAnswer();
-                this.logCurrentAnswer();
+                await this.logCurrentAnswer();
             }.bind(this),
             false
         );
-        this.containerDiv.appendChild(document.createElement("br"));
-        this.containerDiv.appendChild(document.createElement("br"));
         this.containerDiv.appendChild(this.submitButton);
+
+        // "compare me" button
         if (this.useRunestoneServices) {
             this.compareButton = document.createElement("button");
             $(this.compareButton).attr({
@@ -111,6 +181,26 @@ export default class FITB extends RunestoneBase {
             );
             this.containerDiv.appendChild(this.compareButton);
         }
+
+        // Randomize button for dynamic problems.
+        if (this.dyn_vars) {
+            this.randomizeButton = document.createElement("button");
+            $(this.randomizeButton).attr({
+                class: "btn btn-default",
+                id: this.origElem.id + "_bcomp",
+                name: "randomize",
+            });
+            this.randomizeButton.textContent = $.i18n("msg_fitb_randomize");
+            this.randomizeButton.addEventListener(
+                "click",
+                function () {
+                    this.randomize();
+                }.bind(this),
+                false
+            );
+            this.containerDiv.appendChild(this.randomizeButton);
+        }
+
         this.containerDiv.appendChild(document.createElement("div"));
     }
     renderFITBFeedbackDiv() {
@@ -119,10 +209,59 @@ export default class FITB extends RunestoneBase {
         this.containerDiv.appendChild(document.createElement("br"));
         this.containerDiv.appendChild(this.feedBackDiv);
     }
+
+    clearFeedbackDiv() {
+        // Setting the ``outerHTML`` removes this from the DOM. Use an alternative process -- remove the class (which makes it red/green based on grading) and content.
+        this.feedBackDiv.innerHTML = "";
+        this.feedBackDiv.className = "";
+    }
+
+    // Update the problem's description based on dynamically-generated content.
+    renderDynamicContent() {
+        // ``this.dyn_vars`` can be true; if so, don't render it, since the server does all the rendering.
+        if (typeof this.dyn_vars === "string") {
+            [this.descriptionDiv.innerHTML, this.dyn_vars_eval] = renderDynamicContent(this.seed, this.dyn_vars, this.descriptionDiv.origInnerHTML);
+            this.runMathJax(this.descriptionDiv);
+            this.setupBlanks();
+        }
+    }
+
+    runMathJax(element, count=10) {
+        if (typeof MathJax !== "undefined" && count > 0) {
+            // Sometimes, MathJax exists but hasn't finished loading yet. wait for it.
+            if (typeof MathJax.Hub === "undefined") {
+                setTimeout(this.runMathJax, 1000, element, count - 1);
+            } else {
+                MathJax.Hub.Queue(["Typeset", MathJax.Hub, element]);
+            }
+        }
+    }
+
+    setupBlanks() {
+        // Find and format the blanks. If a dynamic problem just changed the HTML, this will find the newly-created blanks.
+        const ba = $(this.descriptionDiv).find(":input");
+        ba.attr("class", "form form-control selectwidthauto");
+        ba.attr("aria-label", "input area");
+        this.blankArray = ba.toArray();
+        for (let blank of this.blankArray) {
+            $(blank).change(this.recordAnswered.bind(this));
+        }
+    }
+
+    // This tells timed questions that the fitb blanks received some interaction.
+    recordAnswered() {
+        this.isAnswered = true;
+    }
+
     /*===================================
     === Checking/loading from storage ===
     ===================================*/
+    // _`restoreAnswers`: update the problem with data from the server or from local storage.
     restoreAnswers(data) {
+        // Restore the seed first, since the dynamic render clears all the blanks.
+        this.seed = data.seed;
+        this.renderDynamicContent();
+
         var arr;
         // Restore answers from storage retrieval done in RunestoneBase.
         try {
@@ -134,13 +273,23 @@ export default class FITB extends RunestoneBase {
             }
         } catch (err) {
             // The old format didn't.
-            arr = data.answer.split(",");
+            arr = (data.answer || "").split(",");
         }
+        let hasAnswer = false;
         for (var i = 0; i < this.blankArray.length; i++) {
             $(this.blankArray[i]).attr("value", arr[i]);
+            if (arr[i]) {
+                hasAnswer = true;
+            }
         }
-        // Use the feedback from the server, or recompute it locally.
-        if (!this.feedbackArray) {
+        // Is this client-side grading, or server-side grading?
+        if (this.feedbackArray) {
+            // For client-side grading, re-generate feedback if there's an answer.
+            if (hasAnswer) {
+                this.checkCurrentAnswer();
+            }
+        } else {
+            // For server-side grading, use the provided feedback from the server or local storage.
             this.displayFeed = data.displayFeed;
             this.correct = data.correct;
             this.isCorrectArray = data.isCorrectArray;
@@ -152,8 +301,13 @@ export default class FITB extends RunestoneBase {
             ) {
                 this.renderFeedback();
             }
-        } else {
-            this.checkCurrentAnswer();
+            // For server-side dynamic problems, show the rendered problem text.
+            this.problemHtml = data.problemHtml;
+            if (this.problemHtml) {
+                this.descriptionDiv.innerHTML = this.problemHtml;
+                this.runMathJax(this.descriptionDiv);
+                this.setupBlanks();
+            }
         }
     }
     checkLocalStorage() {
@@ -203,40 +357,104 @@ export default class FITB extends RunestoneBase {
         }
     }
 
-    async logCurrentAnswer(sid) {
-        let answer = JSON.stringify(this.given_arr);
-        // Save the answer locally.
-        let feedback = true;
+    // _`randomize`: This handles a click to the "Randomize" button.
+    async randomize() {
+        // Use the client-side case or the server-side case?
+        if (this.feedbackArray) {
+            // This is the client-side case.
+            //
+            this.seed = Math.floor(Math.random()*2**32);
+            this.renderDynamicContent();
+        } else {
+            // This is the server-side case. Send a request to the `results <getAssessResults>` endpoint with ``new_seed`` set to True.
+            const request = new Request("/assessment/results", {
+                method: "POST",
+                body: JSON.stringify({
+                    div_id: this.divid,
+                    course: eBookConfig.course,
+                    event: "fillb",
+                    sid: this.sid,
+                    new_seed: true,
+                }),
+                headers: this.jsonHeaders,
+            });
+            const response = await fetch(request);
+            if (!response.ok) {
+                alert(
+                    `HTTP error getting results: ${response.statusText}`
+                );
+                return;
+            }
+            const data = await response.json();
+            const res = data.detail;
+            this.seed = res.seed;
+            this.descriptionDiv.innerHTML = res.problemHtml;
+            this.runMathJax(this.descriptionDiv);
+            this.setupBlanks();
+        }
+        // When getting a new seed, clear all the old answers and feedback.
+        this.given_arr = Array(this.blankArray.len).fill("");
+        $(this.blankArray).attr("value", "");
+        this.clearFeedbackDiv();
+        this.saveAnswersLocallyOnly();
+    }
+
+    // Save the answers and associated data locally; don't save feedback provided by the server for this answer. It assumes that ``this.given_arr`` contains the current answers.
+    saveAnswersLocallyOnly() {
         this.setLocalStorage({
-            answer: answer,
+            // The seed is used for client-side operation, but doesn't matter for server-side.
+            seed: this.seed,
+            answer: JSON.stringify(this.given_arr),
             timestamp: new Date(),
+            // This is only needed for server-side grading with dynamic problems.
+            problemHtml: this.descriptionDiv.innerHTML,
         });
-        let data = {
+
+    }
+
+    // _`logCurrentAnswer`: Save the current state of the problem to local storage and the server; display server feedback.
+    async logCurrentAnswer(sid) {
+        let answer = JSON.stringify(this.given_arr);
+        let feedback = true;
+        // Save the answer locally.
+        this.saveAnswersLocallyOnly();
+        // Save the answer to the server.
+        const data = {
             event: "fillb",
+            div_id: this.divid,
             act: answer,
+            seed: this.seed,
             answer: answer,
             correct: this.correct ? "T" : "F",
-            div_id: this.divid,
+            percent: this.percent,
         };
         if (typeof sid !== "undefined") {
             data.sid = sid;
             feedback = false;
-        };
-        data = await this.logBookEvent(data);
-        data = data.detail;
+        }
+        const server_data = await this.logBookEvent(data);
         if (!feedback) return;
-        if (!this.feedbackArray) {
-            // On success, update the feedback from the server's grade.
-            this.setLocalStorage({
-                answer: answer,
-                timestamp: data.timestamp,
-            });
-            this.correct = data.correct;
-            this.displayFeed = data.displayFeed;
-            this.isCorrectArray = data.isCorrectArray;
-            this.renderFeedback();
+        // Non-server side graded problems are done at this point; likewise, stop here if the server didn't respond.
+        if (this.feedbackArray || !server_data) {
+            return data;
         }
-        return data;
+        // This is the server-side case. On success, update the feedback from the server's grade.
+        const res = server_data.detail;
+        this.displayFeed = res.displayFeed;
+        this.correct = res.correct;
+        this.isCorrectArray = res.isCorrectArray;
+        this.setLocalStorage({
+            seed: this.seed,
+            answer: answer,
+            // TODO: should this be updated with the date from the server instead?
+            timestamp: new Date(),
+            problemHtml: this.descriptionDiv.innerHTML,
+            displayFeed: this.displayFeed,
+            correct: this.correct,
+            isCorrectArray: this.isCorrectArray,
+        });
+        this.renderFeedback();
+        return server_data;
     }
 
     /*==============================
@@ -254,56 +472,7 @@ export default class FITB extends RunestoneBase {
     // - ``this.isCorrectArray`` is an array of true, false, or null (the question wasn't answered).
     // - ``this.correct`` is true, false, or null (the question wasn't answered).
     evaluateAnswers() {
-        // Keep track if all answers are correct or not.
-        this.correct = true;
-        for (var i = 0; i < this.blankArray.length; i++) {
-            var given = this.blankArray[i].value;
-            // If this blank is empty, provide no feedback for it.
-            if (given === "") {
-                this.isCorrectArray.push(null);
-                this.displayFeed.push($.i18n("msg_no_answer"));
-                this.correct = false;
-            } else {
-                // Look through all feedback for this blank. The last element in the array always matches. If no feedback for this blank exists, use an empty list.
-                var fbl = this.feedbackArray[i] || [];
-                for (var j = 0; j < fbl.length; j++) {
-                    // The last item of feedback always matches.
-                    if (j === fbl.length - 1) {
-                        this.displayFeed.push(fbl[j]["feedback"]);
-                        break;
-                    }
-                    // If this is a regexp...
-                    if ("regex" in fbl[j]) {
-                        var patt = RegExp(
-                            fbl[j]["regex"],
-                            fbl[j]["regexFlags"]
-                        );
-                        if (patt.test(given)) {
-                            this.displayFeed.push(fbl[j]["feedback"]);
-                            break;
-                        }
-                    } else {
-                        // This is a number.
-                        console.assert("number" in fbl[j]);
-                        var [min, max] = fbl[j]["number"];
-                        // Convert the given string to a number. While there are `lots of ways <https://coderwall.com/p/5tlhmw/converting-strings-to-number-in-javascript-pitfalls>`_ to do this; this version supports other bases (hex/binary/octal) as well as floats.
-                        var actual = +given;
-                        if (actual >= min && actual <= max) {
-                            this.displayFeed.push(fbl[j]["feedback"]);
-                            break;
-                        }
-                    }
-                }
-                // The answer is correct if it matched the first element in the array. A special case: if only one answer is provided, count it wrong; this is a misformed problem.
-                let is_correct = j === 0 && fbl.length > 1;
-                this.isCorrectArray.push(is_correct);
-                if (!is_correct) {
-                    this.correct = false;
-                }
-            }
-        }
-        this.percent =
-            this.isCorrectArray.filter(Boolean).length / this.blankArray.length;
+        [this.displayFeed, this.correct, this.isCorrectArray, this.percent] = evaluateAnswersCore(this.blankNames, this.given_arr, this.feedbackArray, this.dyn_vars_eval);
     }
 
     renderFeedback() {
@@ -327,7 +496,12 @@ export default class FITB extends RunestoneBase {
         }
         var feedback_html = "<ul>";
         for (var i = 0; i < this.displayFeed.length; i++) {
-            feedback_html += "<li>" + this.displayFeed[i] + "</li>";
+            let df = this.displayFeed[i];
+            // Render any dynamic feedback in the provided feedback, for client-side grading of dynamic problems.
+            if (typeof this.dyn_vars === "string") {
+                df = renderDynamicFeedback(this.blankNames, this.given_arr, i, df, this.dyn_vars_eval);
+            }
+            feedback_html += `<li>${df}</li>`;
         }
         feedback_html += "</ul>";
         // Remove the list if it's just one element.
@@ -338,9 +512,7 @@ export default class FITB extends RunestoneBase {
             );
         }
         this.feedBackDiv.innerHTML = feedback_html;
-        if (typeof MathJax !== "undefined") {
-            this.queueMathJax(document.body)
-        }
+        this.runMathJax(this.feedBackDiv);
     }
 
     /*==================================
diff --git a/runestone/fitb/js/timedfitb.js b/runestone/fitb/js/timedfitb.js
index e60b5665b..8484775b4 100644
--- a/runestone/fitb/js/timedfitb.js
+++ b/runestone/fitb/js/timedfitb.js
@@ -43,9 +43,7 @@ export default class TimedFITB extends FITB {
     }
 
     reinitializeListeners() {
-        for (let blank of this.blankArray) {
-            $(blank).change(this.recordAnswered.bind(this));
-        }
+        this.setupBlanks();
     }
 }
 
diff --git a/runestone/fitb/test/_sources/index.rst b/runestone/fitb/test/_sources/index.rst
index 7f46d880d..3da4f99f9 100644
--- a/runestone/fitb/test/_sources/index.rst
+++ b/runestone/fitb/test/_sources/index.rst
@@ -24,14 +24,14 @@ Test 2 - test a numeric range.
 
     .. If this isn't treated as a comment, then it will cause a **syntax error, thus producing a test failure.
 
-    What is the solution to the following:
+    What is the solution to the following?
 
     :math:`2 * \pi =` |blank|.
 
-    - :6.28 0.005: Good job.
-      :3.27 3: Try higher.
-      :9.29 3: Try lower.
-      :.*: Incorrect. Try again.
+    -   :6.28 0.005: Good job.
+        :3.27 3: Try higher.
+        :9.29 3: Try lower.
+        :.*: Incorrect. Try again.
 
 Error testing
 -------------
@@ -85,3 +85,113 @@ Regex testing
 
    -   :\[\]: Correct.
        :x: Try again.
+
+
+Dynamic problem testing
+-----------------------
+TODO items:
+
+-   Need a good basic math library.
+-   Need a `good approximate equality test <https://docs.pytest.org/en/6.2.x/reference.html#pytest-approx>`_.
+
+This problem demonstrates the basic syntax for a dynamic problem:
+
+-   Define dynamic variables by placing JavaScript code in the ``:dyn_vars:`` option of a fill-in-the-blank problem.
+
+    -   Use only the ``rand()`` function to generate random numbers. This function produces values from a seeded RNG; this seed is saved on the client or server and restored so the problem doesn't change every time the page is refreshed.
+    -   Any arbitrary JavaScript code can be included, such as defining functions, temporary variables, ``for`` loops, etc.
+    -   **Blank lines are not allowed** due to the way reStructuredText parses options -- instead, use a comment with no content for additional visual space. See the quadratic roots problem for an example.
+    -   To include additional JavaScript libraries for use in your problems, follow `these directions <https://docs.readthedocs.io/en/stable/guides/adding-custom-css.html>`_. (Note that the Runestone authoring system is built on Sphinx).
+
+-   Use ``v.``\ *variable_name* when creating variables inside the ``:dyn_vars:`` option for use in the problem. Everywhere else, use just *variable_name*.
+-   Use the syntax ``[%=`` *JavaScript_variable_name_or_expression* ``%]`` to display the value of a variable or expression in the problem description or in the feedback. Inside these tags, avoid the use of the `reserved HTML characters <https://developer.mozilla.org/en-US/docs/Glossary/Entity>`_ ``&``, ``<``, ``>``, and ``"``. These will be automatically translated to HTML character entities ``&amp;``, ``&lt;``, ``&gt;``, and ``&quot;``, which will confuse the JavaScript interpreter. For example, ``[%= a < b %]`` becomes ``[%= a &lt; b %]``, which produces a JavaScript error. Instead, put these expressions in the ``:dyn_vars:`` option, where no translation is done. For example, place ``v.c = a < b;`` in ``:dyn_vars:`` then use ``%[= c %]`` in the problem description instead.
+-   Create named blanks in the problem description using the syntax ``:blank:`blank_name_here```. You may also used unnamed blanks as usual via ``|blank|``.
+-   In the problem's feedback section, refer to a blank in any of three ways: the blank's name, ``ans`` (the student-provided answer for this blank), or the blank's index in ``ans_array`` (an array of all student-provided answers for this problem).
+-   Optionally (though strongly recommended) provide a type converter for blanks in either of the three following ways:
+
+    -   A dict of ``v.types = {blank0_name: converter0, blank1_name: converter1, ...}`` based on the blank's names.
+    -   An array of ``v.types = [blank0_converter, blank1_converter, ...]`` based on the blank's index (order of appearance in the problem).
+    -   A value of ``v.types = converter_for_all_blanks``.
+
+    The converter is a function that takes a string (the raw value entered by a student) as input, returning the string converted to the appropriate type. If the converter isn't specified, then no conversion is performed. The standard JavaScript library provides the ``Number`` converter. [#converters]_ Converters bring a number of important advantages:
+
+    -   Using a converter helps avoid unexpected results for expressions:
+
+        -   Without conversion, the expression ``blank1 + blank2`` concatenates the two blanks as strings instead of adding them as numbers.
+        -   Without conversion, The expression ``ans == 0`` is true if the answer was blank, since JavaScript converts an empty string to the value 0. Likewise, ``ans < 1`` is true for a blank answer.
+    -   Converters allow `strict equality/inequality comparisons <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Equality_comparisons_and_sameness>`_ in JavaScript (``===``/\ ``!==``).
+    -   Converters provides a natural method to handle more complex types such as complex numbers, equations, matrices, etc.
+
+The problems below convert their inputs using ``Number``.
+
+.. fillintheblank:: test_fitb_dynamic_1
+    :dyn_vars:
+        v.a = Math.floor(rand()*10);
+        v.b = Math.floor(rand()*10);
+        v.types = {c: Number};
+
+    What is [%= a %] + [%= b %]? :blank:`c`
+
+    -   :c === a + b: Correct; [%= a %] + [%= b %] is [%= c %]. Note that [%= ans %] or [%= ans_array[0] %] also works.
+        :c === a - b: That's subtraction.
+        :c === a * b: That's multiplication.
+        :x: I don't know what you're doing; [%= a %] + [%= b %] is [%= a + b %], not [%= c %].
+
+
+This problem demonstrates some of the possibilities and challenges in dynamic problems:
+
+-   The solution gets computed on the client, which makes the problems vulnerable to students peeking at the JavaScript console to get the correct answer. Hence, the need for server-side grading.
+-   It's easy to include math. However, formatting math requires an optional plus sign -- negative numbers don't need it, while positive numbers do. Hence, use of the ``plus`` function below.
+-   Solution checking requires some careful thought.
+
+.. fillintheblank:: test_fitb_dynamic_2
+    :dyn_vars:
+        // The solution.
+        v.ax1 = Math.floor(rand()*10);
+        v.ax2 = Math.floor(rand()*10);
+        //
+        // Values used in showing the problem. Don't allow a to be 0!
+        v.a = Math.floor(rand()*9) + 1;
+        v.b = v.a * -(v.ax1 + v.ax2);
+        v.c = v.a * v.ax1 * v.ax2;
+        //
+        // Formatting niceness: put a plus in front on non-negative values only.
+        v.plus = x => x < 0 ? x : `+${x}`;
+        //
+        v.types = Number;
+
+    What are the solutions to :math:`[%= a %]x^2 [%= plus(b) %]x [%= plus(c) %] = 0`? For repeated roots, enter the same value in both blanks.
+
+    :blank:`sx1`, :blank:`sx2`
+
+    Notes:
+
+    -   ``ax1`` is short for "answer for x1"; ``sx1`` is "student's answer for x1".
+    -   The first answer grades either root as correct.
+    -   The second answer checks that the student isn't answering with the same value twice -- unless this happens to be a repeated root.
+    -   The second hint has to be smart: if the first blank contained the second answer, then show the first answer as a hint.
+
+    Writing dynamic problems is, fundamentally, hard. However, it produces an infinite stream of problems.
+
+    -   :ans === ax1 || ans === ax2: Correct!
+        :x: Try [%= ax1 %].
+    -   :(ans === ax1 || ans === ax2) && (sx1 !== sx2 || ax1 === ax2): Correct!
+        :x: Try [%= sx1 === ax2 ? ax1 : ax2 %].
+
+
+Footnotes
+---------
+.. [#converters]
+
+    While JavaScript provides ``Date`` and ``Date.parse`` converters, there's a lot of subtlety in time zones making this difficult to use for most cases. Likewise, ``Boolean`` makes little sense although it's available. It's possible to use ``Math.round``, but again this makes little sense for most cases (should a student answer of 3.4 correctly compare to a solution of 3?).
+
+    It might be useful to write a  ``CleanString`` converter to remove leading and trailing spaces in a blank and provide equality operators that ignore multiple spaces, capitalization, etc. However, what sort of dynamic problems would be able to correctly grade string answers?
+
+
+qnum reset
+----------
+Reset ``qnum`` values to prevent affecting other problems.
+
+.. qnum::
+    :prefix:
+    :suffix:
diff --git a/runestone/fitb/test/conf.py b/runestone/fitb/test/conf.py
index 1ddd128be..12ba60e81 100644
--- a/runestone/fitb/test/conf.py
+++ b/runestone/fitb/test/conf.py
@@ -107,7 +107,7 @@
     # For fill-in-the-blank questions, provide a convenient means to indicate a blank.
     """
 
-.. |blank| replace:: :blank:`x`
+.. |blank| replace:: :blank:`-`
 """
     # For literate programming files, provide a convenient way to refer to a source file's name. See `runestone.lp.lp._docname_role`.
     """.. |docname| replace:: :docname:`name`
diff --git a/runestone/fitb/test/test_fitb.py b/runestone/fitb/test/test_fitb.py
index cc8ad94fe..a8cdd15c1 100644
--- a/runestone/fitb/test/test_fitb.py
+++ b/runestone/fitb/test/test_fitb.py
@@ -1,3 +1,4 @@
+from selenium.common.exceptions import TimeoutException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 
@@ -62,17 +63,37 @@ def find_blank(fitb_element, index, clear=True):
 
 
 # Click the "Check me" button.
-def click_checkme(fitb_element):
+def click_checkme(selenium_utils, fitb_element):
+    selenium_utils.scroll_to_top()
+    # It's the first button in the component's div.
     fitb_element.find_element_by_tag_name("button").click()
 
 
-# Find the question's feedback element.
+# Click the "Randomize" button.
+def click_randomize(fitb_element):
+    fitb_element.find_element_by_css_selector("button[name=randomize]").click()
+
+
+# Require the expected text in the question's feedback element.
 def check_feedback(selenium_utils, fitb_element, expected_text):
     div_id = fitb_element.get_attribute("id")
     selenium_utils.wait.until(
         EC.text_to_be_present_in_element((By.ID, div_id + "_feedback"), expected_text))
 
 
+# Require the expected text in the question's description.
+def check_description(selenium_utils, fitb_element, expected_text):
+    div_id = fitb_element.get_attribute("id")
+    css_sel = f"#{div_id} > div:nth-child(1)"
+    try:
+        selenium_utils.wait.until(
+            EC.text_to_be_present_in_element((By.CSS_SELECTOR, css_sel), expected_text))
+    except TimeoutException:
+        # Provide an error message that shows actual vs. expected text, instead of the more generic TimeoutException.
+        actual_text = fitb_element.find_element_by_css_selector(css_sel).text
+        assert expected_text == actual_text
+
+
 ## Tests
 ## =====
 # One of two correct answers
@@ -83,7 +104,7 @@ def test_fitb1(selenium_utils_get):
     fitb = find_fitb(selenium_utils_get, "test_fitb_string")
     find_blank(fitb, 0)
     find_blank(fitb, 1)
-    click_checkme(fitb)
+    click_checkme(selenium_utils_get, fitb)
     # Get desired response from .i18n file loaded based on language attribute in the HTML tag initially set in conf.py
     msg_no_answer = selenium_utils_get.driver.execute_script("return $.i18n('msg_no_answer')")
     check_feedback(selenium_utils_get, fitb, msg_no_answer)
@@ -94,7 +115,7 @@ def test_fitb2(selenium_utils_get):
     fitb = find_fitb(selenium_utils_get, "test_fitb_string")
     find_blank(fitb, 0).send_keys("red")
     find_blank(fitb, 1)
-    click_checkme(fitb)
+    click_checkme(selenium_utils_get, fitb)
     check_feedback(selenium_utils_get, fitb, "Correct")
     # Get desired response from .i18n file loaded based on language attribute in the HTML tag initially set in conf.py
     msg_no_answer = selenium_utils_get.driver.execute_script("return $.i18n('msg_no_answer')")
@@ -106,7 +127,7 @@ def test_fitb3(selenium_utils_get):
     fitb = find_fitb(selenium_utils_get, "test_fitb_string")
     find_blank(fitb, 0).send_keys("red")
     find_blank(fitb, 1).send_keys("away")
-    click_checkme(fitb)
+    click_checkme(selenium_utils_get, fitb)
     check_feedback(selenium_utils_get, fitb, "Correct")
 
 
@@ -120,28 +141,28 @@ def test_fitb4(selenium_utils_get):
     # Type the correct answer.
     blank0.send_keys("red")
     find_blank(fitb, 1).send_keys("away")
-    click_checkme(fitb)
+    click_checkme(selenium_utils_get, fitb)
     check_feedback(selenium_utils_get, fitb, "Correct")
 
 
 def test_fitboneblank_too_low(selenium_utils_get):
     fitb = find_fitb(selenium_utils_get, "test_fitb_number")
     find_blank(fitb, 0).send_keys(" 6")
-    click_checkme(fitb)
+    click_checkme(selenium_utils_get, fitb)
     check_feedback(selenium_utils_get, fitb, "Try higher.")
 
 
 def test_fitboneblank_wildcard(selenium_utils_get):
     fitb = find_fitb(selenium_utils_get, "test_fitb_number")
     find_blank(fitb, 0).send_keys("I give up")
-    click_checkme(fitb)
+    click_checkme(selenium_utils_get, fitb)
     check_feedback(selenium_utils_get, fitb, "Incorrect. Try again.")
 
 
 def test_fitbfillrange(selenium_utils_get):
     fitb = find_fitb(selenium_utils_get, "test_fitb_number")
     find_blank(fitb, 0).send_keys(" 6.28 ")
-    click_checkme(fitb)
+    click_checkme(selenium_utils_get, fitb)
     check_feedback(selenium_utils_get, fitb, "Good job.")
 
 
@@ -151,19 +172,61 @@ def test_fitbregex(selenium_utils_get):
     # find_blank(fitb, 0).send_keys(" mARy ")
     find_blank(fitb, 1).send_keys("LITTLE")
     find_blank(fitb, 2).send_keys("2")
-    click_checkme(fitb)
+    click_checkme(selenium_utils_get, fitb)
     check_feedback(selenium_utils_get, fitb, "Correct")
 
 
 def test_regexescapes1(selenium_utils_get):
     fitb = find_fitb(selenium_utils_get, "test_fitb_regex_2")
     find_blank(fitb, 0).send_keys(r"C:\windows\system")
-    click_checkme(fitb)
+    click_checkme(selenium_utils_get, fitb)
     check_feedback(selenium_utils_get, fitb, "Correct")
 
 
 def test_regexescapes2(selenium_utils_get):
     fitb = find_fitb(selenium_utils_get, "test_fitb_regex_3")
     find_blank(fitb, 0).send_keys("[]")
-    click_checkme(fitb)
+    click_checkme(selenium_utils_get, fitb)
+    check_feedback(selenium_utils_get, fitb, "Correct")
+
+
+# _`dynamic problem value repetition`: define it like this so that the server can provide a different sequence of random values. On the server, it asks for random value each time the server grades a problem and when the "randomize" button is clicked, so it needs lots of repetition. The client only asks for random values when the "randomize" button is clicked.
+def test_dynamic_1(selenium_utils_get):
+    _test_dynamic_1(selenium_utils_get, [0.2, 0.1, 0.3, 0.4])
+
+
+def _test_dynamic_1(selenium_utils_get, test_values):
+    fitb = find_fitb(selenium_utils_get, "test_fitb_dynamic_1")
+
+    # Inject controlled values to the RNG for dynamic problems.
+    selenium_utils_get.inject_random_values(test_values)
+    click_randomize(fitb)
+
+    # Try all the different answers. Include whitespace, various numberic formats, etc.
+    check_description(selenium_utils_get, fitb, "What is 2 + 1?")
+    # Dynamic problems re-create the blanks after receiving new HTML. Wait for this to be ready before typing in a blank to avoid errors.
+    import time; time.sleep(0.1)
+    find_blank(fitb, 0).send_keys(" 3")
+    click_checkme(selenium_utils_get, fitb)
+    check_feedback(selenium_utils_get, fitb, "Correct")
+    find_blank(fitb, 0).send_keys("1.0 ")
+    click_checkme(selenium_utils_get, fitb)
+    check_feedback(selenium_utils_get, fitb, "subtraction")
+    find_blank(fitb, 0).send_keys(" 0x2 ")
+    click_checkme(selenium_utils_get, fitb)
+    check_feedback(selenium_utils_get, fitb, "multiplication")
+    find_blank(fitb, 0).send_keys(" 4e0")
+    click_checkme(selenium_utils_get, fitb)
+    check_feedback(selenium_utils_get, fitb, "know what")
+
+    # Verify the feedback is removed.
+    click_randomize(fitb)
+    # Put this before the assertions, since it will wait until the text appears (implying the problem has been updated).
+    check_description(selenium_utils_get, fitb, "What is 3 + 4?")
+    assert selenium_utils_get.driver.find_element_by_id("test_fitb_dynamic_1_feedback").text == ""
+    assert fitb.find_element_by_tag_name("input").text == ""
+
+    # Run another check to make sure a new problem appeared.
+    find_blank(fitb, 0).send_keys("  0b111 ")
+    click_checkme(selenium_utils_get, fitb)
     check_feedback(selenium_utils_get, fitb, "Correct")
diff --git a/runestone/fitb/toctree.rst b/runestone/fitb/toctree.rst
index 0d97e0547..6980bf7f2 100644
--- a/runestone/fitb/toctree.rst
+++ b/runestone/fitb/toctree.rst
@@ -8,4 +8,6 @@ fitb: A Sphinx extension for fill-in-the-blank questions
     *.py
     js/*.js
     css/*.css
+    fitb_html_structure.html
+    dynamic_problems.rst
     test/test_*.py
diff --git a/runestone/mchoice/js/mchoice.js b/runestone/mchoice/js/mchoice.js
index e4a291dc7..e4fbec76e 100644
--- a/runestone/mchoice/js/mchoice.js
+++ b/runestone/mchoice/js/mchoice.js
@@ -223,6 +223,7 @@ export default class MultipleChoice extends RunestoneBase {
                     this.processMCMFSubmission(true);
                     if (eBookConfig.peer) {
                         this.submitButton.disabled = true;
+                        this.disableInteraction();
                     }
                 }.bind(this),
                 false
@@ -520,6 +521,7 @@ export default class MultipleChoice extends RunestoneBase {
     }
 
     scoreMCMFSubmission() {
+        this.answer = this.givenArray[0]
         if (this.givenArray[0] == this.correctIndexList[0]) {
             this.correct = true;
             this.percent = 1.0;
@@ -657,6 +659,13 @@ export default class MultipleChoice extends RunestoneBase {
             this.optionArray[i].input.disabled = true;
         }
     }
+
+    enableInteraction() {
+        for (var i = 0; i < this.optionArray.length; i++) {
+            this.optionArray[i].input.disabled = false;
+        }
+    }
+
 }
 
 /*=================================
diff --git a/runestone/timed/js/timed.js b/runestone/timed/js/timed.js
index b77370c22..e521a3cfd 100644
--- a/runestone/timed/js/timed.js
+++ b/runestone/timed/js/timed.js
@@ -354,7 +354,7 @@ export default class Timed extends RunestoneBase {
                 this.currentQuestionIndex
             ].question.checkCurrentAnswer();
             if (!this.done) {
-                this.renderedQuestionArray[
+                await this.renderedQuestionArray[
                     this.currentQuestionIndex
                 ].question.logCurrentAnswer();
             }
@@ -952,7 +952,7 @@ export default class Timed extends RunestoneBase {
             this.currentQuestionIndex
         ].question;
         await currentQuestion.checkCurrentAnswer();
-        currentQuestion.logCurrentAnswer();
+        await currentQuestion.logCurrentAnswer();
         currentQuestion.renderFeedback();
         currentQuestion.disableInteraction();
 
diff --git a/runestone/timed/test/test_timed.py b/runestone/timed/test/test_timed.py
index 248a427f9..c8926c9f6 100644
--- a/runestone/timed/test/test_timed.py
+++ b/runestone/timed/test/test_timed.py
@@ -133,7 +133,12 @@ def _test_1(selenium_utils_mq, timed_divid):
     selenium_utils_mq.driver.find_element_by_id(f"{div_id}_solution").send_keys("ROYGBIV circle area")
 
     finish(selenium_utils_mq)
-    results = selenium_utils_mq.driver.find_element_by_id(f"{timed_divid}results")
-    assert "Num Correct: 6" in results.text
+    div_id = f"{timed_divid}results"
+    # Wait for the initial text to appear.
+    selenium_utils_mq.wait.until(
+        EC.text_to_be_present_in_element((By.ID, div_id), "Num Correct: 6")
+    )
+    # We can check the rest of the text without waiting, since it's all assigned at the same time.
+    results = selenium_utils_mq.driver.find_element_by_id(div_id)
     assert "Num Wrong: 0" in results.text
     assert "Num Skipped: 1" in results.text
diff --git a/runestone/unittest_base.py b/runestone/unittest_base.py
new file mode 100644
index 000000000..d1cfb1f90
--- /dev/null
+++ b/runestone/unittest_base.py
@@ -0,0 +1,234 @@
+# **************************************************************
+# |docname| - Base classes for RunestoneComponents test fixtures
+# **************************************************************
+#
+# Imports
+# =======
+# These are listed in the order prescribed by `PEP 8
+# <http://www.python.org/dev/peps/pep-0008/#imports>`_.
+#
+# Standard library
+# ----------------
+import logging
+import os
+import platform
+import signal
+import time
+import subprocess
+import sys
+import unittest
+from urllib.request import urlopen
+from urllib.error import URLError
+
+# Third-party imports
+# -------------------
+import pytest
+from pyvirtualdisplay import Display
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+
+# Local imports
+# -------------
+from runestone.shared_conftest import element_has_css_class
+
+logging.basicConfig(level=logging.WARN)
+mylogger = logging.getLogger()
+
+# Globals
+# =======
+# Select an unused port for serving web pages to the test suite.
+PORT = "8081"
+# Use the localhost for testing.
+HOST_ADDRESS = "127.0.0.1:" + PORT
+HOST_URL = "http://" + HOST_ADDRESS
+
+
+# Define the platform.
+IS_WINDOWS = platform.system() == "Windows"
+IS_LINUX = sys.platform.startswith("linux")
+
+# Provide access to the currently-active ModuleFixture object.
+mf = None
+
+
+# Code
+# ====
+# Define `module fixtures <https://docs.python.org/2/library/unittest.html#setupmodule-and-teardownmodule>`_ to build the test Runestone project, run the server, then shut it down when the tests complete.
+class ModuleFixture(unittest.TestCase):
+    def __init__(
+        self,
+        # The path to the Python module in which the test resides. This provides a simple way to determine the path in which to run runestone build/serve.
+        module_path,
+        # True if the sphinx-build process must exit with status of 0 (success)
+        exit_status_success=True,
+    ):
+
+        super(ModuleFixture, self).__init__()
+        self.base_path = os.path.dirname(module_path)
+        self.exit_status_success = exit_status_success
+        # Windows Compatability
+        if IS_WINDOWS and self.base_path == "":
+            self.base_path = "."
+
+    def setUpModule(self):
+        # Change to this directory for running Runestone.
+        self.old_cwd = os.getcwd()
+        os.chdir(self.base_path)
+        # Compile the docs. Save the stdout and stderr for examination.
+        p = subprocess.run(
+            ["runestone", "build", "--all"], capture_output=True, text=True,
+        )
+        self.build_stdout_data = p.stdout
+        self.build_stderr_data = p.stderr
+        print(self.build_stdout_data + self.build_stderr_data)
+        if self.exit_status_success:
+            self.assertFalse(p.returncode)
+        # Make sure any older servers on port 8081 are killed.
+        if IS_WINDOWS:
+            netstat_output = subprocess.run(
+                # Flags are:
+                #
+                # -n: Display addresses numerically. Looking up names is slow.
+                # -o: Include the PID for each connection.
+                ["netstat", "-no"],
+                capture_output=True,
+                text=True,
+            ).stdout
+            # Skip the first four lines, which are headings.
+            for connection in netstat_output.splitlines()[4:]:
+                # Typical output is:
+                ##   Proto  Local Address          Foreign Address        State           PID
+                ##   TCP    127.0.0.1:1277         127.0.0.1:49971        ESTABLISHED     4624
+                proto, local_address, foreign_address, state, pid = connection.split()
+                pid = int(pid)
+                if local_address == HOST_ADDRESS and pid != 0:
+                    os.kill(pid, 0)
+        else:
+            lsof_output = subprocess.run(
+                ["lsof", "-i", ":{0}".format(PORT)], capture_output=True, text=True,
+            ).stdout
+            for process in lsof_output.split("\n")[1:]:
+                data = [x for x in process.split(" ") if x != ""]
+                if len(data) <= 1:
+                    continue
+                ptokill = int(data[1])
+                mylogger.warn(
+                    "Attempting to kill a stale runestone serve process: {}".format(
+                        ptokill
+                    )
+                )
+                os.kill(ptokill, signal.SIGKILL)
+                time.sleep(2)  # give the old process a couple seconds to clear out
+                try:
+                    os.kill(ptokill, 0)  # will throw an Error if process gone
+                    pytest.exit(
+                        "Stale runestone server can't kill process: {}".format(ptokill)
+                    )
+                except ProcessLookupError:
+                    # The process was killed
+                    pass
+                except PermissionError:
+                    pytest.exit(
+                        "Another server is using port {} process: {}".format(
+                            PORT, ptokill
+                        )
+                    )
+                except Exception:
+                    pytest.exit(
+                        "Unknown error while trying to kill stale runestone server"
+                    )
+
+        # Run the server. Simply calling ``runestone serve`` fails, since the process killed isn't the actual server, but probably a setuptools-created launcher.
+        self.runestone_server = subprocess.Popen(
+            [sys.executable, "-m", "runestone", "serve", "--port", PORT]
+        )
+
+        # Testing time in dominated by browser startup/shutdown. So, simply run all tests in a module in a single browser instance to speed things up. See ``RunestoneTestCase.setUp`` for additional code to (mostly) clear the browser between tests.
+        #
+        # `PyVirtualDisplay <http://pyvirtualdisplay.readthedocs.io/en/latest/>`_ only runs on X-windows, meaning Linux. Mac seems to have `some support <https://support.apple.com/en-us/HT201341>`_. Windows is out of the question.
+        if IS_LINUX:
+            self.display = Display(visible=0, size=(1280, 1024))
+            self.display.start()
+        else:
+            self.display = None
+        # self.driver = webdriver.PhantomJS() # use this for Jenkins auto testing
+        options = Options()
+        options.add_argument("--window-size=1200,800")
+        options.add_argument("--no-sandbox")
+        self.driver = webdriver.Chrome(options=options)  # good for development.
+
+        # Make this accessible
+        global mf
+        mf = self
+
+        # Wait for the webserver to come up.
+        for tries in range(50):
+            try:
+                urlopen(HOST_URL, timeout=5)
+            except URLError:
+                # Wait for the server to come up.
+                time.sleep(0.1)
+            else:
+                # The server is up. We're done.
+                break
+
+    def tearDownModule(self):
+        # Shut down Selenium.
+        self.driver.close()
+        self.driver.quit()
+        if self.display:
+            self.display.stop()
+        # Shut down the server.
+        self.runestone_server.kill()
+        # Restore the directory.
+        os.chdir(self.old_cwd)
+
+        global mf
+        mf = None
+
+
+# Provide a simple way to instantiante a ModuleFixture in a test module. Typical use:
+#
+# .. code:: Python
+#   :number-lines:
+#
+#   from unittest_base import module_fixture_maker
+#   setUpModule, tearDownModule = module_fixture_maker(__file__)
+def module_fixture_maker(module_path, return_mf=False, exit_status_success=True):
+    mf = ModuleFixture(module_path, exit_status_success)
+    if return_mf:
+        return mf, mf.setUpModule, mf.tearDownModule
+    else:
+        return mf.setUpModule, mf.tearDownModule
+
+
+# Provide a base test case which sets up the `Selenium <http://selenium-python.readthedocs.io/>`_ driver. TODO: Port all test to the pytest framework, then remove this.
+class RunestoneTestCase(unittest.TestCase):
+    # Wait until a Runestone component has finished rendering itself, given the ID of the component.
+    def wait_until_ready(self, id):
+        # The component is ready when it has the class below.
+        self.wait.until(
+            element_has_css_class((By.ID, id), "runestone-component-ready")
+        )
+
+    # Get a page from the local server.
+    def get(self, relative_url):
+        return self.driver.get(f"{self.host}/{relative_url}")
+
+    def setUp(self):
+        # Use the shared module-wide driver.
+        self.driver = mf.driver
+        self.host = HOST_URL
+        # Add an `implicit wait <https://selenium-python.readthedocs.io/waits.html#implicit-waits>`_.
+        self.driver.implicitly_wait(10)
+        # For cases where an implicit wait does not help.  For example waiting for text to appear
+        # after running an activecode.  We create an explicit wait object.
+        self.wait = WebDriverWait(self.driver, 10)
+
+    def tearDown(self):
+        # Clear as much as possible, to present an almost-fresh instance of a browser for the next test. (Shutting down then starting up a browser is very slow.)
+        self.driver.execute_script("window.localStorage.clear();")
+        self.driver.execute_script("window.sessionStorage.clear();")
+        self.driver.delete_all_cookies()
diff --git a/runestone/wavedrom/js/wavedrom.js b/runestone/wavedrom/js/wavedrom.js
index 57f253aee..d819b81ab 100644
--- a/runestone/wavedrom/js/wavedrom.js
+++ b/runestone/wavedrom/js/wavedrom.js
@@ -1,17 +1,17 @@
 // ***********************************************
 // |docname| - JavaScript for the WaveDrom library
 // ***********************************************
-'use strict';
+"use strict";
 
 // This took a fair amount of experimenting to figure out how to make this work with NPM and Webpack. Sigh. Here's the working result.
 //
-// All we need is the ability to call the default export of ``ProcessAll`` in order to render timing diagrams.
-import ProcessAll from "wavedrom/lib/process-all.js";
+// This has already been packaged for the web with browserify, so we can just import it for the side effects (it defines ``window.WaveDrom``. Importing from the ``lib/`` folder produces a lot of unsatisfied imports when using webpack.
+import "wavedrom/wavedrom.min.js";
 
-// WaveSkin isn't defined globally, so import the default export to get access to it.
-import WaveSkin from "wavedrom/lib/wave-skin.js";
-// Make the required WaveSkin (needed by WaveDrom) available globally.
+// WaveSkin isn't defined globally, so import the default export to get access to it. It defines a single variable, assuming that the variable will be assigned to the ``window``. Here, it's not. So...
+import WaveSkin from "wavedrom/skins/default.js";
+// ...make the required WaveSkin (needed by WaveDrom) available globally.
 window.WaveSkin = WaveSkin;
 
 // Run the render after the dynamic load is done.
-$(document).on("runestone:login-complete", ProcessAll);
+$(document).on("runestone:login-complete", window.WaveDrom.ProcessAll);
diff --git a/webpack.config.js b/webpack.config.js
index 64aaa34f5..8c2cb822f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,102 +5,188 @@
 //  :caption: Related contents
 //
 //  webpack.index.js
-
+//  webpack.server-index.js
+//
+// Includes
+// ========
+//
+// Node
+// ----
 const path = require("path");
 
+// NPM packages
+// ------------
 const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 const CopyPlugin = require("copy-webpack-plugin");
+const CompressionPlugin = require("compression-webpack-plugin");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const { DefinePlugin } = require("webpack");
 
+// Globals
+// =======
+function definePluginDict(env) {
+    return {
+        // _`RAND_FUNC`: for testing, use a random function supplied by the test framework if it exists. Otherwise, use the seedable RNG.
+        //
+        // Implementation: pass webpack the ``--env test`` option (see the `env docs <https://webpack.js.org/api/cli/#environment-options>`_). Using the `DefinePlugin <https://webpack.js.org/plugins/define-plugin/>`_, select the appropriate random function.
+        RAND_FUNC: env.test
+            ? "(typeof rs_test_rand === 'undefined') ? Math.random : rs_test_rand"
+            : "rand",
+    };
+}
+
+// Webpack configuration
+// =====================
 module.exports = (env, argv) => {
+    // Place commonly-used expressions in consts.
     const is_dev_mode = argv.mode === "development";
+    const cache = is_dev_mode
+        ? {
+              type: "filesystem",
+          }
+        : false;
+    // See `mode <https://webpack.js.org/configuration/mode/>`_ for the conditional statement below.
+    const devtool = is_dev_mode ? "inline-source-map" : "source-map";
+    const out_path = path.resolve(__dirname, "runestone/dist");
 
-    return {
-        // Cache build results between builds in development mode, per the `docs <https://webpack.js.org/configuration/cache/>`__.
-        cache: is_dev_mode
-            ? {
-                  type: "filesystem",
-              }
-            : false,
-        entry: {
-            runestone: "./webpack.index.js",
-        },
-        // See `mode <https://webpack.js.org/configuration/mode/>`_ for the conditional statement below.
-        devtool: is_dev_mode ? "inline-source-map" : "source-map",
-        module: {
-            rules: [
-                {
-                    test: /\.css$/i,
-                    use: [MiniCssExtractPlugin.loader, "css-loader"],
-                },
-                {
-                    test: /\.(png|jpe?g|gif|svg|eot|ttf|woff|woff2)$/i,
-                    // For more information, see https://webpack.js.org/guides/asset-modules/.
-                    type: "asset",
+    return [
+        // Client-side
+        // -----------
+        // The primary config: client-side build. This config file contains `multiple targets <https://webpack.js.org/concepts/targets/#multiple-targets>`_.
+        {
+            // Cache build results between builds in development mode, per the `docs <https://webpack.js.org/configuration/cache/>`__.
+            cache: cache,
+            devtool: devtool,
+            entry: {
+                runestone: "./webpack.index.js",
+            },
+            externals: {
+                // Use the jQuery that Sphinx provides for jQuery.ui. See `externals <https://webpack.js.org/configuration/externals/>`_.
+                jquery: "jQuery",
+            },
+            module: {
+                rules: [
+                    {
+                        test: /\.css$/i,
+                        use: [MiniCssExtractPlugin.loader, "css-loader"],
+                    },
+                    {
+                        test: /\.(png|jpe?g|gif|svg|eot|ttf|woff|woff2)$/i,
+                        // For more information, see https://webpack.js.org/guides/asset-modules/.
+                        type: "asset",
+                    },
+                ],
+            },
+            // See https://webpack.js.org/guides/code-splitting/#splitchunksplugin.
+            optimization: {
+                moduleIds: "deterministic",
+                // Collect all the webpack import runtime into a single file, which is named ``runtime.bundle.js``. This must be statically imported by all pages containing Runestone components.
+                runtimeChunk: "single",
+                splitChunks: {
+                    chunks: "all",
                 },
-            ],
-        },
-        resolve: {
-            fallback: {
-                // ``sql.js`` wants these in case it's running under node.js. They're not needed by JS in the browser.
-                crypto: false,
-                fs: false,
-                path: false,
+                // CSS for production was copied from https://webpack.js.org/plugins/mini-css-extract-plugin/#minimizing-for-production.
+                minimizer: [
+                    // For webpack@5 you can use the `...` syntax to extend existing minimizers (i.e. `terser-webpack-plugin`), uncomment the next line.
+                    `...`,
+                    new CssMinimizerPlugin(),
+                ],
             },
-        },
-        externals: {
-            // Use the jQuery that Sphinx provides for jQuery.ui. See `externals <https://webpack.js.org/configuration/externals/>`_.
-            jquery: "jQuery",
-        },
-        output: {
-            path: path.resolve(__dirname, "runestone/dist"),
-            // See https://webpack.js.org/guides/caching/. This provides a hash for dynamic imports as well, avoiding caching out-of-date JS.
-            filename: "[name].bundle.js?v=[contenthash]",
-            // Delete everything in the output directory on each build.
-            clean: true,
-        },
-        // See https://webpack.js.org/guides/code-splitting/#splitchunksplugin.
-        optimization: {
-            moduleIds: "deterministic",
-            // Collect all the webpack import runtime into a single file, which is named ``runtime.bundle.js``. This must be statically imported by all pages containing Runestone components.
-            runtimeChunk: "single",
-            splitChunks: {
-                chunks: "all",
+            output: {
+                path: out_path,
+                // See https://webpack.js.org/guides/caching/. This provides a hash for dynamic imports as well, avoiding caching out-of-date JS.
+                filename: "[name].bundle.js?v=[contenthash]",
+                // Node 17.0 reports ``Error: error:0308010C:digital envelope routines::unsupported``. Per `SO <https://stackoverflow.com/a/69394785/16038919>`_, this error is produced by using an old, default hash that OpenSSL removed support for. The `webpack docs <https://webpack.js.org/configuration/output/#outputhashfunction>"__ says that ``xxhash64`` is a faster algorithm.
+                hashFunction: "xxhash64",
             },
-            // CSS for production was copied from https://webpack.js.org/plugins/mini-css-extract-plugin/#minimizing-for-production.
-            minimizer: [
-                // For webpack@5 you can use the `...` syntax to extend existing minimizers (i.e. `terser-webpack-plugin`), uncomment the next line.
-                `...`,
-                new CssMinimizerPlugin(),
+            plugins: [
+                // _`webpack_static_imports`: Instead of HTML, produce a list of static imports as JSON. Sphinx will then read this file and inject these imports when creating each page.
+                new HtmlWebpackPlugin({
+                    filename: "webpack_static_imports.json",
+                    // Don't prepend the ``<head>`` tag and data to the output.
+                    inject: false,
+                    // The template to create JSON.
+                    templateContent: ({ htmlWebpackPlugin }) =>
+                        JSON.stringify({
+                            js: htmlWebpackPlugin.files.js,
+                            css: htmlWebpackPlugin.files.css,
+                        }),
+                }),
+                new CopyPlugin({
+                    patterns: [
+                        {
+                            // sql.js support: this wasm file will be fetched dynamically when we initialize sql.js. It is important that we do not change its name, and that it is in the same folder as the js.
+                            from: "node_modules/sql.js/dist/sql-wasm.wasm",
+                            to: ".",
+                        },
+                    ],
+                }),
+                new DefinePlugin(definePluginDict(env)),
+                new MiniCssExtractPlugin({
+                    filename: "[name].css?v=[contenthash]",
+                    chunkFilename: "[id].css",
+                }),
+                // Copied from the `webpack docs <https://webpack.js.org/plugins/compression-webpack-plugin>`_. This creates ``.gz`` versions of all files. The webserver in use needs to be configured to send this instead of the uncompressed versions.
+                new CompressionPlugin(),
             ],
+            resolve: {
+                fallback: {
+                    // ``sql.js`` wants these in case it's running under node.js. They're not needed by JS in the browser.
+                    crypto: false,
+                    fs: false,
+                    path: false,
+                },
+            },
         },
-        plugins: [
-            // _`webpack_static_imports`: Instead of HTML, produce a list of static imports as JSON. Sphinx will then read this file and inject these imports when creating each page.
-            new HtmlWebpackPlugin({
-                filename: "webpack_static_imports.json",
-                // Don't prepend the ``<head>`` tag and data to the output.
-                inject: false,
-                // The template to create JSON.
-                templateContent: ({ htmlWebpackPlugin }) =>
-                    JSON.stringify({
-                        js: htmlWebpackPlugin.files.js,
-                        css: htmlWebpackPlugin.files.css,
-                    }),
-            }),
-            new CopyPlugin({
-                patterns: [
+
+        // Server-side
+        // -----------
+        // Config for server-side code.
+        {
+            // Cache build results between builds in development mode, per the `docs <https://webpack.js.org/configuration/cache/>`__.
+            cache: cache,
+            // See `mode <https://webpack.js.org/configuration/mode/>`_ for the conditional statement below.
+            devtool: devtool,
+            entry: {
+                server_side: "./webpack.server-index.js",
+            },
+            module: {
+                rules: [
                     {
-                        // sql.js support: this wasm file will be fetched dynamically when we initialize sql.js. It is important that we do not change its name, and that it is in the same folder as the js.
-                        from: "node_modules/sql.js/dist/sql-wasm.wasm",
-                        to: ".",
+                        // Use Babel to transpile to ECMAScript 5.1, since the server-side engine supports that.
+                        //
+                        // Only run ``.js`` files through Babel
+                        test: /\.m?js$/,
+                        use: {
+                            loader: "babel-loader",
+                            options: {
+                                presets: ["@babel/preset-env"],
+                            },
+                        },
                     },
                 ],
-            }),
-            new MiniCssExtractPlugin({
-                filename: "[name].css?v=[contenthash]",
-                chunkFilename: "[id].css",
-            }),
-        ],
-    };
+            },
+            output: {
+                // Expose the library as a variable.
+                library: {
+                    name: "serverSide",
+                    type: "var",
+                },
+                path: out_path,
+                // Delete everything in the output directory on each build. Putting these here (in the server-side build) works, while putting it in the client-side build causes it to delete the output from the server-side build.
+                clean: true,
+            },
+            plugins: [new DefinePlugin(definePluginDict(env))],
+            resolve: {
+                // EJS tries to import these.
+                fallback: {
+                    fs: false,
+                    path: false,
+                },
+            },
+            // The server-side JS engine supports ECMAScript 5.1. See `target <https://webpack.js.org/configuration/target/>`_.
+            target: ["es5", "web"],
+        },
+    ];
 };
diff --git a/webpack.server-index.js b/webpack.server-index.js
new file mode 100644
index 000000000..b371804bf
--- /dev/null
+++ b/webpack.server-index.js
@@ -0,0 +1,12 @@
+// ***********************************************************************************
+// |docname| - Import files needed for server-side operation
+// ***********************************************************************************
+// This file simply imports all the modules that the server-side code needs.
+
+"use strict";
+
+// Import from all server-side code.
+import * as fitb from "./runestone/fitb/js/fitb-utils.js";
+
+// Make it visible.
+export { fitb };