diff --git a/BUILD.bazel b/BUILD.bazel
index f97f95162..f7c42abad 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -22,12 +22,6 @@ genrule(
     visibility = ["//visibility:public"],
 )
 
-alias(
-    name = "tsconfig.json",
-    actual = "//ts:tsconfig.json",
-    visibility = ["//visibility:public"],
-)
-
 pkg_tar(
     name = "dist",
     srcs = [
diff --git a/defs.bzl b/defs.bzl
index 6e743ec15..d165051eb 100644
--- a/defs.bzl
+++ b/defs.bzl
@@ -9,7 +9,6 @@ load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install
 load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories")
 load("@com_github_ali5h_rules_pip//:defs.bzl", "pip_import")
 load("//pip/pyqt5:defs.bzl", "install_pyqt5")
-load("@esbuild_toolchain//:esbuild_repo.bzl", "esbuild_dependencies")
 
 anki_version = "2.1.49"
 
@@ -53,5 +52,3 @@ def setup_deps():
     )
 
     sass_repositories()
-
-    esbuild_dependencies()
diff --git a/late_deps.bzl b/late_deps.bzl
index 50d275af5..cee5563f3 100644
--- a/late_deps.bzl
+++ b/late_deps.bzl
@@ -2,7 +2,9 @@
 
 load("@py_deps//:requirements.bzl", "pip_install")
 load("@rules_rust//tools/rust_analyzer/raze:crates.bzl", "rules_rust_tools_rust_analyzer_fetch_remote_crates")
+load("@build_bazel_rules_nodejs//toolchains/esbuild:esbuild_repositories.bzl", "esbuild_repositories")
 
 def setup_late_deps():
     pip_install()
     rules_rust_tools_rust_analyzer_fetch_remote_crates()
+    esbuild_repositories()
diff --git a/qt/aqt/data/web/js/BUILD.bazel b/qt/aqt/data/web/js/BUILD.bazel
index c46de6f84..4b3ca41a7 100644
--- a/qt/aqt/data/web/js/BUILD.bazel
+++ b/qt/aqt/data/web/js/BUILD.bazel
@@ -6,6 +6,7 @@ load("//ts:eslint.bzl", "eslint_test")
 ts_library(
     name = "pycmd",
     srcs = ["pycmd.d.ts"],
+    tsconfig = "tsconfig.json",
     visibility = ["//qt/aqt/data/web/js:__subpackages__"],
 )
 
@@ -50,8 +51,8 @@ filegroup(
     srcs = [
         "aqt_es5",
         "editor",
-        "reviewer",
         "mathjax.js",
+        "reviewer",
         "//qt/aqt/data/web/js/vendor",
     ],
     visibility = ["//qt:__subpackages__"],
diff --git a/repos.bzl b/repos.bzl
index 8966f31b4..6489d3cb5 100644
--- a/repos.bzl
+++ b/repos.bzl
@@ -89,21 +89,8 @@ def register_repos():
     maybe(
         http_archive,
         name = "build_bazel_rules_nodejs",
-        sha256 = "4a5d654a4ccd4a4c24eca5d319d85a88a650edf119601550c95bf400c8cc897e",
-        urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.5.1/rules_nodejs-3.5.1.tar.gz"],
-    )
-
-    # native.local_repository(
-    #     name = "esbuild_toolchain",
-    #     path = "../esbuild_toolchain",
-    # )
-
-    maybe(
-        http_archive,
-        name = "esbuild_toolchain",
-        sha256 = "7385dfb2acce6517fcfdb16480cf18d1959bafb83d8cddc0c1e95779609f762c",
-        urls = ["https://github.com/ankitects/esbuild_toolchain/archive/refs/tags/anki-2021-06-01.tar.gz"],
-        strip_prefix = "esbuild_toolchain-anki-2021-06-01",
+        sha256 = "3635797a96c7bfcd0d265dacd722a07335e64d6ded9834af8d3f1b7ba5a25bba",
+        urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.3.0/rules_nodejs-4.3.0.tar.gz"],
     )
 
     # sass
@@ -117,11 +104,11 @@ def register_repos():
     maybe(
         http_archive,
         name = "io_bazel_rules_sass",
-        strip_prefix = "rules_sass-anki-2020-12-23",
+        strip_prefix = "rules_sass-d0cda2205a6e9706ded30f7dd7d30c82b1301fbe",
         urls = [
-            "https://github.com/ankitects/rules_sass/archive/anki-2020-12-23.tar.gz",
+            "https://github.com/bazelbuild/rules_sass/archive/d0cda2205a6e9706ded30f7dd7d30c82b1301fbe.zip",
         ],
-        sha256 = "224ae14b8d2166b3ab4c5fa9b2ae1828f30620ac628dc152e6c0859c7853bb97",
+        sha256 = "640ad20f878a6656968e35f35343359446db91a773224ddf52ae110f1e48bb20",
     )
 
     # translations
diff --git a/ts/.eslintrc.js b/ts/.eslintrc.js
index dd3dc4c4b..8106cbae6 100644
--- a/ts/.eslintrc.js
+++ b/ts/.eslintrc.js
@@ -16,4 +16,5 @@ module.exports = {
         ],
     },
     env: { browser: true },
+    ignorePatterns: ["backend_proto.d.ts", "*.svelte.d.ts"],
 };
diff --git a/ts/.prettierignore b/ts/.prettierignore
index 3fd69af96..ac995e48b 100644
--- a/ts/.prettierignore
+++ b/ts/.prettierignore
@@ -1,2 +1,4 @@
 licenses.json
 vendor
+*.svelte.d.ts
+backend_proto.d.ts
diff --git a/ts/BUILD.bazel b/ts/BUILD.bazel
index 3ca8c216b..283d64bbe 100644
--- a/ts/BUILD.bazel
+++ b/ts/BUILD.bazel
@@ -1,30 +1,17 @@
 load("//ts:prettier.bzl", "prettier", "prettier_test")
 load("//ts:sql_format.bzl", "sql_format_setup")
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin")
 
 prettier()
 
-prettier_test(
-    name = "format_check",
-    srcs = glob([
-        "*.ts",
-        "*.js",
-    ]),
-)
+prettier_test()
 
 sql_format_setup()
 
-ts_library(
-    name = "image_module_support",
-    srcs = ["images.d.ts"],
-    visibility = ["//visibility:public"],
-)
-
 # Exported files
 #################
 
 exports_files([
-    "tsconfig.json",
     ".prettierrc",
     ".eslintrc.js",
     "licenses.json",
@@ -34,6 +21,14 @@ exports_files([
     "protobuf-no-long.js",
 ])
 
+# a copy needs to be placed in bazel-bin for libs with
+# generated files
+copy_to_bin(
+    name = "tsconfig_bin",
+    srcs = ["tsconfig.json"],
+    visibility = ["//visibility:public"],
+)
+
 alias(
     name = "yarn",
     actual = "@nodejs//:yarn",
diff --git a/ts/change-notetype/BUILD.bazel b/ts/change-notetype/BUILD.bazel
index 017d5c46e..dbea78a03 100644
--- a/ts/change-notetype/BUILD.bazel
+++ b/ts/change-notetype/BUILD.bazel
@@ -1,9 +1,9 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
 load("//ts/svelte:svelte.bzl", "compile_svelte", "svelte_check")
 load("//ts:esbuild.bzl", "esbuild")
 load("//ts:compile_sass.bzl", "compile_sass")
+load("//ts:typescript.bzl", "typescript")
 load("//ts:jest.bzl", "jest_test")
 
 compile_sass(
@@ -17,69 +17,44 @@ compile_sass(
     ],
 )
 
-svelte_files = glob(["*.svelte"])
+compile_svelte()
 
-svelte_names = [f.replace(".svelte", "") for f in svelte_files]
-
-compile_svelte(
-    name = "svelte",
-    srcs = svelte_files,
-    deps = [
-        "//ts/components",
-        "//ts/sveltelib",
-        "@npm//@types/bootstrap",
-    ],
-)
-
-ts_library(
+typescript(
     name = "index",
-    srcs = ["index.ts"],
-    deps = [
-        "ChangeNotetypePage",
-        "lib",
-        "//ts/components",
-        "//ts/lib",
-        "@npm//svelte2tsx",
-    ],
-)
-
-ts_library(
-    name = "lib",
-    srcs = [
-        "lib.ts",
-    ],
-    module_name = "change-notetype",
+    srcs = glob(["*.ts"]),
     deps = [
+        ":svelte",
         "//ts/components",
         "//ts/lib",
         "//ts/sveltelib",
+        "@npm//@fluent",
+        "@npm//@types/jest",
         "@npm//lodash-es",
         "@npm//svelte",
+        "@npm//svelte2tsx",
     ],
 )
 
 esbuild(
     name = "change-notetype",
-    args = [
-        "--global-name=anki",
-        "--resolve-extensions=.mjs,.js",
-        "--log-level=warning",
-        "--loader:.svg=text",
-    ],
+    args = {
+        "globalName": "anki",
+        "loader": {".svg": "text"},
+    },
     entry_point = "index.ts",
     output_css = "change-notetype.css",
     visibility = ["//visibility:public"],
     deps = [
-        "index",
         ":base_css",
-        "@npm//bootstrap",
-        "@npm//marked",
+        ":index",
+        ":svelte",
+        "//ts/components",
         "//ts/lib",
         "//ts/sveltelib",
-        "//ts/components",
-        "//ts/components:svelte_components",
+        "@npm//bootstrap",
+        "@npm//marked",
         "@npm//protobufjs",
-    ] + svelte_names,
+    ],
 )
 
 exports_files(["change-notetype.html"])
@@ -87,20 +62,9 @@ exports_files(["change-notetype.html"])
 # Tests
 ################
 
-prettier_test(
-    name = "format_check",
-    srcs = glob([
-        "*.ts",
-        "*.svelte",
-    ]),
-)
+prettier_test()
 
-eslint_test(
-    name = "eslint",
-    srcs = glob([
-        "*.ts",
-    ]),
-)
+eslint_test()
 
 svelte_check(
     name = "svelte_check",
@@ -120,9 +84,6 @@ svelte_check(
 jest_test(
     protobuf = True,
     deps = [
-        ":lib",
-        "//ts/lib",
-        "@npm//protobufjs",
-        "@npm//svelte",
+        ":index",
     ],
 )
diff --git a/ts/change-notetype/ChangeNotetypePage.svelte b/ts/change-notetype/ChangeNotetypePage.svelte
index 09ab80a84..878114145 100644
--- a/ts/change-notetype/ChangeNotetypePage.svelte
+++ b/ts/change-notetype/ChangeNotetypePage.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import NotetypeSelector from "./NotetypeSelector.svelte";
     import Mapper from "./Mapper.svelte";
     import { ChangeNotetypeState, MapContext } from "./lib";
diff --git a/ts/change-notetype/Mapper.svelte b/ts/change-notetype/Mapper.svelte
index 4e21afafe..10763e8f0 100644
--- a/ts/change-notetype/Mapper.svelte
+++ b/ts/change-notetype/Mapper.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import MapperRow from "./MapperRow.svelte";
     import { ChangeNotetypeState, MapContext } from "./lib";
     import { slide } from "svelte/transition";
diff --git a/ts/change-notetype/NotetypeSelector.svelte b/ts/change-notetype/NotetypeSelector.svelte
index 22d7733f1..6b2129075 100644
--- a/ts/change-notetype/NotetypeSelector.svelte
+++ b/ts/change-notetype/NotetypeSelector.svelte
@@ -5,14 +5,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="ts">
     import type { ChangeNotetypeState } from "./lib";
 
-    import StickyHeader from "components/StickyHeader.svelte";
-    import ButtonToolbar from "components/ButtonToolbar.svelte";
-    import Item from "components/Item.svelte";
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
+    import StickyHeader from "../components/StickyHeader.svelte";
+    import ButtonToolbar from "../components/ButtonToolbar.svelte";
+    import Item from "../components/Item.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
 
-    import SelectButton from "components/SelectButton.svelte";
-    import SelectOption from "components/SelectOption.svelte";
+    import SelectButton from "../components/SelectButton.svelte";
+    import SelectOption from "../components/SelectOption.svelte";
     import SaveButton from "./SaveButton.svelte";
 
     export let state: ChangeNotetypeState;
diff --git a/ts/change-notetype/SaveButton.svelte b/ts/change-notetype/SaveButton.svelte
index 52bf31451..51e10b394 100644
--- a/ts/change-notetype/SaveButton.svelte
+++ b/ts/change-notetype/SaveButton.svelte
@@ -3,15 +3,15 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import type { ChangeNotetypeState } from "./lib";
-    import { withButton } from "components/helpers";
+    import { withButton } from "../components/helpers";
 
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
 
-    import LabelButton from "components/LabelButton.svelte";
-    import WithShortcut from "components/WithShortcut.svelte";
+    import LabelButton from "../components/LabelButton.svelte";
+    import WithShortcut from "../components/WithShortcut.svelte";
 
     export let state: ChangeNotetypeState;
 
diff --git a/ts/change-notetype/index.ts b/ts/change-notetype/index.ts
index 67bb83707..3133fb06a 100644
--- a/ts/change-notetype/index.ts
+++ b/ts/change-notetype/index.ts
@@ -6,10 +6,10 @@
  */
 
 import { ChangeNotetypeState, getChangeNotetypeInfo, getNotetypeNames } from "./lib";
-import { setupI18n, ModuleName } from "lib/i18n";
-import { checkNightMode } from "lib/nightmode";
+import { setupI18n, ModuleName } from "../lib/i18n";
+import { checkNightMode } from "../lib/nightmode";
 import ChangeNotetypePage from "./ChangeNotetypePage.svelte";
-import { nightModeKey } from "components/context-keys";
+import { nightModeKey } from "../components/context-keys";
 
 export async function changeNotetypePage(
     target: HTMLDivElement,
diff --git a/ts/change-notetype/lib.test.ts b/ts/change-notetype/lib.test.ts
index bcda9781c..e08a783a2 100644
--- a/ts/change-notetype/lib.test.ts
+++ b/ts/change-notetype/lib.test.ts
@@ -5,8 +5,8 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { Notetypes } from "lib/proto";
 import { ChangeNotetypeState, negativeOneToNull, MapContext } from "./lib";
+import { Notetypes } from "../lib/proto";
 import { get } from "svelte/store";
 
 const exampleNames = {
diff --git a/ts/change-notetype/lib.ts b/ts/change-notetype/lib.ts
index 5c612049d..ae6a9fc5f 100644
--- a/ts/change-notetype/lib.ts
+++ b/ts/change-notetype/lib.ts
@@ -5,8 +5,8 @@
 @typescript-eslint/no-non-null-assertion: "off",
  */
 
-import { Notetypes } from "lib/proto";
-import { postRequest } from "lib/postrequest";
+import { Notetypes } from "../lib/proto";
+import { postRequest } from "../lib/postrequest";
 import { readable, Readable } from "svelte/store";
 import { isEqual } from "lodash-es";
 
diff --git a/ts/change-notetype/tsconfig.json b/ts/change-notetype/tsconfig.json
new file mode 100644
index 000000000..276e90989
--- /dev/null
+++ b/ts/change-notetype/tsconfig.json
@@ -0,0 +1,12 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [
+        { "path": "../lib" },
+        { "path": "../sveltelib" },
+        { "path": "../components" }
+    ],
+    "compilerOptions": {
+        "types": ["jest"]
+    }
+}
diff --git a/ts/components/BUILD.bazel b/ts/components/BUILD.bazel
index 874b922ac..846ad650f 100644
--- a/ts/components/BUILD.bazel
+++ b/ts/components/BUILD.bazel
@@ -1,70 +1,33 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//ts/svelte:svelte.bzl", "compile_svelte", "svelte_check")
 load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
-load("//ts:esbuild.bzl", "esbuild")
+load("//ts:typescript.bzl", "typescript")
 
-svelte_files = glob(["*.svelte"])
+compile_svelte()
 
-svelte_names = [f.replace(".svelte", "") for f in svelte_files]
-
-filegroup(
-    name = "svelte_components",
-    srcs = svelte_names,
-    visibility = ["//visibility:public"],
-)
-
-compile_svelte(
-    name = "svelte",
-    srcs = svelte_files,
-    visibility = ["//visibility:public"],
-    deps = [
-        "//ts/lib",
-        "//ts/sass:base_lib",
-        "//ts/sass:button_mixins_lib",
-        "//ts/sass:scrollbar_lib",
-        "//ts/sass/bootstrap",
-    ],
-)
-
-ts_library(
+typescript(
     name = "components",
     srcs = glob(
         ["*.ts"],
         exclude = ["*.test.ts"],
     ),
-    module_name = "components",
-    tsconfig = "//ts:tsconfig.json",
-    visibility = ["//visibility:public"],
     deps = [
+        ":svelte",
         "//ts/lib",
         "//ts/sveltelib",
         "@npm//@popperjs/core",
         "@npm//@types/bootstrap",
         "@npm//bootstrap",
         "@npm//svelte",
-    ] + svelte_names,
+    ],
 )
 
 # Tests
 ################
 
-prettier_test(
-    name = "format_check",
-    srcs = glob([
-        "*.ts",
-        "*.svelte",
-    ]),
-)
+prettier_test()
 
-eslint_test(
-    name = "eslint",
-    srcs = glob(
-        [
-            "*.ts",
-        ],
-    ),
-)
+eslint_test()
 
 svelte_check(
     name = "svelte_check",
@@ -77,5 +40,6 @@ svelte_check(
         "//ts/sass:scrollbar_lib",
         "//ts/sass/bootstrap",
         "@npm//@types/bootstrap",
+        "//ts/sveltelib:sveltelib_pkg",
     ],
 )
diff --git a/ts/components/WithShortcut.svelte b/ts/components/WithShortcut.svelte
index e09ec539d..56424ce01 100644
--- a/ts/components/WithShortcut.svelte
+++ b/ts/components/WithShortcut.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import { onDestroy } from "svelte";
-    import { registerShortcut, getPlatformString } from "lib/shortcuts";
+    import { registerShortcut, getPlatformString } from "../lib/shortcuts";
 
     export let shortcut: string;
 
diff --git a/ts/components/tsconfig.json b/ts/components/tsconfig.json
new file mode 100644
index 000000000..6ef6ea47c
--- /dev/null
+++ b/ts/components/tsconfig.json
@@ -0,0 +1,5 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [{ "path": "../lib" }, { "path": "../sveltelib" }]
+}
diff --git a/ts/congrats/BUILD.bazel b/ts/congrats/BUILD.bazel
index 8cba0ec3d..bb0f00e7d 100644
--- a/ts/congrats/BUILD.bazel
+++ b/ts/congrats/BUILD.bazel
@@ -4,6 +4,7 @@ load("//ts:eslint.bzl", "eslint_test")
 load("//ts/svelte:svelte.bzl", "svelte", "svelte_check")
 load("//ts:esbuild.bzl", "esbuild")
 load("//ts:compile_sass.bzl", "compile_sass")
+load("//ts:typescript.bzl", "typescript")
 
 compile_sass(
     srcs = ["congrats-base.scss"],
@@ -20,31 +21,26 @@ svelte(
     entry_point = "CongratsPage.svelte",
 )
 
-ts_library(
+typescript(
     name = "index",
-    srcs = ["index.ts"],
+    srcs = [
+        "index.ts",
+        "lib.ts",
+    ],
     deps = [
         "CongratsPage",
-        "lib",
         "//ts/lib",
+        "@npm//@fluent",
         "@npm//svelte",
         "@npm//svelte2tsx",
     ],
 )
 
-ts_library(
-    name = "lib",
-    srcs = ["lib.ts"],
-    deps = ["//ts/lib"],
-)
-
 esbuild(
     name = "congrats",
-    args = [
-        "--global-name=anki",
-        "--resolve-extensions=.mjs,.js",
-        "--log-level=warning",
-    ],
+    args = {
+        "globalName": "anki",
+    },
     entry_point = "index.ts",
     output_css = "congrats.css",
     visibility = ["//visibility:public"],
@@ -62,25 +58,16 @@ exports_files(["congrats.html"])
 # Tests
 ################
 
-prettier_test(
-    name = "format_check",
-    srcs = glob([
-        "*.ts",
-        "*.svelte",
-    ]),
-)
+prettier_test()
 
-eslint_test(
-    name = "eslint",
-    srcs = glob([
-        "*.ts",
-    ]),
-)
+eslint_test()
 
 svelte_check(
     name = "svelte_check",
     srcs = glob([
         "*.ts",
         "*.svelte",
-    ]),
+    ]) + [
+        "//ts/lib:lib_pkg",
+    ],
 )
diff --git a/ts/congrats/CongratsPage.svelte b/ts/congrats/CongratsPage.svelte
index 1c4702828..2e2f339c1 100644
--- a/ts/congrats/CongratsPage.svelte
+++ b/ts/congrats/CongratsPage.svelte
@@ -3,12 +3,12 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import type { Scheduler } from "lib/proto";
+    import type { Scheduler } from "../lib/proto";
     import { buildNextLearnMsg } from "./lib";
-    import { bridgeLink } from "lib/bridgecommand";
+    import { bridgeLink } from "../lib/bridgecommand";
 
     export let info: Scheduler.CongratsInfoResponse;
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
 
     const congrats = tr.schedulingCongratulationsFinished();
     let nextLearnMsg: string;
diff --git a/ts/congrats/CongratsPage.svelte.d.ts b/ts/congrats/CongratsPage.svelte.d.ts
new file mode 120000
index 000000000..c89e48b0a
--- /dev/null
+++ b/ts/congrats/CongratsPage.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/congrats/CongratsPage.svelte.d.ts
\ No newline at end of file
diff --git a/ts/congrats/index.ts b/ts/congrats/index.ts
index 75c34d300..4c4c4c79d 100644
--- a/ts/congrats/index.ts
+++ b/ts/congrats/index.ts
@@ -2,8 +2,8 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import { getCongratsInfo } from "./lib";
-import { setupI18n, ModuleName } from "lib/i18n";
-import { checkNightMode } from "lib/nightmode";
+import { setupI18n, ModuleName } from "../lib/i18n";
+import { checkNightMode } from "../lib/nightmode";
 
 import CongratsPage from "./CongratsPage.svelte";
 
diff --git a/ts/congrats/lib.ts b/ts/congrats/lib.ts
index 48c83dd70..9297291c1 100644
--- a/ts/congrats/lib.ts
+++ b/ts/congrats/lib.ts
@@ -1,11 +1,11 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import { Scheduler } from "lib/proto";
-import { postRequest } from "lib/postrequest";
-import { naturalUnit, unitAmount, unitName } from "lib/time";
+import { Scheduler } from "../lib/proto";
+import { postRequest } from "../lib/postrequest";
+import { naturalUnit, unitAmount, unitName } from "../lib/time";
 
-import * as tr from "lib/i18n";
+import * as tr from "../lib/i18n";
 
 export async function getCongratsInfo(): Promise<Scheduler.CongratsInfoResponse> {
     return Scheduler.CongratsInfoResponse.decode(
diff --git a/ts/congrats/tsconfig.json b/ts/congrats/tsconfig.json
new file mode 100644
index 000000000..156ec7f9f
--- /dev/null
+++ b/ts/congrats/tsconfig.json
@@ -0,0 +1,5 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [{ "path": "../lib" }]
+}
diff --git a/ts/deck-options/Addons.svelte.d.ts b/ts/deck-options/Addons.svelte.d.ts
new file mode 120000
index 000000000..fd03d26ef
--- /dev/null
+++ b/ts/deck-options/Addons.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/Addons.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/AdvancedOptions.svelte b/ts/deck-options/AdvancedOptions.svelte
index 62640889c..3d6070236 100644
--- a/ts/deck-options/AdvancedOptions.svelte
+++ b/ts/deck-options/AdvancedOptions.svelte
@@ -3,9 +3,9 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
-    import Item from "components/Item.svelte";
+    import Item from "../components/Item.svelte";
     import SpinBoxRow from "./SpinBoxRow.svelte";
     import SpinBoxFloatRow from "./SpinBoxFloatRow.svelte";
     import type { DeckOptionsState } from "./lib";
diff --git a/ts/deck-options/AdvancedOptions.svelte.d.ts b/ts/deck-options/AdvancedOptions.svelte.d.ts
new file mode 120000
index 000000000..fa84e0b15
--- /dev/null
+++ b/ts/deck-options/AdvancedOptions.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/AdvancedOptions.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/AudioOptions.svelte b/ts/deck-options/AudioOptions.svelte
index 9a8cc7ec9..a115de4e7 100644
--- a/ts/deck-options/AudioOptions.svelte
+++ b/ts/deck-options/AudioOptions.svelte
@@ -3,9 +3,9 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
-    import Item from "components/Item.svelte";
+    import Item from "../components/Item.svelte";
     import SwitchRow from "./SwitchRow.svelte";
     import type { DeckOptionsState } from "./lib";
 
diff --git a/ts/deck-options/AudioOptions.svelte.d.ts b/ts/deck-options/AudioOptions.svelte.d.ts
new file mode 120000
index 000000000..74383fd32
--- /dev/null
+++ b/ts/deck-options/AudioOptions.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/AudioOptions.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/BUILD.bazel b/ts/deck-options/BUILD.bazel
index d1f7bc0f1..aa4a0e397 100644
--- a/ts/deck-options/BUILD.bazel
+++ b/ts/deck-options/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
 load("//ts/svelte:svelte.bzl", "compile_svelte", "svelte", "svelte_check")
@@ -6,6 +5,7 @@ load("//ts:esbuild.bzl", "esbuild")
 load("//ts:vendor.bzl", "copy_bootstrap_icons")
 load("//ts:compile_sass.bzl", "compile_sass")
 load("//ts:jest.bzl", "jest_test")
+load("//ts:typescript.bzl", "typescript")
 
 compile_sass(
     srcs = ["deck-options-base.scss"],
@@ -18,58 +18,23 @@ compile_sass(
     ],
 )
 
-svelte_files = glob(["*.svelte"])
+compile_svelte()
 
-svelte_names = [f.replace(".svelte", "") for f in svelte_files]
-
-compile_svelte(
-    name = "svelte",
-    srcs = svelte_files,
-    deps = [
-        "//ts/components",
-        "//ts/sveltelib",
-        "@npm//@types/bootstrap",
-        "@npm//@types/marked",
-    ],
-)
-
-copy_bootstrap_icons(
-    name = "bootstrap-icons",
-    icons = [
-        "arrow-counterclockwise.svg",
-        "info-circle.svg",
-        "gear.svg",
-    ],
-)
-
-ts_library(
+typescript(
     name = "index",
-    srcs = ["index.ts"],
+    srcs = glob(
+        ["*.ts"],
+        exclude = ["*.svelte.d.ts"],
+    ),
     deps = [
-        "DeckOptionsPage",
-        "lib",
+        ":svelte",
         "//ts/components",
         "//ts/lib",
         "//ts/sveltelib",
+        "@npm//@fluent",
         "@npm//@popperjs",
-        "@npm//svelte2tsx",
-    ],
-)
-
-ts_library(
-    name = "lib",
-    srcs = [
-        "icons.ts",
-        "lib.ts",
-        "steps.ts",
-        "strings.ts",
-    ],
-    module_name = "deckoptions",
-    deps = [
-        "//ts:image_module_support",
-        "//ts/components",
-        "//ts/lib",
-        "//ts/sveltelib",
+        "@npm//@types/jest",
+        "@npm//bootstrap-icons",
         "@npm//lodash-es",
         "@npm//svelte",
     ],
@@ -77,27 +42,24 @@ ts_library(
 
 esbuild(
     name = "deck-options",
-    args = [
-        "--global-name=anki",
-        "--resolve-extensions=.mjs,.js",
-        "--log-level=warning",
-        "--loader:.svg=text",
-    ],
+    args = {
+        "globalName": "anki",
+        "loader": {".svg": "text"},
+    },
     entry_point = "index.ts",
     output_css = "deck-options.css",
     visibility = ["//visibility:public"],
     deps = [
         "index",
-        ":bootstrap-icons",
         ":base_css",
+        ":svelte",
+        "//ts/components",
+        "//ts/lib",
+        "//ts/sveltelib",
         "@npm//bootstrap",
         "@npm//marked",
         "@npm//protobufjs",
-        "//ts/lib",
-        "//ts/sveltelib",
-        "//ts/components",
-        "//ts/components:svelte_components",
-    ] + svelte_names,
+    ],
 )
 
 exports_files(["deck-options.html"])
@@ -105,20 +67,9 @@ exports_files(["deck-options.html"])
 # Tests
 ################
 
-prettier_test(
-    name = "format_check",
-    srcs = glob([
-        "*.ts",
-        "*.svelte",
-    ]),
-)
+prettier_test()
 
-eslint_test(
-    name = "eslint",
-    srcs = glob([
-        "*.ts",
-    ]),
-)
+eslint_test()
 
 svelte_check(
     name = "svelte_check",
@@ -133,15 +84,13 @@ svelte_check(
         "@npm//@types/lodash-es",
         "@npm//@types/marked",
         "//ts/components",
+        "//ts/sveltelib:sveltelib_pkg",
     ],
 )
 
 jest_test(
     protobuf = True,
     deps = [
-        ":lib",
-        "//ts/lib",
-        "@npm//protobufjs",
-        "@npm//svelte",
+        ":index",
     ],
 )
diff --git a/ts/deck-options/BuryOptions.svelte b/ts/deck-options/BuryOptions.svelte
index 9191265a7..f566ad4bc 100644
--- a/ts/deck-options/BuryOptions.svelte
+++ b/ts/deck-options/BuryOptions.svelte
@@ -3,9 +3,9 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
-    import Item from "components/Item.svelte";
+    import Item from "../components/Item.svelte";
     import SwitchRow from "./SwitchRow.svelte";
     import type { DeckOptionsState } from "./lib";
 
diff --git a/ts/deck-options/BuryOptions.svelte.d.ts b/ts/deck-options/BuryOptions.svelte.d.ts
new file mode 120000
index 000000000..c18746a2a
--- /dev/null
+++ b/ts/deck-options/BuryOptions.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/BuryOptions.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/CardStateCustomizer.svelte b/ts/deck-options/CardStateCustomizer.svelte
index c5a1f01af..bfaaedb1b 100644
--- a/ts/deck-options/CardStateCustomizer.svelte
+++ b/ts/deck-options/CardStateCustomizer.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import TooltipLabel from "./TooltipLabel.svelte";
     import RevertButton from "./RevertButton.svelte";
     import Row from "./Row.svelte";
diff --git a/ts/deck-options/CardStateCustomizer.svelte.d.ts b/ts/deck-options/CardStateCustomizer.svelte.d.ts
new file mode 120000
index 000000000..9bd63d528
--- /dev/null
+++ b/ts/deck-options/CardStateCustomizer.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/CardStateCustomizer.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/CheckBox.svelte.d.ts b/ts/deck-options/CheckBox.svelte.d.ts
new file mode 120000
index 000000000..86c07426f
--- /dev/null
+++ b/ts/deck-options/CheckBox.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/CheckBox.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/CheckBoxRow.svelte.d.ts b/ts/deck-options/CheckBoxRow.svelte.d.ts
new file mode 120000
index 000000000..2451afaeb
--- /dev/null
+++ b/ts/deck-options/CheckBoxRow.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/CheckBoxRow.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/Col.svelte.d.ts b/ts/deck-options/Col.svelte.d.ts
new file mode 120000
index 000000000..921d4e48f
--- /dev/null
+++ b/ts/deck-options/Col.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/Col.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/ConfigSelector.svelte b/ts/deck-options/ConfigSelector.svelte
index 7ef2d80fc..ea684b841 100644
--- a/ts/deck-options/ConfigSelector.svelte
+++ b/ts/deck-options/ConfigSelector.svelte
@@ -3,21 +3,21 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import { getContext } from "svelte";
-    import { modalsKey } from "components/context-keys";
+    import { modalsKey } from "../components/context-keys";
     import type { DeckOptionsState, ConfigListEntry } from "./lib";
     import type Modal from "bootstrap/js/dist/modal";
 
     import TextInputModal from "./TextInputModal.svelte";
-    import StickyHeader from "components/StickyHeader.svelte";
-    import ButtonToolbar from "components/ButtonToolbar.svelte";
-    import Item from "components/Item.svelte";
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
+    import StickyHeader from "../components/StickyHeader.svelte";
+    import ButtonToolbar from "../components/ButtonToolbar.svelte";
+    import Item from "../components/Item.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
 
-    import SelectButton from "components/SelectButton.svelte";
-    import SelectOption from "components/SelectOption.svelte";
+    import SelectButton from "../components/SelectButton.svelte";
+    import SelectOption from "../components/SelectOption.svelte";
     import SaveButton from "./SaveButton.svelte";
 
     export let state: DeckOptionsState;
diff --git a/ts/deck-options/ConfigSelector.svelte.d.ts b/ts/deck-options/ConfigSelector.svelte.d.ts
new file mode 120000
index 000000000..70a7239eb
--- /dev/null
+++ b/ts/deck-options/ConfigSelector.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/ConfigSelector.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/DailyLimits.svelte b/ts/deck-options/DailyLimits.svelte
index 7dec9a0a3..56af47543 100644
--- a/ts/deck-options/DailyLimits.svelte
+++ b/ts/deck-options/DailyLimits.svelte
@@ -3,9 +3,9 @@
     License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
-    import Item from "components/Item.svelte";
+    import Item from "../components/Item.svelte";
     import SpinBoxRow from "./SpinBoxRow.svelte";
     import Warning from "./Warning.svelte";
     import type { DeckOptionsState } from "./lib";
diff --git a/ts/deck-options/DailyLimits.svelte.d.ts b/ts/deck-options/DailyLimits.svelte.d.ts
new file mode 120000
index 000000000..18037addb
--- /dev/null
+++ b/ts/deck-options/DailyLimits.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/DailyLimits.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/DeckOptionsPage.svelte b/ts/deck-options/DeckOptionsPage.svelte
index d7b94a3ec..9dd48952b 100644
--- a/ts/deck-options/DeckOptionsPage.svelte
+++ b/ts/deck-options/DeckOptionsPage.svelte
@@ -4,8 +4,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import ConfigSelector from "./ConfigSelector.svelte";
-    import Container from "components/Container.svelte";
-    import Item from "components/Item.svelte";
+    import Container from "../components/Container.svelte";
+    import Item from "../components/Item.svelte";
     import DailyLimits from "./DailyLimits.svelte";
     import DisplayOrder from "./DisplayOrder.svelte";
     import NewOptions from "./NewOptions.svelte";
@@ -19,7 +19,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { DeckOptionsState } from "./lib";
     import type { Writable } from "svelte/store";
     import HtmlAddon from "./HtmlAddon.svelte";
-    import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
+    import type { DynamicSvelteComponent } from "../sveltelib/dynamicComponent";
 
     export let state: DeckOptionsState;
     let addons = state.addonComponents;
diff --git a/ts/deck-options/DeckOptionsPage.svelte.d.ts b/ts/deck-options/DeckOptionsPage.svelte.d.ts
new file mode 120000
index 000000000..7c2771fa3
--- /dev/null
+++ b/ts/deck-options/DeckOptionsPage.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/DeckOptionsPage.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/DisplayOrder.svelte b/ts/deck-options/DisplayOrder.svelte
index 39e4ef274..07992d389 100644
--- a/ts/deck-options/DisplayOrder.svelte
+++ b/ts/deck-options/DisplayOrder.svelte
@@ -3,9 +3,9 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
-    import Item from "components/Item.svelte";
+    import Item from "../components/Item.svelte";
     import EnumSelectorRow from "./EnumSelectorRow.svelte";
 
     import type { DeckOptionsState } from "./lib";
diff --git a/ts/deck-options/DisplayOrder.svelte.d.ts b/ts/deck-options/DisplayOrder.svelte.d.ts
new file mode 120000
index 000000000..746e10779
--- /dev/null
+++ b/ts/deck-options/DisplayOrder.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/DisplayOrder.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/EnumSelector.svelte b/ts/deck-options/EnumSelector.svelte
index 16c77ce4d..bfdd4f341 100644
--- a/ts/deck-options/EnumSelector.svelte
+++ b/ts/deck-options/EnumSelector.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import { getContext } from "svelte";
-    import { nightModeKey } from "components/context-keys";
+    import { nightModeKey } from "../components/context-keys";
 
     export let choices: string[];
     export let value: number = 0;
diff --git a/ts/deck-options/EnumSelector.svelte.d.ts b/ts/deck-options/EnumSelector.svelte.d.ts
new file mode 120000
index 000000000..31764fcf7
--- /dev/null
+++ b/ts/deck-options/EnumSelector.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/EnumSelector.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/EnumSelectorRow.svelte.d.ts b/ts/deck-options/EnumSelectorRow.svelte.d.ts
new file mode 120000
index 000000000..554b8bd2d
--- /dev/null
+++ b/ts/deck-options/EnumSelectorRow.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/EnumSelectorRow.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/HtmlAddon.svelte.d.ts b/ts/deck-options/HtmlAddon.svelte.d.ts
new file mode 120000
index 000000000..bb8b71e80
--- /dev/null
+++ b/ts/deck-options/HtmlAddon.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/HtmlAddon.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/Label.svelte.d.ts b/ts/deck-options/Label.svelte.d.ts
new file mode 120000
index 000000000..9081caa74
--- /dev/null
+++ b/ts/deck-options/Label.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/Label.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/LapseOptions.svelte b/ts/deck-options/LapseOptions.svelte
index f3c5d0872..bf997d4e5 100644
--- a/ts/deck-options/LapseOptions.svelte
+++ b/ts/deck-options/LapseOptions.svelte
@@ -3,9 +3,9 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
-    import Item from "components/Item.svelte";
+    import Item from "../components/Item.svelte";
     import StepsInputRow from "./StepsInputRow.svelte";
     import SpinBoxRow from "./SpinBoxRow.svelte";
     import EnumSelectorRow from "./EnumSelectorRow.svelte";
diff --git a/ts/deck-options/LapseOptions.svelte.d.ts b/ts/deck-options/LapseOptions.svelte.d.ts
new file mode 120000
index 000000000..c973e60f1
--- /dev/null
+++ b/ts/deck-options/LapseOptions.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/LapseOptions.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/NewOptions.svelte b/ts/deck-options/NewOptions.svelte
index b52a11d04..4911899b3 100644
--- a/ts/deck-options/NewOptions.svelte
+++ b/ts/deck-options/NewOptions.svelte
@@ -3,9 +3,9 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
-    import Item from "components/Item.svelte";
+    import Item from "../components/Item.svelte";
     import StepsInputRow from "./StepsInputRow.svelte";
     import SpinBoxRow from "./SpinBoxRow.svelte";
     import EnumSelectorRow from "./EnumSelectorRow.svelte";
diff --git a/ts/deck-options/NewOptions.svelte.d.ts b/ts/deck-options/NewOptions.svelte.d.ts
new file mode 120000
index 000000000..6f9e65726
--- /dev/null
+++ b/ts/deck-options/NewOptions.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/NewOptions.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/RevertButton.svelte b/ts/deck-options/RevertButton.svelte
index 32090cfd1..9402d4c50 100644
--- a/ts/deck-options/RevertButton.svelte
+++ b/ts/deck-options/RevertButton.svelte
@@ -3,15 +3,15 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import type Dropdown from "bootstrap/js/dist/dropdown";
-    import WithDropdown from "components/WithDropdown.svelte";
-    import DropdownMenu from "components/DropdownMenu.svelte";
-    import DropdownItem from "components/DropdownItem.svelte";
-    import Badge from "components/Badge.svelte";
+    import WithDropdown from "../components/WithDropdown.svelte";
+    import DropdownMenu from "../components/DropdownMenu.svelte";
+    import DropdownItem from "../components/DropdownItem.svelte";
+    import Badge from "../components/Badge.svelte";
     import { revertIcon } from "./icons";
     import { isEqual as isEqualLodash, cloneDeep } from "lodash-es";
-    import { touchDeviceKey } from "components/context-keys";
+    import { touchDeviceKey } from "../components/context-keys";
     import { getContext } from "svelte";
 
     type T = unknown;
diff --git a/ts/deck-options/RevertButton.svelte.d.ts b/ts/deck-options/RevertButton.svelte.d.ts
new file mode 120000
index 000000000..9f1178ec8
--- /dev/null
+++ b/ts/deck-options/RevertButton.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/RevertButton.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/Row.svelte.d.ts b/ts/deck-options/Row.svelte.d.ts
new file mode 120000
index 000000000..1b577bf96
--- /dev/null
+++ b/ts/deck-options/Row.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/Row.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/SaveButton.svelte b/ts/deck-options/SaveButton.svelte
index 088cd1764..6781bdd2e 100644
--- a/ts/deck-options/SaveButton.svelte
+++ b/ts/deck-options/SaveButton.svelte
@@ -3,21 +3,21 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import { createEventDispatcher } from "svelte";
     import type { DeckOptionsState } from "./lib";
     import type Dropdown from "bootstrap/js/dist/dropdown";
-    import { withButton } from "components/helpers";
+    import { withButton } from "../components/helpers";
 
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
 
-    import LabelButton from "components/LabelButton.svelte";
-    import DropdownMenu from "components/DropdownMenu.svelte";
-    import DropdownItem from "components/DropdownItem.svelte";
-    import DropdownDivider from "components/DropdownDivider.svelte";
-    import WithDropdown from "components/WithDropdown.svelte";
-    import WithShortcut from "components/WithShortcut.svelte";
+    import LabelButton from "../components/LabelButton.svelte";
+    import DropdownMenu from "../components/DropdownMenu.svelte";
+    import DropdownItem from "../components/DropdownItem.svelte";
+    import DropdownDivider from "../components/DropdownDivider.svelte";
+    import WithDropdown from "../components/WithDropdown.svelte";
+    import WithShortcut from "../components/WithShortcut.svelte";
 
     const dispatch = createEventDispatcher();
 
diff --git a/ts/deck-options/SaveButton.svelte.d.ts b/ts/deck-options/SaveButton.svelte.d.ts
new file mode 120000
index 000000000..0eb2a49e7
--- /dev/null
+++ b/ts/deck-options/SaveButton.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/SaveButton.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/SpinBox.svelte b/ts/deck-options/SpinBox.svelte
index 6611cd28f..317ce416f 100644
--- a/ts/deck-options/SpinBox.svelte
+++ b/ts/deck-options/SpinBox.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import { getContext } from "svelte";
-    import { nightModeKey } from "components/context-keys";
+    import { nightModeKey } from "../components/context-keys";
 
     export let value: number;
     export let min = 1;
diff --git a/ts/deck-options/SpinBox.svelte.d.ts b/ts/deck-options/SpinBox.svelte.d.ts
new file mode 120000
index 000000000..a8f3cb2be
--- /dev/null
+++ b/ts/deck-options/SpinBox.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/SpinBox.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/SpinBoxFloat.svelte b/ts/deck-options/SpinBoxFloat.svelte
index 6667a7f45..3fbc9ab50 100644
--- a/ts/deck-options/SpinBoxFloat.svelte
+++ b/ts/deck-options/SpinBoxFloat.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import { getContext } from "svelte";
-    import { nightModeKey } from "components/context-keys";
+    import { nightModeKey } from "../components/context-keys";
 
     export let value: number;
     export let min = 1;
diff --git a/ts/deck-options/SpinBoxFloat.svelte.d.ts b/ts/deck-options/SpinBoxFloat.svelte.d.ts
new file mode 120000
index 000000000..58295e124
--- /dev/null
+++ b/ts/deck-options/SpinBoxFloat.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/SpinBoxFloat.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/SpinBoxFloatRow.svelte.d.ts b/ts/deck-options/SpinBoxFloatRow.svelte.d.ts
new file mode 120000
index 000000000..6a7e13549
--- /dev/null
+++ b/ts/deck-options/SpinBoxFloatRow.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/SpinBoxFloatRow.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/SpinBoxRow.svelte.d.ts b/ts/deck-options/SpinBoxRow.svelte.d.ts
new file mode 120000
index 000000000..f12b1dc16
--- /dev/null
+++ b/ts/deck-options/SpinBoxRow.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/SpinBoxRow.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/StepsInput.svelte b/ts/deck-options/StepsInput.svelte
index 3e830339b..b826990c6 100644
--- a/ts/deck-options/StepsInput.svelte
+++ b/ts/deck-options/StepsInput.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import { getContext } from "svelte";
-    import { nightModeKey } from "components/context-keys";
+    import { nightModeKey } from "../components/context-keys";
     import { stepsToString, stringToSteps } from "./steps";
 
     export let value: number[];
diff --git a/ts/deck-options/StepsInput.svelte.d.ts b/ts/deck-options/StepsInput.svelte.d.ts
new file mode 120000
index 000000000..dc627d5c6
--- /dev/null
+++ b/ts/deck-options/StepsInput.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/StepsInput.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/StepsInputRow.svelte.d.ts b/ts/deck-options/StepsInputRow.svelte.d.ts
new file mode 120000
index 000000000..16ac98c68
--- /dev/null
+++ b/ts/deck-options/StepsInputRow.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/StepsInputRow.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/Switch.svelte b/ts/deck-options/Switch.svelte
index 090b5d8d4..42f119489 100644
--- a/ts/deck-options/Switch.svelte
+++ b/ts/deck-options/Switch.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import { getContext } from "svelte";
-    import { nightModeKey } from "components/context-keys";
+    import { nightModeKey } from "../components/context-keys";
 
     export let id: string | undefined;
     export let value: boolean;
diff --git a/ts/deck-options/Switch.svelte.d.ts b/ts/deck-options/Switch.svelte.d.ts
new file mode 120000
index 000000000..99c9aad6f
--- /dev/null
+++ b/ts/deck-options/Switch.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/Switch.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/SwitchRow.svelte.d.ts b/ts/deck-options/SwitchRow.svelte.d.ts
new file mode 120000
index 000000000..61bdd9218
--- /dev/null
+++ b/ts/deck-options/SwitchRow.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/SwitchRow.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/TextInputModal.svelte b/ts/deck-options/TextInputModal.svelte
index 2c769a69f..9f98a7513 100644
--- a/ts/deck-options/TextInputModal.svelte
+++ b/ts/deck-options/TextInputModal.svelte
@@ -7,7 +7,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     @typescript-eslint/no-non-null-assertion: "off",
     */
     import { onMount, onDestroy, getContext } from "svelte";
-    import { nightModeKey, modalsKey } from "components/context-keys";
+    import { nightModeKey, modalsKey } from "../components/context-keys";
     import Modal from "bootstrap/js/dist/modal";
 
     export let title: string;
diff --git a/ts/deck-options/TextInputModal.svelte.d.ts b/ts/deck-options/TextInputModal.svelte.d.ts
new file mode 120000
index 000000000..431cdc00f
--- /dev/null
+++ b/ts/deck-options/TextInputModal.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/TextInputModal.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/TimerOptions.svelte b/ts/deck-options/TimerOptions.svelte
index 996978fc5..ba7d3d631 100644
--- a/ts/deck-options/TimerOptions.svelte
+++ b/ts/deck-options/TimerOptions.svelte
@@ -3,9 +3,9 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import TitledContainer from "./TitledContainer.svelte";
-    import Item from "components/Item.svelte";
+    import Item from "../components/Item.svelte";
     import SpinBoxRow from "./SpinBoxRow.svelte";
     import SwitchRow from "./SwitchRow.svelte";
     import type { DeckOptionsState } from "./lib";
diff --git a/ts/deck-options/TimerOptions.svelte.d.ts b/ts/deck-options/TimerOptions.svelte.d.ts
new file mode 120000
index 000000000..fce4409ef
--- /dev/null
+++ b/ts/deck-options/TimerOptions.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/TimerOptions.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/TitledContainer.svelte b/ts/deck-options/TitledContainer.svelte
index bc3870c4f..e855b9dbb 100644
--- a/ts/deck-options/TitledContainer.svelte
+++ b/ts/deck-options/TitledContainer.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import Section from "components/Section.svelte";
+    import Section from "../components/Section.svelte";
 
     export let title: string;
     export let api: Record<string, never> | undefined = undefined;
diff --git a/ts/deck-options/TitledContainer.svelte.d.ts b/ts/deck-options/TitledContainer.svelte.d.ts
new file mode 120000
index 000000000..9d05d130b
--- /dev/null
+++ b/ts/deck-options/TitledContainer.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/TitledContainer.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/TooltipLabel.svelte b/ts/deck-options/TooltipLabel.svelte
index 4305df213..c74cee0e3 100644
--- a/ts/deck-options/TooltipLabel.svelte
+++ b/ts/deck-options/TooltipLabel.svelte
@@ -5,9 +5,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="typescript">
     import marked from "marked";
     import { infoCircle } from "./icons";
-    import WithTooltip from "components/WithTooltip.svelte";
+    import WithTooltip from "../components/WithTooltip.svelte";
     import Label from "./Label.svelte";
-    import Badge from "components/Badge.svelte";
+    import Badge from "../components/Badge.svelte";
 
     export let markdownTooltip: string;
     let forId: string | undefined = undefined;
diff --git a/ts/deck-options/TooltipLabel.svelte.d.ts b/ts/deck-options/TooltipLabel.svelte.d.ts
new file mode 120000
index 000000000..2f6cc785a
--- /dev/null
+++ b/ts/deck-options/TooltipLabel.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/TooltipLabel.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/Warning.svelte.d.ts b/ts/deck-options/Warning.svelte.d.ts
new file mode 120000
index 000000000..6b98a551c
--- /dev/null
+++ b/ts/deck-options/Warning.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/deck-options/Warning.svelte.d.ts
\ No newline at end of file
diff --git a/ts/deck-options/icons.ts b/ts/deck-options/icons.ts
index f430efca8..c275be3f3 100644
--- a/ts/deck-options/icons.ts
+++ b/ts/deck-options/icons.ts
@@ -1,8 +1,9 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-// Import icons from bootstrap
+/// <reference types="../lib/image-import" />
 
-export { default as revertIcon } from "./arrow-counterclockwise.svg";
-export { default as infoCircle } from "./info-circle.svg";
-export { default as gearIcon } from "./gear.svg";
+// Import icons from bootstrap
+export { default as revertIcon } from "bootstrap-icons/icons/arrow-counterclockwise.svg";
+export { default as infoCircle } from "bootstrap-icons/icons/info-circle.svg";
+export { default as gearIcon } from "bootstrap-icons/icons/gear.svg";
diff --git a/ts/deck-options/index.ts b/ts/deck-options/index.ts
index bb625b592..8f68c20fd 100644
--- a/ts/deck-options/index.ts
+++ b/ts/deck-options/index.ts
@@ -5,13 +5,13 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import "sveltelib/export-runtime";
+import "../sveltelib/export-runtime";
 
 import { getDeckOptionsInfo, DeckOptionsState } from "./lib";
-import { setupI18n, ModuleName } from "lib/i18n";
-import { checkNightMode } from "lib/nightmode";
+import { setupI18n, ModuleName } from "../lib/i18n";
+import { checkNightMode } from "../lib/nightmode";
 import DeckOptionsPage from "./DeckOptionsPage.svelte";
-import { nightModeKey, touchDeviceKey, modalsKey } from "components/context-keys";
+import { nightModeKey, touchDeviceKey, modalsKey } from "../components/context-keys";
 
 export async function deckOptions(
     target: HTMLDivElement,
diff --git a/ts/deck-options/lib.test.ts b/ts/deck-options/lib.test.ts
index eb9168896..8d3131a71 100644
--- a/ts/deck-options/lib.test.ts
+++ b/ts/deck-options/lib.test.ts
@@ -5,7 +5,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { DeckConfig } from "lib/proto";
+import { DeckConfig } from "../lib/proto";
 import { DeckOptionsState } from "./lib";
 import { get } from "svelte/store";
 
diff --git a/ts/deck-options/lib.ts b/ts/deck-options/lib.ts
index 1775d4815..dfed7bcb8 100644
--- a/ts/deck-options/lib.ts
+++ b/ts/deck-options/lib.ts
@@ -5,12 +5,12 @@
 @typescript-eslint/no-non-null-assertion: "off",
  */
 
-import { DeckConfig } from "lib/proto";
-import { postRequest } from "lib/postrequest";
+import { DeckConfig } from "../lib/proto";
+import { postRequest } from "../lib/postrequest";
 import { Writable, writable, get, Readable, readable } from "svelte/store";
 import { isEqual, cloneDeep } from "lodash-es";
-import * as tr from "lib/i18n";
-import type { DynamicSvelteComponent } from "sveltelib/dynamicComponent";
+import * as tr from "../lib/i18n";
+import type { DynamicSvelteComponent } from "../sveltelib/dynamicComponent";
 
 export async function getDeckOptionsInfo(
     deckId: number
diff --git a/ts/deck-options/steps.ts b/ts/deck-options/steps.ts
index 36a3c1757..3fd17f110 100644
--- a/ts/deck-options/steps.ts
+++ b/ts/deck-options/steps.ts
@@ -1,7 +1,7 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import { TimespanUnit, naturalWholeUnit, unitAmount, unitSeconds } from "lib/time";
+import { TimespanUnit, naturalWholeUnit, unitAmount, unitSeconds } from "../lib/time";
 
 function unitSuffix(unit: TimespanUnit): string {
     switch (unit) {
diff --git a/ts/deck-options/strings.ts b/ts/deck-options/strings.ts
index 1c8962fcf..d4d686a23 100644
--- a/ts/deck-options/strings.ts
+++ b/ts/deck-options/strings.ts
@@ -1,7 +1,7 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import * as tr from "lib/i18n";
+import * as tr from "../lib/i18n";
 
 export const reviewMixChoices = (): string[] => [
     tr.deckConfigReviewMixMixWithReviews(),
diff --git a/ts/deck-options/tsconfig.json b/ts/deck-options/tsconfig.json
new file mode 100644
index 000000000..276e90989
--- /dev/null
+++ b/ts/deck-options/tsconfig.json
@@ -0,0 +1,12 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [
+        { "path": "../lib" },
+        { "path": "../sveltelib" },
+        { "path": "../components" }
+    ],
+    "compilerOptions": {
+        "types": ["jest"]
+    }
+}
diff --git a/ts/editable/BUILD.bazel b/ts/editable/BUILD.bazel
index c5eab62ef..047974ee2 100644
--- a/ts/editable/BUILD.bazel
+++ b/ts/editable/BUILD.bazel
@@ -1,29 +1,9 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//ts/svelte:svelte.bzl", "compile_svelte", "svelte_check")
 load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
 load("//ts:esbuild.bzl", "esbuild")
-load("//ts:vendor.bzl", "copy_mdi_icons")
 load("//ts:compile_sass.bzl", "compile_sass")
-
-svelte_files = glob(["*.svelte"])
-
-svelte_names = [f.replace(".svelte", "") for f in svelte_files]
-
-filegroup(
-    name = "svelte_components",
-    srcs = svelte_names,
-    visibility = ["//visibility:public"],
-)
-
-compile_svelte(
-    name = "svelte",
-    srcs = svelte_files,
-    visibility = ["//visibility:public"],
-    deps = [
-        "//ts/components",
-    ],
-)
+load("//ts:typescript.bzl", "typescript")
 
 compile_sass(
     srcs = [
@@ -37,48 +17,38 @@ compile_sass(
     ],
 )
 
-copy_mdi_icons(
-    name = "mdi-icons",
-    icons = [
-        "math-integral-box.svg",
-    ],
-    visibility = ["//visibility:public"],
-)
+compile_svelte()
 
-ts_library(
+typescript(
     name = "editable",
-    srcs = glob(["*.ts"]),
-    module_name = "editable",
-    tsconfig = "//ts:tsconfig.json",
-    visibility = ["//visibility:public"],
+    srcs = glob(
+        ["*.ts"],
+        exclude = ["*.svelte.d.ts"],
+    ),
     deps = [
+        ":svelte",
+        "//ts/components",
         "//ts/lib",
         "//ts/sveltelib",
-        "//ts/components",
-        "//ts:image_module_support",
-        "@npm//svelte",
-        "@npm//mathjax-full",
         "@npm//mathjax",
-    ] + svelte_names,
+        "@npm//mathjax-full",
+        "@npm//svelte",
+    ],
 )
 
 esbuild(
     name = "editable-build",
-    args = [
-        "--loader:.svg=text",
-        "--resolve-extensions=.mjs,.js",
-        "--log-level=warning",
-    ],
+    args = {
+        "loader": {".svg": "text"},
+    },
     entry_point = "index.ts",
     output_css = "editable-build.css",
     visibility = ["//visibility:public"],
     deps = [
-        "mdi-icons",
         "editable",
         "editable_scss",
-        "svelte_components",
         "//ts/components",
-        "//ts/components:svelte_components",
+        "@npm//@mdi",
         "@npm//protobufjs",
     ],
 )
@@ -86,22 +56,9 @@ esbuild(
 # Tests
 ################
 
-prettier_test(
-    name = "format_check",
-    srcs = glob([
-        "*.ts",
-        "*.svelte",
-    ]),
-)
+prettier_test()
 
-eslint_test(
-    name = "eslint",
-    srcs = glob(
-        [
-            "*.ts",
-        ],
-    ),
-)
+eslint_test()
 
 svelte_check(
     name = "svelte_check",
diff --git a/ts/editable/Mathjax.svelte b/ts/editable/Mathjax.svelte
index 0f3a3385f..4df3c8a87 100644
--- a/ts/editable/Mathjax.svelte
+++ b/ts/editable/Mathjax.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import { onMount, onDestroy, getContext, tick } from "svelte";
-    import { nightModeKey } from "components/context-keys";
+    import { nightModeKey } from "../components/context-keys";
     import { convertMathjax } from "./mathjax";
 
     export let mathjax: string;
diff --git a/ts/editable/Mathjax.svelte.d.ts b/ts/editable/Mathjax.svelte.d.ts
new file mode 120000
index 000000000..dcc981551
--- /dev/null
+++ b/ts/editable/Mathjax.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editable/Mathjax.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editable/editable.ts b/ts/editable/editable.ts
index 101cd20c5..cae4a001c 100644
--- a/ts/editable/editable.ts
+++ b/ts/editable/editable.ts
@@ -1,15 +1,17 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
+/// <reference types="../lib/shadow-dom" />
+
 /* eslint
 @typescript-eslint/no-non-null-assertion: "off",
  */
 
 import type { DecoratedElement } from "./decorated";
 import { decoratedComponents } from "./decorated";
-import { bridgeCommand } from "lib/bridgecommand";
-import { elementIsBlock, getBlockElement } from "lib/dom";
-import { wrapInternal } from "lib/wrap";
+import { bridgeCommand } from "../lib/bridgecommand";
+import { elementIsBlock, getBlockElement } from "../lib/dom";
+import { wrapInternal } from "../lib/wrap";
 
 export function caretToEnd(node: Node): void {
     const range = document.createRange();
diff --git a/ts/editable/icons.ts b/ts/editable/icons.ts
index a85ecc4b3..7fb8a2681 100644
--- a/ts/editable/icons.ts
+++ b/ts/editable/icons.ts
@@ -1,4 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-export { default as mathIcon } from "./math-integral-box.svg";
+/// <reference types="../lib/image-import" />
+
+export { default as mathIcon } from "@mdi/svg/svg/math-integral-box.svg";
diff --git a/ts/editable/mathjax-component.ts b/ts/editable/mathjax-component.ts
index e0086d660..74ee21c41 100644
--- a/ts/editable/mathjax-component.ts
+++ b/ts/editable/mathjax-component.ts
@@ -10,8 +10,8 @@ import "mathjax/es5/tex-svg-full";
 
 import type { DecoratedElement, DecoratedElementConstructor } from "./decorated";
 import { decoratedComponents } from "./decorated";
-import { nodeIsElement } from "lib/dom";
-import { nightModeKey } from "components/context-keys";
+import { nodeIsElement } from "../lib/dom";
+import { nightModeKey } from "../components/context-keys";
 
 import Mathjax_svelte from "./Mathjax.svelte";
 
diff --git a/ts/editable/tsconfig.json b/ts/editable/tsconfig.json
new file mode 100644
index 000000000..a3fb6b2dc
--- /dev/null
+++ b/ts/editable/tsconfig.json
@@ -0,0 +1,9 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [
+        { "path": "../components" },
+        { "path": "../lib" },
+        { "path": "../sveltelib" }
+    ]
+}
diff --git a/ts/editor/AddTagBadge.svelte b/ts/editor/AddTagBadge.svelte
index 882eeb2ef..fe54aaa15 100644
--- a/ts/editor/AddTagBadge.svelte
+++ b/ts/editor/AddTagBadge.svelte
@@ -3,10 +3,10 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import WithShortcut from "components/WithShortcut.svelte";
-    import Badge from "components/Badge.svelte";
+    import WithShortcut from "../components/WithShortcut.svelte";
+    import Badge from "../components/Badge.svelte";
 
-    import { withSpan } from "components/helpers";
+    import { withSpan } from "../components/helpers";
     import { appendInParentheses } from "./helpers";
     import { tagIcon, addTagIcon } from "./icons";
 
diff --git a/ts/editor/AddTagBadge.svelte.d.ts b/ts/editor/AddTagBadge.svelte.d.ts
new file mode 120000
index 000000000..76f4e7a3b
--- /dev/null
+++ b/ts/editor/AddTagBadge.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/AddTagBadge.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/AddonButtons.svelte b/ts/editor/AddonButtons.svelte
index 337d4a6d0..3ce7b7dd8 100644
--- a/ts/editor/AddonButtons.svelte
+++ b/ts/editor/AddonButtons.svelte
@@ -3,8 +3,8 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
 
     export let buttons: string[];
 </script>
diff --git a/ts/editor/AddonButtons.svelte.d.ts b/ts/editor/AddonButtons.svelte.d.ts
new file mode 120000
index 000000000..481d4ffd2
--- /dev/null
+++ b/ts/editor/AddonButtons.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/AddonButtons.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/AutocompleteItem.svelte b/ts/editor/AutocompleteItem.svelte
index 271447325..8e44b1b2c 100644
--- a/ts/editor/AutocompleteItem.svelte
+++ b/ts/editor/AutocompleteItem.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import { onMount, createEventDispatcher, getContext } from "svelte";
-    import { nightModeKey } from "components/context-keys";
+    import { nightModeKey } from "../components/context-keys";
 
     export let id: string | undefined = undefined;
     let className = "";
diff --git a/ts/editor/AutocompleteItem.svelte.d.ts b/ts/editor/AutocompleteItem.svelte.d.ts
new file mode 120000
index 000000000..0d3672f18
--- /dev/null
+++ b/ts/editor/AutocompleteItem.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/AutocompleteItem.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/BUILD.bazel b/ts/editor/BUILD.bazel
index 1b49fdefe..b25d2a48f 100644
--- a/ts/editor/BUILD.bazel
+++ b/ts/editor/BUILD.bazel
@@ -1,31 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//ts/svelte:svelte.bzl", "compile_svelte", "svelte_check")
 load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
 load("//ts:esbuild.bzl", "esbuild")
-load("//ts:vendor.bzl", "copy_bootstrap_icons", "copy_mdi_icons")
+load("//ts:vendor.bzl", "copy_bootstrap_icons")
 load("//ts:compile_sass.bzl", "compile_sass")
-
-svelte_files = glob(["*.svelte"])
-
-svelte_names = [f.replace(".svelte", "") for f in svelte_files]
-
-filegroup(
-    name = "svelte_components",
-    srcs = svelte_names,
-    visibility = ["//visibility:public"],
-)
-
-compile_svelte(
-    name = "svelte",
-    srcs = svelte_files,
-    visibility = ["//visibility:public"],
-    deps = [
-        "//ts/components",
-        "@npm//@types/codemirror",
-        "@npm//codemirror",
-    ],
-)
+load("//ts:typescript.bzl", "typescript")
 
 compile_sass(
     srcs = [
@@ -35,9 +14,9 @@ compile_sass(
     visibility = ["//visibility:public"],
     deps = [
         "//ts/sass:base_lib",
-        "//ts/sass:scrollbar_lib",
-        "//ts/sass:buttons_lib",
         "//ts/sass:button_mixins_lib",
+        "//ts/sass:buttons_lib",
+        "//ts/sass:scrollbar_lib",
     ],
 )
 
@@ -54,109 +33,42 @@ compile_sass(
     ],
 )
 
-ts_library(
+compile_svelte()
+
+typescript(
     name = "editor_ts",
-    srcs = glob(["*.ts"]),
-    tsconfig = "//ts:tsconfig.json",
+    srcs = glob(
+        ["*.ts"],
+        exclude = ["*.svelte.d.ts"],
+    ),
     deps = [
-        "//ts/lib",
-        "//ts/sveltelib",
+        ":svelte",
         "//ts/components",
         "//ts/editable",
         "//ts/html-filter",
-        "//ts:image_module_support",
-        "@npm//svelte",
+        "//ts/lib",
+        "//ts/sveltelib",
+        "@npm//@fluent",
         "@npm//@types/codemirror",
         "@npm//codemirror",
-    ] + svelte_names,
-)
-
-copy_bootstrap_icons(
-    name = "bootstrap-icons",
-    icons = [
-        "pin-angle.svg",
-
-        # inline formatting
-        "type-bold.svg",
-        "type-italic.svg",
-        "type-underline.svg",
-        "eraser.svg",
-        "square-fill.svg",
-        "paperclip.svg",
-        "mic.svg",
-
-        # block formatting
-        "list-ul.svg",
-        "list-ol.svg",
-        "text-paragraph.svg",
-        "justify.svg",
-        "text-left.svg",
-        "text-right.svg",
-        "text-center.svg",
-        "text-indent-left.svg",
-        "text-indent-right.svg",
-
-        # tag editor
-        "x.svg",
+        "@npm//svelte",
     ],
-    visibility = ["//visibility:public"],
-)
-
-copy_mdi_icons(
-    name = "mdi-icons",
-    icons = [
-        "format-superscript.svg",
-        "format-subscript.svg",
-        "function-variant.svg",
-        "contain.svg",
-        "xml.svg",
-        "format-color-text.svg",
-        "format-color-highlight.svg",
-        "color-helper.svg",
-
-        # image handle
-        "format-float-none.svg",
-        "format-float-left.svg",
-        "format-float-right.svg",
-
-        "image-size-select-large.svg",
-        "image-size-select-actual.svg",
-
-        # mathjax handle
-        "format-wrap-square.svg",
-        "format-wrap-top-bottom.svg",
-
-        # tag editor
-        "tag-outline.svg",
-        "tag.svg",
-        "tag-plus.svg",
-        "dots-vertical.svg",
-    ],
-    visibility = ["//visibility:public"],
 )
 
 esbuild(
     name = "editor",
-    args = [
-        "--loader:.svg=text",
-        "--resolve-extensions=.mjs,.js",
-        "--log-level=warning",
-    ],
+    args = {
+        "loader": {".svg": "text"},
+    },
     entry_point = "index_wrapper.ts",
     output_css = "editor.css",
     visibility = ["//visibility:public"],
     deps = [
-        "editor_ts",
-        "base_css",
-        "local_css",
-        "bootstrap-icons",
-        "mdi-icons",
-        "svelte_components",
-        "//ts/editable",
-        "//ts/editable:mdi-icons",
-        "//ts/components",
-        "//ts/components:svelte_components",
-        "//ts/editable:svelte_components",
+        ":base_css",
+        ":editor_ts",
+        ":local_css",
+        "@npm//@mdi",
+        "@npm//bootstrap-icons",
         "@npm//protobufjs",
     ],
 )
@@ -164,22 +76,9 @@ esbuild(
 # Tests
 ################
 
-prettier_test(
-    name = "format_check",
-    srcs = glob([
-        "*.ts",
-        "*.svelte",
-    ]),
-)
+prettier_test()
 
-eslint_test(
-    name = "eslint",
-    srcs = glob(
-        [
-            "*.ts",
-        ],
-    ),
-)
+eslint_test()
 
 svelte_check(
     name = "svelte_check",
diff --git a/ts/editor/ClozeButton.svelte b/ts/editor/ClozeButton.svelte
index 2068b8930..4c375eb26 100644
--- a/ts/editor/ClozeButton.svelte
+++ b/ts/editor/ClozeButton.svelte
@@ -3,13 +3,13 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
 
-    import IconButton from "components/IconButton.svelte";
-    import WithShortcut from "components/WithShortcut.svelte";
+    import IconButton from "../components/IconButton.svelte";
+    import WithShortcut from "../components/WithShortcut.svelte";
     import OnlyEditable from "./OnlyEditable.svelte";
 
-    import { withButton } from "components/helpers";
+    import { withButton } from "../components/helpers";
     import { ellipseIcon } from "./icons";
     import { forEditorField } from ".";
     import { wrapCurrent } from "./wrap";
diff --git a/ts/editor/ClozeButton.svelte.d.ts b/ts/editor/ClozeButton.svelte.d.ts
new file mode 120000
index 000000000..748b2775b
--- /dev/null
+++ b/ts/editor/ClozeButton.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/ClozeButton.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/ColorButtons.svelte b/ts/editor/ColorButtons.svelte
index 251fe078d..10a90c954 100644
--- a/ts/editor/ColorButtons.svelte
+++ b/ts/editor/ColorButtons.svelte
@@ -3,18 +3,18 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
 
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
-    import IconButton from "components/IconButton.svelte";
-    import ColorPicker from "components/ColorPicker.svelte";
-    import WithShortcut from "components/WithShortcut.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
+    import IconButton from "../components/IconButton.svelte";
+    import ColorPicker from "../components/ColorPicker.svelte";
+    import WithShortcut from "../components/WithShortcut.svelte";
     import WithColorHelper from "./WithColorHelper.svelte";
     import OnlyEditable from "./OnlyEditable.svelte";
 
-    import { bridgeCommand } from "lib/bridgecommand";
-    import { withButton } from "components/helpers";
+    import { bridgeCommand } from "../lib/bridgecommand";
+    import { withButton } from "../components/helpers";
     import { textColorIcon, highlightColorIcon, arrowIcon } from "./icons";
     import { appendInParentheses, execCommand } from "./helpers";
 
diff --git a/ts/editor/ColorButtons.svelte.d.ts b/ts/editor/ColorButtons.svelte.d.ts
new file mode 120000
index 000000000..5f981b969
--- /dev/null
+++ b/ts/editor/ColorButtons.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/ColorButtons.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/CommandIconButton.svelte b/ts/editor/CommandIconButton.svelte
index 26adb8688..a62ed4cbb 100644
--- a/ts/editor/CommandIconButton.svelte
+++ b/ts/editor/CommandIconButton.svelte
@@ -3,12 +3,12 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import IconButton from "components/IconButton.svelte";
-    import WithShortcut from "components/WithShortcut.svelte";
-    import WithState from "components/WithState.svelte";
+    import IconButton from "../components/IconButton.svelte";
+    import WithShortcut from "../components/WithShortcut.svelte";
+    import WithState from "../components/WithState.svelte";
     import OnlyEditable from "./OnlyEditable.svelte";
 
-    import { withButton } from "components/helpers";
+    import { withButton } from "../components/helpers";
     import { appendInParentheses, execCommand, queryCommandState } from "./helpers";
 
     export let key: string;
diff --git a/ts/editor/CommandIconButton.svelte.d.ts b/ts/editor/CommandIconButton.svelte.d.ts
new file mode 120000
index 000000000..737fd5ce1
--- /dev/null
+++ b/ts/editor/CommandIconButton.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/CommandIconButton.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/Components.svelte b/ts/editor/Components.svelte
index c324f1255..7e49b3102 100644
--- a/ts/editor/Components.svelte
+++ b/ts/editor/Components.svelte
@@ -3,13 +3,13 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script context="module" lang="typescript">
-    import IconButton from "components/IconButton.svelte";
-    import LabelButton from "components/LabelButton.svelte";
-    import WithShortcut from "components/WithShortcut.svelte";
-    import WithContext from "components/WithContext.svelte";
-    import WithState from "components/WithState.svelte";
+    import IconButton from "../components/IconButton.svelte";
+    import LabelButton from "../components/LabelButton.svelte";
+    import WithShortcut from "../components/WithShortcut.svelte";
+    import WithContext from "../components/WithContext.svelte";
+    import WithState from "../components/WithState.svelte";
 
-    import * as contextKeys from "components/context-keys";
+    import * as contextKeys from "../components/context-keys";
     import * as editorContextKeys from "./context-keys";
 
     export const components = {
diff --git a/ts/editor/Components.svelte.d.ts b/ts/editor/Components.svelte.d.ts
new file mode 120000
index 000000000..5a1f0b23d
--- /dev/null
+++ b/ts/editor/Components.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/Components.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/EditorToolbar.svelte b/ts/editor/EditorToolbar.svelte
index 8c11dd230..b6ea95035 100644
--- a/ts/editor/EditorToolbar.svelte
+++ b/ts/editor/EditorToolbar.svelte
@@ -4,8 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script context="module" lang="typescript">
     import "./legacy.css";
-    // @ts-expect-error Insufficient typing
-    import { updateAllState, resetAllState } from "components/WithState.svelte";
+    import { updateAllState, resetAllState } from "../components/WithState.svelte";
 
     export function updateActiveButtons(event: Event) {
         updateAllState(event);
@@ -26,10 +25,10 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </script>
 
 <script lang="typescript">
-    import { isApplePlatform } from "lib/platform";
-    import StickyHeader from "components/StickyHeader.svelte";
-    import ButtonToolbar from "components/ButtonToolbar.svelte";
-    import Item from "components/Item.svelte";
+    import { isApplePlatform } from "../lib/platform";
+    import StickyHeader from "../components/StickyHeader.svelte";
+    import ButtonToolbar from "../components/ButtonToolbar.svelte";
+    import Item from "../components/Item.svelte";
 
     import NoteTypeButtons from "./NoteTypeButtons.svelte";
     import FormatInlineButtons from "./FormatInlineButtons.svelte";
diff --git a/ts/editor/EditorToolbar.svelte.d.ts b/ts/editor/EditorToolbar.svelte.d.ts
new file mode 120000
index 000000000..05ab569c2
--- /dev/null
+++ b/ts/editor/EditorToolbar.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/EditorToolbar.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/FormatBlockButtons.svelte b/ts/editor/FormatBlockButtons.svelte
index b8f08b7c7..5edfa3f43 100644
--- a/ts/editor/FormatBlockButtons.svelte
+++ b/ts/editor/FormatBlockButtons.svelte
@@ -3,18 +3,18 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
 
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
-    import IconButton from "components/IconButton.svelte";
-    import ButtonDropdown from "components/ButtonDropdown.svelte";
-    import Item from "components/Item.svelte";
-    import WithDropdown from "components/WithDropdown.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
+    import IconButton from "../components/IconButton.svelte";
+    import ButtonDropdown from "../components/ButtonDropdown.svelte";
+    import Item from "../components/Item.svelte";
+    import WithDropdown from "../components/WithDropdown.svelte";
     import OnlyEditable from "./OnlyEditable.svelte";
     import CommandIconButton from "./CommandIconButton.svelte";
 
-    import { getListItem } from "lib/dom";
+    import { getListItem } from "../lib/dom";
     import { getCurrentField, execCommand } from "./helpers";
     import {
         ulIcon,
diff --git a/ts/editor/FormatBlockButtons.svelte.d.ts b/ts/editor/FormatBlockButtons.svelte.d.ts
new file mode 120000
index 000000000..4bd09e3e1
--- /dev/null
+++ b/ts/editor/FormatBlockButtons.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/FormatBlockButtons.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/FormatInlineButtons.svelte b/ts/editor/FormatInlineButtons.svelte
index 47032b74e..fd78805b9 100644
--- a/ts/editor/FormatInlineButtons.svelte
+++ b/ts/editor/FormatInlineButtons.svelte
@@ -3,10 +3,10 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
 
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
     import CommandIconButton from "./CommandIconButton.svelte";
 
     import {
diff --git a/ts/editor/FormatInlineButtons.svelte.d.ts b/ts/editor/FormatInlineButtons.svelte.d.ts
new file mode 120000
index 000000000..2341ab480
--- /dev/null
+++ b/ts/editor/FormatInlineButtons.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/FormatInlineButtons.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/HandleBackground.svelte.d.ts b/ts/editor/HandleBackground.svelte.d.ts
new file mode 120000
index 000000000..34a02f0b2
--- /dev/null
+++ b/ts/editor/HandleBackground.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/HandleBackground.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/HandleControl.svelte b/ts/editor/HandleControl.svelte
index 6e8f0e429..eace458ac 100644
--- a/ts/editor/HandleControl.svelte
+++ b/ts/editor/HandleControl.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import { createEventDispatcher, getContext } from "svelte";
-    import { nightModeKey } from "components/context-keys";
+    import { nightModeKey } from "../components/context-keys";
 
     export let offsetX = 0;
     export let offsetY = 0;
diff --git a/ts/editor/HandleControl.svelte.d.ts b/ts/editor/HandleControl.svelte.d.ts
new file mode 120000
index 000000000..ee2e304d3
--- /dev/null
+++ b/ts/editor/HandleControl.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/HandleControl.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/HandleLabel.svelte.d.ts b/ts/editor/HandleLabel.svelte.d.ts
new file mode 120000
index 000000000..0170ad6bb
--- /dev/null
+++ b/ts/editor/HandleLabel.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/HandleLabel.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/HandleSelection.svelte.d.ts b/ts/editor/HandleSelection.svelte.d.ts
new file mode 120000
index 000000000..a179d4750
--- /dev/null
+++ b/ts/editor/HandleSelection.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/HandleSelection.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/ImageHandle.svelte b/ts/editor/ImageHandle.svelte
index 5f3528945..e9178d8ce 100644
--- a/ts/editor/ImageHandle.svelte
+++ b/ts/editor/ImageHandle.svelte
@@ -3,9 +3,9 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import WithDropdown from "components/WithDropdown.svelte";
-    import ButtonDropdown from "components/ButtonDropdown.svelte";
-    import Item from "components/Item.svelte";
+    import WithDropdown from "../components/WithDropdown.svelte";
+    import ButtonDropdown from "../components/ButtonDropdown.svelte";
+    import Item from "../components/Item.svelte";
 
     import WithImageConstrained from "./WithImageConstrained.svelte";
     import HandleBackground from "./HandleBackground.svelte";
diff --git a/ts/editor/ImageHandle.svelte.d.ts b/ts/editor/ImageHandle.svelte.d.ts
new file mode 120000
index 000000000..3946211c8
--- /dev/null
+++ b/ts/editor/ImageHandle.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/ImageHandle.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/ImageHandleFloatButtons.svelte b/ts/editor/ImageHandleFloatButtons.svelte
index 4936a2df3..3778d364a 100644
--- a/ts/editor/ImageHandleFloatButtons.svelte
+++ b/ts/editor/ImageHandleFloatButtons.svelte
@@ -3,11 +3,11 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
 
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
-    import IconButton from "components/IconButton.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
+    import IconButton from "../components/IconButton.svelte";
 
     import { createEventDispatcher } from "svelte";
     import { floatNoneIcon, floatLeftIcon, floatRightIcon } from "./icons";
diff --git a/ts/editor/ImageHandleFloatButtons.svelte.d.ts b/ts/editor/ImageHandleFloatButtons.svelte.d.ts
new file mode 120000
index 000000000..9d1799898
--- /dev/null
+++ b/ts/editor/ImageHandleFloatButtons.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/ImageHandleFloatButtons.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/ImageHandleSizeSelect.svelte b/ts/editor/ImageHandleSizeSelect.svelte
index bed0d71b2..1c32223db 100644
--- a/ts/editor/ImageHandleSizeSelect.svelte
+++ b/ts/editor/ImageHandleSizeSelect.svelte
@@ -3,11 +3,11 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
 
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
-    import IconButton from "components/IconButton.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
+    import IconButton from "../components/IconButton.svelte";
 
     import { sizeActual, sizeMinimized } from "./icons";
 
diff --git a/ts/editor/ImageHandleSizeSelect.svelte.d.ts b/ts/editor/ImageHandleSizeSelect.svelte.d.ts
new file mode 120000
index 000000000..2d31e8493
--- /dev/null
+++ b/ts/editor/ImageHandleSizeSelect.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/ImageHandleSizeSelect.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/MathjaxHandle.svelte b/ts/editor/MathjaxHandle.svelte
index 65ebaabba..974d2dab8 100644
--- a/ts/editor/MathjaxHandle.svelte
+++ b/ts/editor/MathjaxHandle.svelte
@@ -3,10 +3,10 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
-    import WithDropdown from "components/WithDropdown.svelte";
-    import ButtonToolbar from "components/ButtonToolbar.svelte";
-    import DropdownMenu from "components/DropdownMenu.svelte";
-    import Item from "components/Item.svelte";
+    import WithDropdown from "../components/WithDropdown.svelte";
+    import ButtonToolbar from "../components/ButtonToolbar.svelte";
+    import DropdownMenu from "../components/DropdownMenu.svelte";
+    import Item from "../components/Item.svelte";
 
     import HandleSelection from "./HandleSelection.svelte";
     import HandleBackground from "./HandleBackground.svelte";
diff --git a/ts/editor/MathjaxHandle.svelte.d.ts b/ts/editor/MathjaxHandle.svelte.d.ts
new file mode 120000
index 000000000..a917168f6
--- /dev/null
+++ b/ts/editor/MathjaxHandle.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/MathjaxHandle.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/MathjaxHandleEditor.svelte.d.ts b/ts/editor/MathjaxHandleEditor.svelte.d.ts
new file mode 120000
index 000000000..13e718334
--- /dev/null
+++ b/ts/editor/MathjaxHandleEditor.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/MathjaxHandleEditor.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/MathjaxHandleInlineBlock.svelte b/ts/editor/MathjaxHandleInlineBlock.svelte
index c488c95f9..0dac7cf79 100644
--- a/ts/editor/MathjaxHandleInlineBlock.svelte
+++ b/ts/editor/MathjaxHandleInlineBlock.svelte
@@ -3,11 +3,11 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
 
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
-    import IconButton from "components/IconButton.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
+    import IconButton from "../components/IconButton.svelte";
 
     import { inlineIcon, blockIcon } from "./icons";
 
diff --git a/ts/editor/MathjaxHandleInlineBlock.svelte.d.ts b/ts/editor/MathjaxHandleInlineBlock.svelte.d.ts
new file mode 120000
index 000000000..2eda15581
--- /dev/null
+++ b/ts/editor/MathjaxHandleInlineBlock.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/MathjaxHandleInlineBlock.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/NoteTypeButtons.svelte b/ts/editor/NoteTypeButtons.svelte
index 04a5d1cbb..1bb7c976a 100644
--- a/ts/editor/NoteTypeButtons.svelte
+++ b/ts/editor/NoteTypeButtons.svelte
@@ -3,14 +3,14 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import { bridgeCommand } from "lib/bridgecommand";
-    import * as tr from "lib/i18n";
-    import { withButton } from "components/helpers";
+    import { bridgeCommand } from "../lib/bridgecommand";
+    import * as tr from "../lib/i18n";
+    import { withButton } from "../components/helpers";
 
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
-    import LabelButton from "components/LabelButton.svelte";
-    import WithShortcut from "components/WithShortcut.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
+    import LabelButton from "../components/LabelButton.svelte";
+    import WithShortcut from "../components/WithShortcut.svelte";
 
     export let api = {};
 </script>
diff --git a/ts/editor/NoteTypeButtons.svelte.d.ts b/ts/editor/NoteTypeButtons.svelte.d.ts
new file mode 120000
index 000000000..6e46f0f8e
--- /dev/null
+++ b/ts/editor/NoteTypeButtons.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/NoteTypeButtons.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/OnlyEditable.svelte b/ts/editor/OnlyEditable.svelte
index 25d08beb7..f4d6024e1 100644
--- a/ts/editor/OnlyEditable.svelte
+++ b/ts/editor/OnlyEditable.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import WithContext from "components/WithContext.svelte";
+    import WithContext from "../components/WithContext.svelte";
     import { fieldFocusedKey, inCodableKey } from "./context-keys";
 </script>
 
diff --git a/ts/editor/OnlyEditable.svelte.d.ts b/ts/editor/OnlyEditable.svelte.d.ts
new file mode 120000
index 000000000..40521853e
--- /dev/null
+++ b/ts/editor/OnlyEditable.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/OnlyEditable.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/PreviewButton.svelte b/ts/editor/PreviewButton.svelte
index ee3504817..443802722 100644
--- a/ts/editor/PreviewButton.svelte
+++ b/ts/editor/PreviewButton.svelte
@@ -3,12 +3,12 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import { bridgeCommand } from "lib/bridgecommand";
-    import * as tr from "lib/i18n";
-    import { withButton } from "components/helpers";
+    import { bridgeCommand } from "../lib/bridgecommand";
+    import * as tr from "../lib/i18n";
+    import { withButton } from "../components/helpers";
 
-    import WithShortcut from "components/WithShortcut.svelte";
-    import LabelButton from "components/LabelButton.svelte";
+    import WithShortcut from "../components/WithShortcut.svelte";
+    import LabelButton from "../components/LabelButton.svelte";
 </script>
 
 <WithShortcut shortcut={"Control+Shift+P"} let:createShortcut let:shortcutLabel>
diff --git a/ts/editor/PreviewButton.svelte.d.ts b/ts/editor/PreviewButton.svelte.d.ts
new file mode 120000
index 000000000..221fdff22
--- /dev/null
+++ b/ts/editor/PreviewButton.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/PreviewButton.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/SelectedTagBadge.svelte b/ts/editor/SelectedTagBadge.svelte
index cd989cd29..24bdbeb99 100644
--- a/ts/editor/SelectedTagBadge.svelte
+++ b/ts/editor/SelectedTagBadge.svelte
@@ -5,13 +5,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="ts">
     import { createEventDispatcher } from "svelte";
 
-    import Badge from "components/Badge.svelte";
-    import WithDropdown from "components/WithDropdown.svelte";
-    import WithShortcut from "components/WithShortcut.svelte";
-    import DropdownMenu from "components/DropdownMenu.svelte";
-    import DropdownItem from "components/DropdownItem.svelte";
+    import Badge from "../components/Badge.svelte";
+    import WithDropdown from "../components/WithDropdown.svelte";
+    import WithShortcut from "../components/WithShortcut.svelte";
+    import DropdownMenu from "../components/DropdownMenu.svelte";
+    import DropdownItem from "../components/DropdownItem.svelte";
 
-    import { withSpan, withButton } from "components/helpers";
+    import { withSpan, withButton } from "../components/helpers";
     import { appendInParentheses } from "./helpers";
     import { dotsIcon } from "./icons";
 
diff --git a/ts/editor/SelectedTagBadge.svelte.d.ts b/ts/editor/SelectedTagBadge.svelte.d.ts
new file mode 120000
index 000000000..631e5a0b8
--- /dev/null
+++ b/ts/editor/SelectedTagBadge.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/SelectedTagBadge.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/Tag.svelte b/ts/editor/Tag.svelte
index 7e3366992..1f2c69fe4 100644
--- a/ts/editor/Tag.svelte
+++ b/ts/editor/Tag.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import { onMount, getContext, createEventDispatcher } from "svelte";
-    import { nightModeKey } from "components/context-keys";
+    import { nightModeKey } from "../components/context-keys";
 
     let className: string = "";
     export { className as class };
diff --git a/ts/editor/Tag.svelte.d.ts b/ts/editor/Tag.svelte.d.ts
new file mode 120000
index 000000000..94a855d3c
--- /dev/null
+++ b/ts/editor/Tag.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/Tag.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/TagDeleteBadge.svelte b/ts/editor/TagDeleteBadge.svelte
index fe718fbaf..e44db1238 100644
--- a/ts/editor/TagDeleteBadge.svelte
+++ b/ts/editor/TagDeleteBadge.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import Badge from "components/Badge.svelte";
+    import Badge from "../components/Badge.svelte";
     import { deleteIcon } from "./icons";
 
     let className: string = "";
diff --git a/ts/editor/TagDeleteBadge.svelte.d.ts b/ts/editor/TagDeleteBadge.svelte.d.ts
new file mode 120000
index 000000000..821af83d6
--- /dev/null
+++ b/ts/editor/TagDeleteBadge.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/TagDeleteBadge.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/TagEditMode.svelte.d.ts b/ts/editor/TagEditMode.svelte.d.ts
new file mode 120000
index 000000000..1792403e6
--- /dev/null
+++ b/ts/editor/TagEditMode.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/TagEditMode.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/TagEditor.svelte b/ts/editor/TagEditor.svelte
index 05b046a14..350f695fb 100644
--- a/ts/editor/TagEditor.svelte
+++ b/ts/editor/TagEditor.svelte
@@ -4,15 +4,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import { tick } from "svelte";
-    import { isApplePlatform } from "lib/platform";
-    import { bridgeCommand } from "lib/bridgecommand";
-    import StickyFooter from "components/StickyFooter.svelte";
+    import { isApplePlatform } from "../lib/platform";
+    import { bridgeCommand } from "../lib/bridgecommand";
+    import StickyFooter from "../components/StickyFooter.svelte";
     import TagOptionsBadge from "./TagOptionsBadge.svelte";
     import TagEditMode from "./TagEditMode.svelte";
     import TagInput from "./TagInput.svelte";
     import Tag from "./Tag.svelte";
     import WithAutocomplete from "./WithAutocomplete.svelte";
-    import ButtonToolbar from "components/ButtonToolbar.svelte";
+    import ButtonToolbar from "../components/ButtonToolbar.svelte";
     import type { Tag as TagType } from "./tags";
     import {
         attachId,
@@ -20,8 +20,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         replaceWithUnicodeSeparator,
         replaceWithColons,
     } from "./tags";
-    import { Tags } from "lib/proto";
-    import { postRequest } from "lib/postrequest";
+    import { Tags } from "../lib/proto";
+    import { postRequest } from "../lib/postrequest";
     import { execCommand } from "./helpers";
 
     export let tags: TagType[] = [];
diff --git a/ts/editor/TagEditor.svelte.d.ts b/ts/editor/TagEditor.svelte.d.ts
new file mode 120000
index 000000000..d0dce4ceb
--- /dev/null
+++ b/ts/editor/TagEditor.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/TagEditor.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/TagInput.svelte.d.ts b/ts/editor/TagInput.svelte.d.ts
new file mode 120000
index 000000000..758ed6c74
--- /dev/null
+++ b/ts/editor/TagInput.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/TagInput.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/TagOptionsBadge.svelte.d.ts b/ts/editor/TagOptionsBadge.svelte.d.ts
new file mode 120000
index 000000000..1255a57a5
--- /dev/null
+++ b/ts/editor/TagOptionsBadge.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/TagOptionsBadge.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/TagWithTooltip.svelte b/ts/editor/TagWithTooltip.svelte
index af992654f..3e20da4a6 100644
--- a/ts/editor/TagWithTooltip.svelte
+++ b/ts/editor/TagWithTooltip.svelte
@@ -4,11 +4,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import Tag from "./Tag.svelte";
-    import WithTooltip from "components/WithTooltip.svelte";
+    import WithTooltip from "../components/WithTooltip.svelte";
 
     import { createEventDispatcher, getContext } from "svelte";
-    import { nightModeKey } from "components/context-keys";
-    import { controlPressed, shiftPressed } from "lib/keys";
+    import { nightModeKey } from "../components/context-keys";
+    import { controlPressed, shiftPressed } from "../lib/keys";
     import { delimChar } from "./tags";
 
     export let name: string;
diff --git a/ts/editor/TagWithTooltip.svelte.d.ts b/ts/editor/TagWithTooltip.svelte.d.ts
new file mode 120000
index 000000000..33a8fb045
--- /dev/null
+++ b/ts/editor/TagWithTooltip.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/TagWithTooltip.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/TemplateButtons.svelte b/ts/editor/TemplateButtons.svelte
index 66bbcb2d1..f116e0684 100644
--- a/ts/editor/TemplateButtons.svelte
+++ b/ts/editor/TemplateButtons.svelte
@@ -3,23 +3,23 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import * as tr from "lib/i18n";
-    import { bridgeCommand } from "lib/bridgecommand";
+    import * as tr from "../lib/i18n";
+    import { bridgeCommand } from "../lib/bridgecommand";
     import { fieldFocusedKey, inCodableKey } from "./context-keys";
 
-    import ButtonGroup from "components/ButtonGroup.svelte";
-    import ButtonGroupItem from "components/ButtonGroupItem.svelte";
-    import IconButton from "components/IconButton.svelte";
-    import DropdownMenu from "components/DropdownMenu.svelte";
-    import DropdownItem from "components/DropdownItem.svelte";
-    import WithDropdown from "components/WithDropdown.svelte";
-    import WithShortcut from "components/WithShortcut.svelte";
-    import WithContext from "components/WithContext.svelte";
+    import ButtonGroup from "../components/ButtonGroup.svelte";
+    import ButtonGroupItem from "../components/ButtonGroupItem.svelte";
+    import IconButton from "../components/IconButton.svelte";
+    import DropdownMenu from "../components/DropdownMenu.svelte";
+    import DropdownItem from "../components/DropdownItem.svelte";
+    import WithDropdown from "../components/WithDropdown.svelte";
+    import WithShortcut from "../components/WithShortcut.svelte";
+    import WithContext from "../components/WithContext.svelte";
     import OnlyEditable from "./OnlyEditable.svelte";
     import ClozeButton from "./ClozeButton.svelte";
 
     import { getCurrentField, appendInParentheses } from "./helpers";
-    import { withButton } from "components/helpers";
+    import { withButton } from "../components/helpers";
     import { wrapCurrent } from "./wrap";
     import { paperclipIcon, micIcon, functionIcon, xmlIcon } from "./icons";
 
diff --git a/ts/editor/TemplateButtons.svelte.d.ts b/ts/editor/TemplateButtons.svelte.d.ts
new file mode 120000
index 000000000..6a7f4de70
--- /dev/null
+++ b/ts/editor/TemplateButtons.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/TemplateButtons.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/WithAutocomplete.svelte b/ts/editor/WithAutocomplete.svelte
index e7c793448..248a9ed9f 100644
--- a/ts/editor/WithAutocomplete.svelte
+++ b/ts/editor/WithAutocomplete.svelte
@@ -7,8 +7,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     import type Dropdown from "bootstrap/js/dist/dropdown";
 
-    import WithDropdown from "components/WithDropdown.svelte";
-    import DropdownMenu from "components/DropdownMenu.svelte";
+    import WithDropdown from "../components/WithDropdown.svelte";
+    import DropdownMenu from "../components/DropdownMenu.svelte";
     import AutocompleteItem from "./AutocompleteItem.svelte";
 
     let className: string = "";
diff --git a/ts/editor/WithAutocomplete.svelte.d.ts b/ts/editor/WithAutocomplete.svelte.d.ts
new file mode 120000
index 000000000..d6e57571c
--- /dev/null
+++ b/ts/editor/WithAutocomplete.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/WithAutocomplete.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/WithColorHelper.svelte.d.ts b/ts/editor/WithColorHelper.svelte.d.ts
new file mode 120000
index 000000000..cdedb8abd
--- /dev/null
+++ b/ts/editor/WithColorHelper.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/WithColorHelper.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/WithImageConstrained.svelte b/ts/editor/WithImageConstrained.svelte
index 038c4712a..4b29b3e5d 100644
--- a/ts/editor/WithImageConstrained.svelte
+++ b/ts/editor/WithImageConstrained.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import { createEventDispatcher, onDestroy } from "svelte";
-    import { nodeIsElement } from "lib/dom";
+    import { nodeIsElement } from "../lib/dom";
 
     export let activeImage: HTMLImageElement | null;
     export let container: HTMLElement;
diff --git a/ts/editor/WithImageConstrained.svelte.d.ts b/ts/editor/WithImageConstrained.svelte.d.ts
new file mode 120000
index 000000000..692a68329
--- /dev/null
+++ b/ts/editor/WithImageConstrained.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/editor/WithImageConstrained.svelte.d.ts
\ No newline at end of file
diff --git a/ts/editor/editing-area.ts b/ts/editor/editing-area.ts
index 127963c2c..332c4c94b 100644
--- a/ts/editor/editing-area.ts
+++ b/ts/editor/editing-area.ts
@@ -1,6 +1,8 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
+/// <reference types="../lib/shadow-dom" />
+
 /* eslint
 @typescript-eslint/no-non-null-assertion: "off",
 @typescript-eslint/no-explicit-any: "off",
@@ -9,16 +11,16 @@
 import ImageHandle from "./ImageHandle.svelte";
 import MathjaxHandle from "./MathjaxHandle.svelte";
 
-import type { EditableContainer } from "editable/editable-container";
-import type { Editable } from "editable/editable";
+import type { EditableContainer } from "../editable/editable-container";
+import type { Editable } from "../editable/editable";
 import type { Codable } from "./codable";
 
 import { updateActiveButtons } from "./toolbar";
 import { bridgeCommand } from "./lib";
 import { onInput, onKey, onKeyUp } from "./input-handlers";
 import { deferFocusDown, saveFieldIfFieldChanged } from "./focus-handlers";
-import { nightModeKey } from "components/context-keys";
-import { decoratedComponents } from "editable/decorated";
+import { nightModeKey } from "../components/context-keys";
+import { decoratedComponents } from "../editable/decorated";
 
 function onCutOrCopy(): void {
     bridgeCommand("cutOrCopy");
diff --git a/ts/editor/icons.ts b/ts/editor/icons.ts
index a29daecd6..0abdc3240 100644
--- a/ts/editor/icons.ts
+++ b/ts/editor/icons.ts
@@ -1,51 +1,53 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-export { default as boldIcon } from "./type-bold.svg";
-export { default as italicIcon } from "./type-italic.svg";
-export { default as underlineIcon } from "./type-underline.svg";
-export { default as superscriptIcon } from "./format-superscript.svg";
-export { default as subscriptIcon } from "./format-subscript.svg";
-export { default as eraserIcon } from "./eraser.svg";
+/// <reference types="../lib/image-import" />
 
-export { default as ulIcon } from "./list-ul.svg";
-export { default as olIcon } from "./list-ol.svg";
-export { default as listOptionsIcon } from "./text-paragraph.svg";
+export { default as boldIcon } from "bootstrap-icons/icons/type-bold.svg";
+export { default as italicIcon } from "bootstrap-icons/icons/type-italic.svg";
+export { default as underlineIcon } from "bootstrap-icons/icons/type-underline.svg";
+export { default as superscriptIcon } from "@mdi/svg/svg/format-superscript.svg";
+export { default as subscriptIcon } from "@mdi/svg/svg/format-subscript.svg";
+export { default as eraserIcon } from "bootstrap-icons/icons/eraser.svg";
 
-export { default as justifyFullIcon } from "./justify.svg";
-export { default as justifyLeftIcon } from "./text-left.svg";
-export { default as justifyRightIcon } from "./text-right.svg";
-export { default as justifyCenterIcon } from "./text-center.svg";
+export { default as ulIcon } from "bootstrap-icons/icons/list-ul.svg";
+export { default as olIcon } from "bootstrap-icons/icons/list-ol.svg";
+export { default as listOptionsIcon } from "bootstrap-icons/icons/text-paragraph.svg";
 
-export { default as indentIcon } from "./text-indent-left.svg";
-export { default as outdentIcon } from "./text-indent-right.svg";
+export { default as justifyFullIcon } from "bootstrap-icons/icons/justify.svg";
+export { default as justifyLeftIcon } from "bootstrap-icons/icons/text-left.svg";
+export { default as justifyRightIcon } from "bootstrap-icons/icons/text-right.svg";
+export { default as justifyCenterIcon } from "bootstrap-icons/icons/text-center.svg";
 
-export { default as squareFillIcon } from "./square-fill.svg";
-export { default as textColorIcon } from "./format-color-text.svg";
-export { default as highlightColorIcon } from "./format-color-highlight.svg";
-export { default as colorHelperIcon } from "./color-helper.svg";
+export { default as indentIcon } from "bootstrap-icons/icons/text-indent-left.svg";
+export { default as outdentIcon } from "bootstrap-icons/icons/text-indent-right.svg";
 
-export { default as paperclipIcon } from "./paperclip.svg";
-export { default as micIcon } from "./mic.svg";
-export { default as ellipseIcon } from "./contain.svg";
-export { default as functionIcon } from "./function-variant.svg";
-export { default as xmlIcon } from "./xml.svg";
+export { default as squareFillIcon } from "bootstrap-icons/icons/square-fill.svg";
+export { default as textColorIcon } from "@mdi/svg/svg/format-color-text.svg";
+export { default as highlightColorIcon } from "@mdi/svg/svg/format-color-highlight.svg";
+export { default as colorHelperIcon } from "@mdi/svg/svg/color-helper.svg";
 
-export { default as tagIcon } from "./tag.svg";
-export { default as addTagIcon } from "./tag-plus.svg";
-export { default as dotsIcon } from "./dots-vertical.svg";
-export { default as deleteIcon } from "./x.svg";
+export { default as paperclipIcon } from "@mdi/svg/svg/paperclip.svg";
+export { default as micIcon } from "bootstrap-icons/icons/mic.svg";
+export { default as ellipseIcon } from "@mdi/svg/svg/contain.svg";
+export { default as functionIcon } from "@mdi/svg/svg/function-variant.svg";
+export { default as xmlIcon } from "@mdi/svg/svg/xml.svg";
+
+export { default as tagIcon } from "@mdi/svg/svg/tag.svg";
+export { default as addTagIcon } from "@mdi/svg/svg/tag-plus.svg";
+export { default as dotsIcon } from "@mdi/svg/svg/dots-vertical.svg";
+export { default as deleteIcon } from "bootstrap-icons/icons/x.svg";
 
 export const arrowIcon =
     '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="transparent" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2 5l6 6 6-6"/></svg>';
 
 // image handle
-export { default as floatNoneIcon } from "./format-float-none.svg";
-export { default as floatLeftIcon } from "./format-float-left.svg";
-export { default as floatRightIcon } from "./format-float-right.svg";
+export { default as floatNoneIcon } from "@mdi/svg/svg/format-float-none.svg";
+export { default as floatLeftIcon } from "@mdi/svg/svg/format-float-left.svg";
+export { default as floatRightIcon } from "@mdi/svg/svg/format-float-right.svg";
 
-export { default as sizeActual } from "./image-size-select-actual.svg";
-export { default as sizeMinimized } from "./image-size-select-large.svg";
+export { default as sizeActual } from "@mdi/svg/svg/image-size-select-actual.svg";
+export { default as sizeMinimized } from "@mdi/svg/svg/image-size-select-large.svg";
 
-export { default as inlineIcon } from "./format-wrap-square.svg";
-export { default as blockIcon } from "./format-wrap-top-bottom.svg";
+export { default as inlineIcon } from "@mdi/svg/svg/format-wrap-square.svg";
+export { default as blockIcon } from "@mdi/svg/svg/format-wrap-top-bottom.svg";
diff --git a/ts/editor/index.ts b/ts/editor/index.ts
index a8310406c..6101098ef 100644
--- a/ts/editor/index.ts
+++ b/ts/editor/index.ts
@@ -6,17 +6,17 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import "sveltelib/export-runtime";
-import "lib/register-package";
+import "../sveltelib/export-runtime";
+import "../lib/register-package";
 
 import type EditorToolbar from "./EditorToolbar.svelte";
 import type TagEditor from "./TagEditor.svelte";
 
-import { filterHTML } from "html-filter";
-import { setupI18n, ModuleName } from "lib/i18n";
-import { isApplePlatform } from "lib/platform";
-import { registerShortcut } from "lib/shortcuts";
-import { bridgeCommand } from "lib/bridgecommand";
+import { filterHTML } from "../html-filter";
+import { setupI18n, ModuleName } from "../lib/i18n";
+import { isApplePlatform } from "../lib/platform";
+import { registerShortcut } from "../lib/shortcuts";
+import { bridgeCommand } from "../lib/bridgecommand";
 import { updateActiveButtons } from "./toolbar";
 import { saveField } from "./saving";
 
@@ -27,9 +27,9 @@ import "./codable";
 import "./editor-field";
 import type { EditorField } from "./editor-field";
 import { EditingArea } from "./editing-area";
-import "editable/editable-container";
-import "editable/editable";
-import "editable/mathjax-component";
+import "../editable/editable-container";
+import "../editable/editable";
+import "../editable/mathjax-component";
 
 import { initToolbar, fieldFocused } from "./toolbar";
 import { initTagEditor } from "./tag-editor";
diff --git a/ts/editor/input-handlers.ts b/ts/editor/input-handlers.ts
index 55593fa62..43c09074e 100644
--- a/ts/editor/input-handlers.ts
+++ b/ts/editor/input-handlers.ts
@@ -5,11 +5,11 @@
 @typescript-eslint/no-non-null-assertion: "off",
  */
 
-import { nodeIsElement } from "lib/dom";
+import { nodeIsElement } from "../lib/dom";
 import { updateActiveButtons } from "./toolbar";
 import { EditingArea } from "./editing-area";
 import { triggerChangeTimer } from "./saving";
-import { registerShortcut } from "lib/shortcuts";
+import { registerShortcut } from "../lib/shortcuts";
 
 export function onInput(event: Event): void {
     // make sure IME changes get saved
diff --git a/ts/editor/label-container.ts b/ts/editor/label-container.ts
index 16613b1df..98afe9986 100644
--- a/ts/editor/label-container.ts
+++ b/ts/editor/label-container.ts
@@ -2,14 +2,14 @@
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 import type { EditorField } from "./editor-field";
-import * as tr from "lib/i18n";
+import * as tr from "../lib/i18n";
 
-import { registerShortcut } from "lib/shortcuts";
+import { registerShortcut } from "../lib/shortcuts";
 import { bridgeCommand } from "./lib";
 import { appendInParentheses } from "./helpers";
 import { saveField } from "./saving";
 import { getCurrentField, forEditorField, i18n } from ".";
-import pinIcon from "./pin-angle.svg";
+import pinIcon from "bootstrap-icons/icons/pin-angle.svg";
 
 function toggleStickyCurrentField(): void {
     const currentField = getCurrentField();
diff --git a/ts/editor/tag-editor.ts b/ts/editor/tag-editor.ts
index 6e71f09b0..3f65d27a0 100644
--- a/ts/editor/tag-editor.ts
+++ b/ts/editor/tag-editor.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { nightModeKey } from "components/context-keys";
+import { nightModeKey } from "../components/context-keys";
 
 import TagEditor from "./TagEditor.svelte";
 import "./bootstrap.css";
diff --git a/ts/editor/toolbar.ts b/ts/editor/toolbar.ts
index 3d3eafd32..15cd06781 100644
--- a/ts/editor/toolbar.ts
+++ b/ts/editor/toolbar.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { nightModeKey } from "components/context-keys";
+import { nightModeKey } from "../components/context-keys";
 import { fieldFocusedKey, inCodableKey } from "./context-keys";
 import { writable } from "svelte/store";
 
diff --git a/ts/editor/tsconfig.json b/ts/editor/tsconfig.json
new file mode 100644
index 000000000..28951ad86
--- /dev/null
+++ b/ts/editor/tsconfig.json
@@ -0,0 +1,11 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [
+        { "path": "../components" },
+        { "path": "../lib" },
+        { "path": "../sveltelib" },
+        { "path": "../editable" },
+        { "path": "../html-filter" }
+    ]
+}
diff --git a/ts/editor/wrap.ts b/ts/editor/wrap.ts
index 12a3f9f3b..905df6043 100644
--- a/ts/editor/wrap.ts
+++ b/ts/editor/wrap.ts
@@ -5,7 +5,7 @@
 @typescript-eslint/no-non-null-assertion: "off",
  */
 
-import { wrapInternal } from "lib/wrap";
+import { wrapInternal } from "../lib/wrap";
 import { getCurrentField } from ".";
 
 export function wrap(front: string, back: string): void {
diff --git a/ts/esbuild.bzl b/ts/esbuild.bzl
index d03eabe3e..6eb45defc 100644
--- a/ts/esbuild.bzl
+++ b/ts/esbuild.bzl
@@ -1,6 +1,16 @@
-load("@esbuild_toolchain//:esbuild.bzl", _esbuild = "esbuild_macro")
+load("@npm//@bazel/esbuild:index.bzl", _esbuild = "esbuild")
 
 def esbuild(name, **kwargs):
+    args = kwargs.get("args", {})
+    if "resolveExtension" not in args:
+        args["resolveExtensions"] = [
+            ".mjs",
+            ".js",
+        ]
+    if "logLevel" not in args:
+        args["logLevel"] = "warning"
+    kwargs["args"] = args
+
     _esbuild(
         name = name,
         minify = select({
diff --git a/ts/eslint.bzl b/ts/eslint.bzl
index 63814c9cf..d2d27116a 100644
--- a/ts/eslint.bzl
+++ b/ts/eslint.bzl
@@ -1,6 +1,10 @@
 load("@npm//eslint:index.bzl", _eslint_test = "eslint_test")
 
-def eslint_test(name = "eslint", srcs = []):
+def eslint_test(name = "eslint", srcs = None, exclude = []):
+    if not srcs:
+        srcs = native.glob([
+            "*.ts",
+        ], exclude = ["*.svelte.d.ts"] + exclude)
     _eslint_test(
         name = name,
         args = [
diff --git a/ts/graphs/AddedGraph.svelte b/ts/graphs/AddedGraph.svelte
index c3f56c64f..56bd08eeb 100644
--- a/ts/graphs/AddedGraph.svelte
+++ b/ts/graphs/AddedGraph.svelte
@@ -3,8 +3,8 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import type { Stats } from "lib/proto";
-    import type { PreferenceStore } from "sveltelib/preferences";
+    import type { Stats } from "../lib/proto";
+    import type { PreferenceStore } from "../sveltelib/preferences";
     import { createEventDispatcher } from "svelte";
 
     import Graph from "./Graph.svelte";
@@ -20,7 +20,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { GraphData } from "./added";
 
     export let sourceData: Stats.GraphsResponse | null = null;
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     export let preferences: PreferenceStore<Stats.GraphPreferences>;
 
     let histogramData = null as HistogramData | null;
diff --git a/ts/graphs/AddedGraph.svelte.d.ts b/ts/graphs/AddedGraph.svelte.d.ts
new file mode 120000
index 000000000..f50b74a1d
--- /dev/null
+++ b/ts/graphs/AddedGraph.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/AddedGraph.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/AxisTicks.svelte.d.ts b/ts/graphs/AxisTicks.svelte.d.ts
new file mode 120000
index 000000000..b550c6ff1
--- /dev/null
+++ b/ts/graphs/AxisTicks.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/AxisTicks.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/BUILD.bazel b/ts/graphs/BUILD.bazel
index f631c3fe6..e4fe64e8d 100644
--- a/ts/graphs/BUILD.bazel
+++ b/ts/graphs/BUILD.bazel
@@ -1,9 +1,9 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//ts/svelte:svelte.bzl", "compile_svelte", "svelte_check")
 load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
 load("//ts:esbuild.bzl", "esbuild")
 load("//ts:compile_sass.bzl", "compile_sass")
+load("//ts:typescript.bzl", "typescript")
 
 compile_sass(
     srcs = ["graphs-base.scss"],
@@ -15,37 +15,19 @@ compile_sass(
     ],
 )
 
-svelte_files = glob(["*.svelte"])
+compile_svelte()
 
-svelte_names = [f.replace(".svelte", "") for f in svelte_files]
-
-compile_svelte(
-    name = "svelte",
-    srcs = svelte_files,
-)
-
-ts_library(
+typescript(
     name = "index",
-    srcs = ["index.ts"],
-    deps = [
-        "GraphsPage",
-        "lib",
-        "//ts/lib",
-        "//ts/sveltelib",
-        "@npm//svelte",
-        "@npm//svelte2tsx",
-    ],
-)
-
-ts_library(
-    name = "lib",
     srcs = glob(
         ["*.ts"],
-        exclude = ["index.ts"],
+        exclude = ["*.svelte.d.ts"],
     ),
     deps = [
+        ":svelte",
         "//ts/lib",
         "//ts/sveltelib",
+        "@npm//@fluent",
         "@npm//@types/d3",
         "@npm//@types/lodash",
         "@npm//d3",
@@ -56,21 +38,17 @@ ts_library(
 
 esbuild(
     name = "graphs",
-    args = [
-        "--global-name=anki",
-        "--resolve-extensions=.mjs,.js",
-        "--log-level=warning",
-    ],
+    args = {
+        "globalName": "anki",
+    },
     entry_point = "index.ts",
     output_css = "graphs.css",
     visibility = ["//visibility:public"],
     deps = [
-        "//ts/sveltelib",
-        "//ts/lib",
-        ":index",
         ":base_css",
-        "@npm//protobufjs",
-    ] + svelte_names,
+        ":index",
+        ":svelte",
+    ],
 )
 
 exports_files(["graphs.html"])
@@ -78,27 +56,17 @@ exports_files(["graphs.html"])
 # Tests
 ################
 
-prettier_test(
-    name = "format_check",
-    srcs = glob([
-        "*.ts",
-        "*.svelte",
-    ]),
-)
+prettier_test()
 
-eslint_test(
-    name = "eslint",
-    srcs = glob(
-        [
-            "*.ts",
-        ],
-    ),
-)
+eslint_test()
 
 svelte_check(
     name = "svelte_check",
     srcs = glob([
         "*.ts",
         "*.svelte",
-    ]),
+    ]) + [
+        "//ts/lib",
+        "//ts/sveltelib",
+    ],
 )
diff --git a/ts/graphs/ButtonsGraph.svelte b/ts/graphs/ButtonsGraph.svelte
index fa3a550be..21b41f326 100644
--- a/ts/graphs/ButtonsGraph.svelte
+++ b/ts/graphs/ButtonsGraph.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import type { Stats } from "lib/proto";
+    import type { Stats } from "../lib/proto";
 
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
@@ -15,7 +15,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { defaultGraphBounds, GraphRange, RevlogRange } from "./graph-helpers";
 
     export let sourceData: Stats.GraphsResponse | null = null;
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     export let revlogRange: RevlogRange;
 
     let graphRange: GraphRange = GraphRange.Year;
diff --git a/ts/graphs/ButtonsGraph.svelte.d.ts b/ts/graphs/ButtonsGraph.svelte.d.ts
new file mode 120000
index 000000000..384a25939
--- /dev/null
+++ b/ts/graphs/ButtonsGraph.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/ButtonsGraph.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/CalendarGraph.svelte b/ts/graphs/CalendarGraph.svelte
index cc0cebca2..be5fdb4e7 100644
--- a/ts/graphs/CalendarGraph.svelte
+++ b/ts/graphs/CalendarGraph.svelte
@@ -3,8 +3,8 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import type { Stats } from "lib/proto";
-    import type { PreferenceStore } from "sveltelib/preferences";
+    import type { Stats } from "../lib/proto";
+    import type { PreferenceStore } from "../sveltelib/preferences";
 
     import { createEventDispatcher } from "svelte";
 
@@ -21,7 +21,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     export let sourceData: Stats.GraphsResponse;
     export let preferences: PreferenceStore<Stats.GraphPreferences>;
     export let revlogRange: RevlogRange;
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     export let nightMode: boolean;
 
     let { calendarFirstDayOfWeek } = preferences;
diff --git a/ts/graphs/CalendarGraph.svelte.d.ts b/ts/graphs/CalendarGraph.svelte.d.ts
new file mode 120000
index 000000000..5601eca9c
--- /dev/null
+++ b/ts/graphs/CalendarGraph.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/CalendarGraph.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/CardCounts.svelte b/ts/graphs/CardCounts.svelte
index fc8e09f8c..b72781968 100644
--- a/ts/graphs/CardCounts.svelte
+++ b/ts/graphs/CardCounts.svelte
@@ -4,8 +4,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import { createEventDispatcher } from "svelte";
-    import type { Stats } from "lib/proto";
-    import type { PreferenceStore } from "sveltelib/preferences";
+    import type { Stats } from "../lib/proto";
+    import type { PreferenceStore } from "../sveltelib/preferences";
 
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
@@ -16,7 +16,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { GraphData, TableDatum } from "./card-counts";
 
     export let sourceData: Stats.GraphsResponse;
-    import * as tr2 from "lib/i18n";
+    import * as tr2 from "../lib/i18n";
     export let preferences: PreferenceStore<Stats.GraphPreferences>;
 
     let { cardCountsSeparateInactive, browserLinksSupported } = preferences;
diff --git a/ts/graphs/CardCounts.svelte.d.ts b/ts/graphs/CardCounts.svelte.d.ts
new file mode 120000
index 000000000..828071942
--- /dev/null
+++ b/ts/graphs/CardCounts.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/CardCounts.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/CumulativeOverlay.svelte.d.ts b/ts/graphs/CumulativeOverlay.svelte.d.ts
new file mode 120000
index 000000000..26bf13672
--- /dev/null
+++ b/ts/graphs/CumulativeOverlay.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/CumulativeOverlay.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/EaseGraph.svelte b/ts/graphs/EaseGraph.svelte
index 64b46c596..2a2f0ceae 100644
--- a/ts/graphs/EaseGraph.svelte
+++ b/ts/graphs/EaseGraph.svelte
@@ -3,9 +3,9 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import type { Stats } from "lib/proto";
-    import * as tr from "lib/i18n";
-    import type { PreferenceStore } from "sveltelib/preferences";
+    import type { Stats } from "../lib/proto";
+    import * as tr from "../lib/i18n";
+    import type { PreferenceStore } from "../sveltelib/preferences";
 
     import { createEventDispatcher } from "svelte";
 
diff --git a/ts/graphs/EaseGraph.svelte.d.ts b/ts/graphs/EaseGraph.svelte.d.ts
new file mode 120000
index 000000000..8e4e90df9
--- /dev/null
+++ b/ts/graphs/EaseGraph.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/EaseGraph.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/FutureDue.svelte b/ts/graphs/FutureDue.svelte
index 86804472d..36982e686 100644
--- a/ts/graphs/FutureDue.svelte
+++ b/ts/graphs/FutureDue.svelte
@@ -5,14 +5,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="typescript">
     import { createEventDispatcher } from "svelte";
 
-    import type { Stats } from "lib/proto";
+    import type { Stats } from "../lib/proto";
 
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
     import HistogramGraph from "./HistogramGraph.svelte";
     import GraphRangeRadios from "./GraphRangeRadios.svelte";
     import TableData from "./TableData.svelte";
-    import type { PreferenceStore } from "sveltelib/preferences";
+    import type { PreferenceStore } from "../sveltelib/preferences";
 
     import type { HistogramData } from "./histogram-graph";
     import { GraphRange, RevlogRange } from "./graph-helpers";
@@ -21,7 +21,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { GraphData } from "./future-due";
 
     export let sourceData: Stats.GraphsResponse | null = null;
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     export let preferences: PreferenceStore<Stats.GraphPreferences>;
 
     const dispatch = createEventDispatcher<SearchEventMap>();
diff --git a/ts/graphs/FutureDue.svelte.d.ts b/ts/graphs/FutureDue.svelte.d.ts
new file mode 120000
index 000000000..a7cfcb981
--- /dev/null
+++ b/ts/graphs/FutureDue.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/FutureDue.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/Graph.svelte.d.ts b/ts/graphs/Graph.svelte.d.ts
new file mode 120000
index 000000000..a547f6779
--- /dev/null
+++ b/ts/graphs/Graph.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/Graph.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/GraphRangeRadios.svelte b/ts/graphs/GraphRangeRadios.svelte
index 580c3c773..b7c6d9201 100644
--- a/ts/graphs/GraphRangeRadios.svelte
+++ b/ts/graphs/GraphRangeRadios.svelte
@@ -4,9 +4,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import { RevlogRange, GraphRange } from "./graph-helpers";
-    import { timeSpan, MONTH, YEAR } from "lib/time";
+    import { timeSpan, MONTH, YEAR } from "../lib/time";
 
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     export let revlogRange: RevlogRange;
     export let graphRange: GraphRange;
     export let followRevlog: boolean = false;
diff --git a/ts/graphs/GraphRangeRadios.svelte.d.ts b/ts/graphs/GraphRangeRadios.svelte.d.ts
new file mode 120000
index 000000000..fe0d2683d
--- /dev/null
+++ b/ts/graphs/GraphRangeRadios.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/GraphRangeRadios.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/GraphsPage.svelte b/ts/graphs/GraphsPage.svelte
index e435ac438..da1b17d43 100644
--- a/ts/graphs/GraphsPage.svelte
+++ b/ts/graphs/GraphsPage.svelte
@@ -6,7 +6,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { SvelteComponent } from "svelte/internal";
     import { writable } from "svelte/store";
 
-    import { bridgeCommand } from "lib/bridgecommand";
+    import { bridgeCommand } from "../lib/bridgecommand";
 
     import WithGraphData from "./WithGraphData.svelte";
 
diff --git a/ts/graphs/GraphsPage.svelte.d.ts b/ts/graphs/GraphsPage.svelte.d.ts
new file mode 120000
index 000000000..dc1097c40
--- /dev/null
+++ b/ts/graphs/GraphsPage.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/GraphsPage.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/HistogramGraph.svelte.d.ts b/ts/graphs/HistogramGraph.svelte.d.ts
new file mode 120000
index 000000000..34304beca
--- /dev/null
+++ b/ts/graphs/HistogramGraph.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/HistogramGraph.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/HourGraph.svelte b/ts/graphs/HourGraph.svelte
index 7cefaa634..75000da15 100644
--- a/ts/graphs/HourGraph.svelte
+++ b/ts/graphs/HourGraph.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import type { Stats } from "lib/proto";
+    import type { Stats } from "../lib/proto";
 
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
@@ -16,7 +16,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { renderHours } from "./hours";
 
     export let sourceData: Stats.GraphsResponse | null = null;
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     export let revlogRange: RevlogRange;
     let graphRange: GraphRange = GraphRange.Year;
 
diff --git a/ts/graphs/HourGraph.svelte.d.ts b/ts/graphs/HourGraph.svelte.d.ts
new file mode 120000
index 000000000..e3a59da11
--- /dev/null
+++ b/ts/graphs/HourGraph.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/HourGraph.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/HoverColumns.svelte.d.ts b/ts/graphs/HoverColumns.svelte.d.ts
new file mode 120000
index 000000000..d79488530
--- /dev/null
+++ b/ts/graphs/HoverColumns.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/HoverColumns.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/InputBox.svelte.d.ts b/ts/graphs/InputBox.svelte.d.ts
new file mode 120000
index 000000000..334958102
--- /dev/null
+++ b/ts/graphs/InputBox.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/InputBox.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/IntervalsGraph.svelte b/ts/graphs/IntervalsGraph.svelte
index 3ce848afc..85d1e81f4 100644
--- a/ts/graphs/IntervalsGraph.svelte
+++ b/ts/graphs/IntervalsGraph.svelte
@@ -3,10 +3,10 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import { timeSpan, MONTH } from "lib/time";
+    import { timeSpan, MONTH } from "../lib/time";
 
-    import type { Stats } from "lib/proto";
-    import type { PreferenceStore } from "sveltelib/preferences";
+    import type { Stats } from "../lib/proto";
+    import type { PreferenceStore } from "../sveltelib/preferences";
     import { createEventDispatcher } from "svelte";
 
     import Graph from "./Graph.svelte";
@@ -24,7 +24,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import type { TableDatum, SearchEventMap } from "./graph-helpers";
 
     export let sourceData: Stats.GraphsResponse | null = null;
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     export let preferences: PreferenceStore<Stats.GraphPreferences>;
 
     const dispatch = createEventDispatcher<SearchEventMap>();
diff --git a/ts/graphs/IntervalsGraph.svelte.d.ts b/ts/graphs/IntervalsGraph.svelte.d.ts
new file mode 120000
index 000000000..db520e4d1
--- /dev/null
+++ b/ts/graphs/IntervalsGraph.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/IntervalsGraph.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/NoDataOverlay.svelte b/ts/graphs/NoDataOverlay.svelte
index 4604d9ea7..64aa1c99d 100644
--- a/ts/graphs/NoDataOverlay.svelte
+++ b/ts/graphs/NoDataOverlay.svelte
@@ -5,7 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 <script lang="typescript">
     import type { GraphBounds } from "./graph-helpers";
     export let bounds: GraphBounds;
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     const noData = tr.statisticsNoData();
 </script>
 
diff --git a/ts/graphs/NoDataOverlay.svelte.d.ts b/ts/graphs/NoDataOverlay.svelte.d.ts
new file mode 120000
index 000000000..ec8464501
--- /dev/null
+++ b/ts/graphs/NoDataOverlay.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/NoDataOverlay.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/RangeBox.svelte b/ts/graphs/RangeBox.svelte
index 934fe0a44..b4285beb5 100644
--- a/ts/graphs/RangeBox.svelte
+++ b/ts/graphs/RangeBox.svelte
@@ -7,7 +7,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     import InputBox from "./InputBox.svelte";
 
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
     import { RevlogRange, daysToRevlogRange } from "./graph-helpers";
 
     enum SearchRange {
diff --git a/ts/graphs/RangeBox.svelte.d.ts b/ts/graphs/RangeBox.svelte.d.ts
new file mode 120000
index 000000000..ec95a1a6b
--- /dev/null
+++ b/ts/graphs/RangeBox.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/RangeBox.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/ReviewsGraph.svelte b/ts/graphs/ReviewsGraph.svelte
index 8d64fbec5..7c024e23f 100644
--- a/ts/graphs/ReviewsGraph.svelte
+++ b/ts/graphs/ReviewsGraph.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import type { Stats } from "lib/proto";
+    import type { Stats } from "../lib/proto";
 
     import Graph from "./Graph.svelte";
     import InputBox from "./InputBox.svelte";
@@ -21,7 +21,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
     export let sourceData: Stats.GraphsResponse | null = null;
     export let revlogRange: RevlogRange;
-    import * as tr from "lib/i18n";
+    import * as tr from "../lib/i18n";
 
     let graphData: GraphData | null = null;
 
diff --git a/ts/graphs/ReviewsGraph.svelte.d.ts b/ts/graphs/ReviewsGraph.svelte.d.ts
new file mode 120000
index 000000000..fd09dcf52
--- /dev/null
+++ b/ts/graphs/ReviewsGraph.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/ReviewsGraph.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/TableData.svelte b/ts/graphs/TableData.svelte
index ef60a2b78..230e2a6aa 100644
--- a/ts/graphs/TableData.svelte
+++ b/ts/graphs/TableData.svelte
@@ -4,7 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import type { TableDatum } from "./graph-helpers";
-    import { i18n } from "lib/i18n";
+    import { i18n } from "../lib/i18n";
     export let tableData: TableDatum[];
 </script>
 
diff --git a/ts/graphs/TableData.svelte.d.ts b/ts/graphs/TableData.svelte.d.ts
new file mode 120000
index 000000000..656f78a87
--- /dev/null
+++ b/ts/graphs/TableData.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/TableData.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/TodayStats.svelte b/ts/graphs/TodayStats.svelte
index 44c7a6f36..79798e34e 100644
--- a/ts/graphs/TodayStats.svelte
+++ b/ts/graphs/TodayStats.svelte
@@ -3,7 +3,7 @@ Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
-    import type { Stats } from "lib/proto";
+    import type { Stats } from "../lib/proto";
 
     import Graph from "./Graph.svelte";
 
diff --git a/ts/graphs/TodayStats.svelte.d.ts b/ts/graphs/TodayStats.svelte.d.ts
new file mode 120000
index 000000000..120093883
--- /dev/null
+++ b/ts/graphs/TodayStats.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/TodayStats.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/Tooltip.svelte.d.ts b/ts/graphs/Tooltip.svelte.d.ts
new file mode 120000
index 000000000..118dc3d8f
--- /dev/null
+++ b/ts/graphs/Tooltip.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/Tooltip.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/WithGraphData.svelte b/ts/graphs/WithGraphData.svelte
index 7c86a6e30..3b476328b 100644
--- a/ts/graphs/WithGraphData.svelte
+++ b/ts/graphs/WithGraphData.svelte
@@ -4,14 +4,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="typescript">
     import type { Writable } from "svelte/store";
-    import type { PreferenceRaw, PreferencePayload } from "sveltelib/preferences";
+    import type { PreferenceRaw, PreferencePayload } from "../sveltelib/preferences";
 
-    import { Stats } from "lib/proto";
-    import { postRequest } from "lib/postrequest";
+    import { Stats } from "../lib/proto";
+    import { postRequest } from "../lib/postrequest";
 
-    import useAsync from "sveltelib/async";
-    import useAsyncReactive from "sveltelib/asyncReactive";
-    import { getPreferences } from "sveltelib/preferences";
+    import useAsync from "../sveltelib/async";
+    import useAsyncReactive from "../sveltelib/asyncReactive";
+    import { getPreferences } from "../sveltelib/preferences";
 
     import { daysToRevlogRange } from "./graph-helpers";
 
diff --git a/ts/graphs/WithGraphData.svelte.d.ts b/ts/graphs/WithGraphData.svelte.d.ts
new file mode 120000
index 000000000..561923761
--- /dev/null
+++ b/ts/graphs/WithGraphData.svelte.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/graphs/WithGraphData.svelte.d.ts
\ No newline at end of file
diff --git a/ts/graphs/added.ts b/ts/graphs/added.ts
index d07515211..db4877c85 100644
--- a/ts/graphs/added.ts
+++ b/ts/graphs/added.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import type { Stats, Cards } from "lib/proto";
+import type { Stats, Cards } from "../lib/proto";
 
 import {
     extent,
@@ -19,10 +19,10 @@ import {
 import type { Bin } from "d3";
 import type { HistogramData } from "./histogram-graph";
 
-import { dayLabel } from "lib/time";
+import { dayLabel } from "../lib/time";
 import { GraphRange } from "./graph-helpers";
 import type { TableDatum, SearchDispatch } from "./graph-helpers";
-import * as tr from "lib/i18n";
+import * as tr from "../lib/i18n";
 
 export interface GraphData {
     daysAdded: number[];
diff --git a/ts/graphs/buttons.ts b/ts/graphs/buttons.ts
index b4c36246e..3c77166e6 100644
--- a/ts/graphs/buttons.ts
+++ b/ts/graphs/buttons.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { Stats } from "lib/proto";
+import { Stats } from "../lib/proto";
 
 import {
     interpolateRdYlGn,
@@ -26,7 +26,7 @@ import {
     GraphRange,
     millisecondCutoffForRange,
 } from "./graph-helpers";
-import * as tr from "lib/i18n";
+import * as tr from "../lib/i18n";
 
 type ButtonCounts = [number, number, number, number];
 
diff --git a/ts/graphs/calendar.ts b/ts/graphs/calendar.ts
index cacbccfb5..3bea00fbb 100644
--- a/ts/graphs/calendar.ts
+++ b/ts/graphs/calendar.ts
@@ -5,7 +5,7 @@
 @typescript-eslint/no-non-null-assertion: "off",
  */
 
-import { Stats } from "lib/proto";
+import { Stats } from "../lib/proto";
 import {
     interpolateBlues,
     select,
@@ -29,8 +29,8 @@ import {
     SearchDispatch,
 } from "./graph-helpers";
 import { clickableClass } from "./graph-styles";
-import { i18n } from "lib/i18n";
-import * as tr from "lib/i18n";
+import { i18n } from "../lib/i18n";
+import * as tr from "../lib/i18n";
 
 export interface GraphData {
     // indexed by day, where day is relative to today
diff --git a/ts/graphs/card-counts.ts b/ts/graphs/card-counts.ts
index 29191a9c3..0d2f0faf7 100644
--- a/ts/graphs/card-counts.ts
+++ b/ts/graphs/card-counts.ts
@@ -6,8 +6,8 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { CardQueue, CardType } from "lib/cards";
-import type { Stats, Cards } from "lib/proto";
+import { CardQueue, CardType } from "../lib/cards";
+import type { Stats, Cards } from "../lib/proto";
 import {
     schemeGreens,
     schemeBlues,
@@ -22,7 +22,7 @@ import {
 } from "d3";
 import type { GraphBounds } from "./graph-helpers";
 
-import * as tr from "lib/i18n";
+import * as tr from "../lib/i18n";
 
 type Count = [string, number, boolean, string];
 export interface GraphData {
diff --git a/ts/graphs/ease.ts b/ts/graphs/ease.ts
index 0797a60a5..5b28ee58d 100644
--- a/ts/graphs/ease.ts
+++ b/ts/graphs/ease.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import type { Stats, Cards } from "lib/proto";
+import type { Stats, Cards } from "../lib/proto";
 import {
     extent,
     histogram,
@@ -16,11 +16,11 @@ import {
     interpolateRdYlGn,
 } from "d3";
 import type { Bin, ScaleLinear } from "d3";
-import { CardType } from "lib/cards";
+import { CardType } from "../lib/cards";
 import type { HistogramData } from "./histogram-graph";
 
 import type { TableDatum, SearchDispatch } from "./graph-helpers";
-import * as tr from "lib/i18n";
+import * as tr from "../lib/i18n";
 
 export interface GraphData {
     eases: number[];
diff --git a/ts/graphs/future-due.ts b/ts/graphs/future-due.ts
index 196da07b5..67d5ba0ed 100644
--- a/ts/graphs/future-due.ts
+++ b/ts/graphs/future-due.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import type { Stats, Cards } from "lib/proto";
+import type { Stats, Cards } from "../lib/proto";
 import {
     extent,
     histogram,
@@ -17,13 +17,13 @@ import {
     interpolateGreens,
 } from "d3";
 import type { Bin } from "d3";
-import { CardQueue } from "lib/cards";
+import { CardQueue } from "../lib/cards";
 import type { HistogramData } from "./histogram-graph";
-import { dayLabel } from "lib/time";
+import { dayLabel } from "../lib/time";
 
 import { GraphRange } from "./graph-helpers";
 import type { TableDatum, SearchDispatch } from "./graph-helpers";
-import * as tr from "lib/i18n";
+import * as tr from "../lib/i18n";
 
 export interface GraphData {
     dueCounts: Map<number, number>;
diff --git a/ts/graphs/graph-helpers.ts b/ts/graphs/graph-helpers.ts
index 8d5c82a19..ec5e3be7a 100644
--- a/ts/graphs/graph-helpers.ts
+++ b/ts/graphs/graph-helpers.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
 @typescript-eslint/ban-ts-comment: "off" */
 
-import type { Stats, Cards } from "lib/proto";
+import type { Stats, Cards } from "../lib/proto";
 import type { Selection } from "d3";
 
 // amount of data to fetch from backend
diff --git a/ts/graphs/hours.ts b/ts/graphs/hours.ts
index 8ccbc6063..1508c6928 100644
--- a/ts/graphs/hours.ts
+++ b/ts/graphs/hours.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { Stats } from "lib/proto";
+import { Stats } from "../lib/proto";
 import {
     interpolateBlues,
     select,
@@ -29,7 +29,7 @@ import {
     millisecondCutoffForRange,
 } from "./graph-helpers";
 import { oddTickClass } from "./graph-styles";
-import * as tr from "lib/i18n";
+import * as tr from "../lib/i18n";
 
 interface Hour {
     hour: number;
diff --git a/ts/graphs/index.ts b/ts/graphs/index.ts
index 2a67447e6..bee33dd83 100644
--- a/ts/graphs/index.ts
+++ b/ts/graphs/index.ts
@@ -3,8 +3,8 @@
 
 import type { SvelteComponent } from "svelte/internal";
 
-import { setupI18n, ModuleName } from "lib/i18n";
-import { checkNightMode } from "lib/nightmode";
+import { setupI18n, ModuleName } from "../lib/i18n";
+import { checkNightMode } from "../lib/nightmode";
 
 import GraphsPage from "./GraphsPage.svelte";
 
diff --git a/ts/graphs/intervals.ts b/ts/graphs/intervals.ts
index 81000b1c9..22372a03c 100644
--- a/ts/graphs/intervals.ts
+++ b/ts/graphs/intervals.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import type { Stats, Cards } from "lib/proto";
+import type { Stats, Cards } from "../lib/proto";
 import {
     extent,
     histogram,
@@ -18,12 +18,12 @@ import {
     interpolateBlues,
 } from "d3";
 import type { Bin } from "d3";
-import { CardType } from "lib/cards";
+import { CardType } from "../lib/cards";
 import type { HistogramData } from "./histogram-graph";
 
 import type { TableDatum, SearchDispatch } from "./graph-helpers";
-import { timeSpan } from "lib/time";
-import * as tr from "lib/i18n";
+import { timeSpan } from "../lib/time";
+import * as tr from "../lib/i18n";
 
 export interface IntervalGraphData {
     intervals: number[];
diff --git a/ts/graphs/reviews.ts b/ts/graphs/reviews.ts
index 1c8ec95c4..f31f7e161 100644
--- a/ts/graphs/reviews.ts
+++ b/ts/graphs/reviews.ts
@@ -6,9 +6,9 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import { Stats } from "lib/proto";
+import { Stats } from "../lib/proto";
 
-import { timeSpan, dayLabel } from "lib/time";
+import { timeSpan, dayLabel } from "../lib/time";
 import {
     interpolateGreens,
     interpolateReds,
@@ -35,7 +35,7 @@ import type { Bin } from "d3";
 import type { TableDatum } from "./graph-helpers";
 import { GraphBounds, setDataAvailable, GraphRange } from "./graph-helpers";
 import { showTooltip, hideTooltip } from "./tooltip";
-import * as tr from "lib/i18n";
+import * as tr from "../lib/i18n";
 
 interface Reviews {
     learn: number;
diff --git a/ts/graphs/today.ts b/ts/graphs/today.ts
index ed13563a9..07e5a12e7 100644
--- a/ts/graphs/today.ts
+++ b/ts/graphs/today.ts
@@ -1,10 +1,10 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import { Stats } from "lib/proto";
-import { studiedToday } from "lib/time";
+import { Stats } from "../lib/proto";
+import { studiedToday } from "../lib/time";
 
-import * as tr from "lib/i18n";
+import * as tr from "../lib/i18n";
 
 export interface TodayData {
     title: string;
diff --git a/ts/graphs/tsconfig.json b/ts/graphs/tsconfig.json
new file mode 100644
index 000000000..156ec7f9f
--- /dev/null
+++ b/ts/graphs/tsconfig.json
@@ -0,0 +1,5 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [{ "path": "../lib" }]
+}
diff --git a/ts/html-filter/BUILD.bazel b/ts/html-filter/BUILD.bazel
index 60ec726e8..61e374bf9 100644
--- a/ts/html-filter/BUILD.bazel
+++ b/ts/html-filter/BUILD.bazel
@@ -1,42 +1,24 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//ts:jest.bzl", "jest_test")
 load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
+load("//ts:typescript.bzl", "typescript")
 
-ts_library(
+typescript(
     name = "html-filter",
-    srcs = glob(
-        ["*.ts"],
-        exclude = ["*.test.ts"],
-    ),
-    module_name = "html-filter",
-    tsconfig = "//ts:tsconfig.json",
-    visibility = ["//visibility:public"],
-    deps = [],
-)
-
-jest_test(
-    env = "jsdom",
-    deps = [
-        "html-filter",
-    ],
+    srcs = glob(["*.ts"]),
+    deps = ["@npm//@types/jest"],
 )
 
 # Tests
 ################
 
-prettier_test(
-    name = "format_check",
-    srcs = glob([
-        "*.ts",
-    ]),
-)
+prettier_test()
 
-eslint_test(
-    name = "eslint",
-    srcs = glob(
-        [
-            "*.ts",
-        ],
-    ),
+eslint_test()
+
+jest_test(
+    env = "jsdom",
+    deps = [
+        ":html-filter",
+    ],
 )
diff --git a/ts/html-filter/tsconfig.json b/ts/html-filter/tsconfig.json
new file mode 100644
index 000000000..587e87472
--- /dev/null
+++ b/ts/html-filter/tsconfig.json
@@ -0,0 +1,8 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [],
+    "compilerOptions": {
+        "types": ["jest"]
+    }
+}
diff --git a/ts/jest.bzl b/ts/jest.bzl
index d56115e11..8753b7d85 100644
--- a/ts/jest.bzl
+++ b/ts/jest.bzl
@@ -1,30 +1,15 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
-load("@esbuild_toolchain//:esbuild.bzl", esbuild = "esbuild_macro")
+load("@npm//@bazel/esbuild:index.bzl", "esbuild")
 load("@npm//jest-cli:index.bzl", _jest_test = "jest_test")
 
 def jest_test(deps, name = "jest", protobuf = False, env = "node"):
-    "Build *.test.ts into a library, then test it with Jest."
-
     ts_sources = native.glob(["*.test.ts"])
 
-    # compile sources for type checking
-    ts_library(
-        name = name + "_lib",
-        srcs = ts_sources,
-        tsconfig = "//ts:tsconfig.json",
-        deps = deps + [
-            "@npm//@types/jest",
-        ],
-    )
-
     # bundle each test file up with its dependencies for jest
     bundled_srcs = []
-    esbuild_extra_args = []
+    esbuild_extra_args = {}
     esbuild_extra_srcs = []
     if protobuf:
-        esbuild_extra_args.append(
-            "--inject:$(location //ts:protobuf-no-long.js)",
-        )
+        esbuild_extra_args["inject"] = ["ts/protobuf-no-long.js"]
         esbuild_extra_srcs.append(
             "//ts:protobuf-no-long.js",
         )
@@ -35,20 +20,22 @@ def jest_test(deps, name = "jest", protobuf = False, env = "node"):
         bundled_srcs.append(bundle_name)
         esbuild(
             name = bundle_name,
-            args = [
-                "--resolve-extensions=.mjs,.js",
-                "--log-level=warning",
-                "--platform=node",
-                "--keep-names",
-            ] + esbuild_extra_args,
+            args = dict(
+                esbuild_extra_args,
+                platform = "node",
+                keepNames = True,
+            ),
             entry_point = ts_src,
             output = bundle_name + ".js",
             srcs = esbuild_extra_srcs,
-            deps = [
-                name + "_lib",
-            ] + deps,
+            deps = deps,
             # the code shaking saves close to a second off the deckoptions/lib.test.ts test
             minify = True,
+            target_compatible_with = select({
+                "@platforms//os:osx": [],
+                "@platforms//os:linux": [],
+                "//conditions:default": ["@platforms//os:linux"],
+            }),
         )
 
     # then test them
@@ -63,7 +50,7 @@ def jest_test(deps, name = "jest", protobuf = False, env = "node"):
             "$(location //ts:jest.config.js)",
             "--env=" + env,
         ],
-        data = bundled_srcs + [
+        data = deps + bundled_srcs + [
             "//ts:jest.config.js",
         ],
         target_compatible_with = select({
diff --git a/ts/jest.config.js b/ts/jest.config.js
index a978e92f6..982380835 100644
--- a/ts/jest.config.js
+++ b/ts/jest.config.js
@@ -1,3 +1,4 @@
 module.exports = {
     haste: { forceNodeFilesystemAPI: true },
+    testMatch: ["**/?*.bundle.test.js"],
 };
diff --git a/ts/lib/BUILD.bazel b/ts/lib/BUILD.bazel
index ba27d66af..a11ceedcf 100644
--- a/ts/lib/BUILD.bazel
+++ b/ts/lib/BUILD.bazel
@@ -1,24 +1,17 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
 load("//ts:protobuf.bzl", "protobufjs_library")
+load("//ts:typescript.bzl", "typescript")
+load("@rules_python//python:defs.bzl", "py_binary")
+load("@py_deps//:requirements.bzl", "requirement")
 load("//ts:jest.bzl", "jest_test")
 
-# Protobuf
-#############
-
 protobufjs_library(
     name = "backend_proto",
     proto = "//proto:backend_proto_lib",
     visibility = ["//visibility:public"],
 )
 
-# Translations
-################
-
-load("@rules_python//python:defs.bzl", "py_binary")
-load("@py_deps//:requirements.bzl", "requirement")
-
 py_binary(
     name = "genfluent",
     srcs = [
@@ -40,26 +33,27 @@ genrule(
     ],
 )
 
-# Anki Library
-################
+_generated = [
+    "backend_proto.d.ts",
+    "i18n.ts",
+]
 
-ts_library(
+typescript(
     name = "lib",
     srcs = glob(
-        ["**/*.ts"],
-        exclude = ["*.test.ts"],
-    ) + [":i18n.ts"],
-    data = [
-        "backend_proto",
+        ["*.ts"],
+        exclude = _generated,
+    ),
+    generated = [
+        ":i18n.ts",
     ],
-    module_name = "lib",
-    tsconfig = "//:tsconfig.json",
-    visibility = ["//visibility:public"],
     deps = [
-        "backend_proto",
+        ":backend_proto",
         "@npm//@fluent/bundle",
+        "@npm//@types/jest",
         "@npm//@types/long",
         "@npm//intl-pluralrules",
+        "@npm//protobufjs",
         "@npm//tslib",
     ],
 )
@@ -67,15 +61,9 @@ ts_library(
 # Tests
 ################
 
-prettier_test(
-    name = "format_check",
-    srcs = glob(["*.ts"]),
-)
+prettier_test(exclude = _generated)
 
-eslint_test(
-    name = "eslint",
-    srcs = glob(["*.ts"]),
-)
+eslint_test(exclude = _generated)
 
 jest_test(
     deps = [
diff --git a/ts/lib/backend_proto.d.ts b/ts/lib/backend_proto.d.ts
new file mode 120000
index 000000000..06e561aee
--- /dev/null
+++ b/ts/lib/backend_proto.d.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/lib/backend_proto.d.ts
\ No newline at end of file
diff --git a/ts/lib/i18n.ts b/ts/lib/i18n.ts
new file mode 120000
index 000000000..85bd7a908
--- /dev/null
+++ b/ts/lib/i18n.ts
@@ -0,0 +1 @@
+../../bazel-bin/ts/lib/i18n.ts
\ No newline at end of file
diff --git a/ts/images.d.ts b/ts/lib/image-import.d.ts
similarity index 100%
rename from ts/images.d.ts
rename to ts/lib/image-import.d.ts
diff --git a/ts/lib/proto.ts b/ts/lib/proto.ts
index 19f916e2c..08b1a8853 100644
--- a/ts/lib/proto.ts
+++ b/ts/lib/proto.ts
@@ -8,4 +8,5 @@ import Notetypes = anki.notetypes;
 import Scheduler = anki.scheduler;
 import Stats = anki.stats;
 import Tags = anki.tags;
+
 export { Stats, Cards, DeckConfig, Notetypes, Scheduler, Tags };
diff --git a/ts/lib/tsconfig.json b/ts/lib/tsconfig.json
new file mode 100644
index 000000000..587e87472
--- /dev/null
+++ b/ts/lib/tsconfig.json
@@ -0,0 +1,8 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [],
+    "compilerOptions": {
+        "types": ["jest"]
+    }
+}
diff --git a/ts/licenses.json b/ts/licenses.json
index 21dc74df2..c9ee5e492 100644
--- a/ts/licenses.json
+++ b/ts/licenses.json
@@ -108,7 +108,7 @@
         "path": "node_modules/@types/lodash-es",
         "licenseFile": "node_modules/@types/lodash-es/LICENSE"
     },
-    "@types/lodash@4.14.173": {
+    "@types/lodash@4.14.175": {
         "licenses": "MIT",
         "repository": "https://github.com/DefinitelyTyped/DefinitelyTyped",
         "path": "node_modules/@types/lodash",
@@ -126,7 +126,7 @@
         "path": "node_modules/@types/marked",
         "licenseFile": "node_modules/@types/marked/LICENSE"
     },
-    "@types/node@16.9.6": {
+    "@types/node@16.10.1": {
         "licenses": "MIT",
         "repository": "https://github.com/DefinitelyTyped/DefinitelyTyped",
         "path": "node_modules/protobufjs/node_modules/@types/node",
@@ -355,7 +355,7 @@
         "path": "node_modules/d3-scale-chromatic",
         "licenseFile": "node_modules/d3-scale-chromatic/LICENSE"
     },
-    "d3-scale@4.0.1": {
+    "d3-scale@4.0.2": {
         "licenses": "ISC",
         "repository": "https://github.com/d3/d3-scale",
         "publisher": "Mike Bostock",
@@ -419,7 +419,7 @@
         "path": "node_modules/d3-zoom",
         "licenseFile": "node_modules/d3-zoom/LICENSE"
     },
-    "d3@7.0.3": {
+    "d3@7.0.4": {
         "licenses": "ISC",
         "repository": "https://github.com/d3/d3",
         "publisher": "Mike Bostock",
diff --git a/ts/package.json b/ts/package.json
index b81f1f4ff..3f9c4f4a8 100644
--- a/ts/package.json
+++ b/ts/package.json
@@ -6,8 +6,9 @@
     "license": "AGPL-3.0-or-later",
     "description": "Anki JS support files",
     "devDependencies": {
-        "@bazel/typescript": "=3.5.1",
-        "@bazel/worker": "=3.5.1",
+        "@bazel/esbuild": "=4.3.0",
+        "@bazel/typescript": "=4.3.0",
+        "@bazel/worker": "=4.3.0",
         "@pyoner/svelte-types": "^3.4.4-2",
         "@sqltools/formatter": "^1.2.2",
         "@tsconfig/svelte": "^1.0.10",
diff --git a/ts/patches/@bazel+typescript+4.3.0.patch b/ts/patches/@bazel+typescript+4.3.0.patch
new file mode 100644
index 000000000..254c33022
--- /dev/null
+++ b/ts/patches/@bazel+typescript+4.3.0.patch
@@ -0,0 +1,25 @@
+diff --git a/node_modules/@bazel/typescript/internal/ts_project.bzl b/node_modules/@bazel/typescript/internal/ts_project.bzl
+index a6342f1..bd48511 100755
+--- a/node_modules/@bazel/typescript/internal/ts_project.bzl
++++ b/node_modules/@bazel/typescript/internal/ts_project.bzl
+@@ -336,11 +336,15 @@ def _replace_ext(f, ext_map):
+ 
+ def _out_paths(srcs, outdir, rootdir, allow_js, ext_map):
+     rootdir_replace_pattern = rootdir + "/" if rootdir else ""
+-    return [
+-        _join(outdir, f[:f.rindex(".")].replace(rootdir_replace_pattern, "") + _replace_ext(f, ext_map))
+-        for f in srcs
+-        if _is_ts_src(f, allow_js)
+-    ]
++    out = []
++    for f in srcs:
++        f = _without_bin(f)
++        if _is_ts_src(f, allow_js):
++            out.append(_join(outdir, f[:f.rindex(".")].replace(rootdir_replace_pattern, "") + _replace_ext(f, ext_map)))
++    return out
++
++def _without_bin(src):
++    return src.replace("_bin_copy", "")
+ 
+ def ts_project_macro(
+         name = "tsconfig",
diff --git a/ts/prettier.bzl b/ts/prettier.bzl
index 447c1a0b5..1b9af0e75 100644
--- a/ts/prettier.bzl
+++ b/ts/prettier.bzl
@@ -3,7 +3,14 @@ load(
     _prettier_test = "prettier_test",
 )
 
-def prettier_test(name = "format_check", srcs = [], **kwargs):
+def prettier_test(name = "format_check", srcs = None, exclude = [], **kwargs):
+    if not srcs:
+        srcs = native.glob([
+            "*.ts",
+            "*.js",
+            "*.svelte",
+        ], exclude = ["*.svelte.d.ts"] + exclude)
+
     _prettier_test(
         name = name,
         args = [
diff --git a/ts/lib/proto.bzl b/ts/proto.bzl
similarity index 100%
rename from ts/lib/proto.bzl
rename to ts/proto.bzl
diff --git a/ts/reviewer/BUILD.bazel b/ts/reviewer/BUILD.bazel
index d93e70534..059d09cbe 100644
--- a/ts/reviewer/BUILD.bazel
+++ b/ts/reviewer/BUILD.bazel
@@ -1,9 +1,8 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
-load("//ts/svelte:svelte.bzl", "svelte", "svelte_check")
 load("//ts:esbuild.bzl", "esbuild")
 load("//ts:compile_sass.bzl", "compile_sass")
+load("//ts:typescript.bzl", "typescript")
 
 compile_sass(
     srcs = [
@@ -14,16 +13,13 @@ compile_sass(
     deps = [],
 )
 
-ts_library(
+typescript(
     name = "reviewer_ts",
     srcs = glob(
         ["*.ts"],
-        exclude = ["reviewer_extras.ts"],
     ),
-    module_name = "reviewer",
     deps = [
         "//ts/lib",
-        "//ts/lib:backend_proto",
         "@npm//css-browser-selector",
         "@npm//jquery",
     ],
@@ -31,35 +27,22 @@ ts_library(
 
 esbuild(
     name = "reviewer",
-    args = [
-        "--resolve-extensions=.mjs,.js",
-        "--log-level=warning",
-    ],
     entry_point = "index_wrapper.ts",
     visibility = ["//visibility:public"],
     deps = [
         ":reviewer_ts",
         "//ts/lib",
-        "//ts/lib:backend_proto",
         "@npm//protobufjs",
     ],
 )
 
 esbuild(
-    name = "reviewer_extras",
-    srcs = [
-        "reviewer_extras.ts",
-    ],
-    args = [
-        "--resolve-extensions=.mjs,.js",
-        "--log-level=warning",
-    ],
+    name = "reviewer_extras_bundle",
     entry_point = "reviewer_extras.ts",
     visibility = ["//visibility:public"],
     deps = [
         ":reviewer_ts",
         "//ts/lib",
-        "//ts/lib:backend_proto",
         "@npm//protobufjs",
     ],
 )
@@ -67,16 +50,6 @@ esbuild(
 # Tests
 ################
 
-prettier_test(
-    name = "format_check",
-    srcs = glob([
-        "*.ts",
-    ]),
-)
+prettier_test()
 
-eslint_test(
-    name = "eslint",
-    srcs = glob([
-        "*.ts",
-    ]),
-)
+eslint_test()
diff --git a/ts/reviewer/answering.ts b/ts/reviewer/answering.ts
index 27e3b5807..1ebd60903 100644
--- a/ts/reviewer/answering.ts
+++ b/ts/reviewer/answering.ts
@@ -1,8 +1,8 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import { Scheduler } from "lib/proto";
-import { postRequest } from "lib/postrequest";
+import { Scheduler } from "../lib/proto";
+import { postRequest } from "../lib/postrequest";
 
 async function getNextStates(): Promise<Scheduler.NextCardStates> {
     return Scheduler.NextCardStates.decode(
diff --git a/ts/reviewer/index.ts b/ts/reviewer/index.ts
index 3b69aafa0..ab92b8121 100644
--- a/ts/reviewer/index.ts
+++ b/ts/reviewer/index.ts
@@ -14,7 +14,7 @@ import { mutateNextCardStates } from "./answering";
 globalThis.anki = globalThis.anki || {};
 globalThis.anki.mutateNextCardStates = mutateNextCardStates;
 
-import { bridgeCommand } from "lib/bridgecommand";
+import { bridgeCommand } from "../lib/bridgecommand";
 import { allImagesLoaded, preloadAnswerImages } from "./images";
 declare const MathJax: any;
 
diff --git a/ts/reviewer/reviewer_extras.ts b/ts/reviewer/reviewer_extras.ts
index 6b5212eb5..926ccd5db 100644
--- a/ts/reviewer/reviewer_extras.ts
+++ b/ts/reviewer/reviewer_extras.ts
@@ -4,6 +4,6 @@
 // A standalone bundle that adds mutateNextCardStates to the anki namespace.
 // When all clients are using reviewer.js directly, we can get rid of this.
 
-import { mutateNextCardStates } from "reviewer/answering";
+import { mutateNextCardStates } from "./answering";
 
 globalThis.anki.mutateNextCardStates = mutateNextCardStates;
diff --git a/ts/reviewer/tsconfig.json b/ts/reviewer/tsconfig.json
new file mode 100644
index 000000000..5747b7343
--- /dev/null
+++ b/ts/reviewer/tsconfig.json
@@ -0,0 +1,5 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [{ "path": "../lib" }],
+}
diff --git a/ts/sql_format.bzl b/ts/sql_format.bzl
index 812d101e8..517aea31a 100644
--- a/ts/sql_format.bzl
+++ b/ts/sql_format.bzl
@@ -11,6 +11,7 @@ def sql_format_setup():
             "@npm//@types/diff",
             "@npm//diff",
         ],
+        tsconfig = "//ts:tsconfig_bin",
         visibility = ["//visibility:public"],
     )
 
diff --git a/ts/svelte/BUILD.bazel b/ts/svelte/BUILD.bazel
index 96e60e0fb..bac9815f1 100644
--- a/ts/svelte/BUILD.bazel
+++ b/ts/svelte/BUILD.bazel
@@ -14,6 +14,7 @@ _deps = [
 ts_library(
     name = "svelte_bin_ts",
     srcs = ["svelte.ts"],
+    tsconfig = "//ts:tsconfig_bin",
     deps = _deps,
 )
 
diff --git a/ts/svelte/svelte.bzl b/ts/svelte/svelte.bzl
index 3c87a21d2..07ebea648 100644
--- a/ts/svelte/svelte.bzl
+++ b/ts/svelte/svelte.bzl
@@ -1,6 +1,7 @@
 load("@npm//svelte-check:index.bzl", _svelte_check = "svelte_check_test")
 load("@build_bazel_rules_nodejs//:providers.bzl", "DeclarationInfo", "declaration_info")
 load("@io_bazel_rules_sass//:defs.bzl", "SassInfo")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
 
 def _get_dep_sources(dep):
     if SassInfo in dep:
@@ -24,37 +25,29 @@ def _svelte(ctx):
     args.add(ctx.outputs.css.path)
     args.add(ctx.var["BINDIR"])
     args.add(ctx.var["GENDIR"])
-    args.add_all(ctx.files._shims)
-
-    deps = _get_sources(ctx.attr.deps).to_list()
 
     ctx.actions.run(
         execution_requirements = {"supports-workers": "1"},
         executable = ctx.executable._svelte_bin,
         outputs = [ctx.outputs.mjs, ctx.outputs.dts, ctx.outputs.css],
-        inputs = [ctx.file.entry_point] + ctx.files._shims + deps,
+        inputs = [ctx.file.entry_point],
         mnemonic = "Svelte",
         arguments = [args],
     )
 
     return [
-        declaration_info(depset([ctx.outputs.dts]), deps = [ctx.attr._shims]),
+        declaration_info(depset([ctx.outputs.dts]), deps = []),
     ]
 
 svelte = rule(
     implementation = _svelte,
     attrs = {
         "entry_point": attr.label(allow_single_file = True),
-        "deps": attr.label_list(),
         "_svelte_bin": attr.label(
             default = Label("//ts/svelte:svelte_bin"),
             executable = True,
             cfg = "host",
         ),
-        "_shims": attr.label(
-            default = Label("@npm//svelte2tsx:svelte2tsx__typings"),
-            allow_files = True,
-        ),
     },
     outputs = {
         "mjs": "%{name}.svelte.mjs",
@@ -63,18 +56,19 @@ svelte = rule(
     },
 )
 
-def compile_svelte(name, srcs, deps = [], visibility = ["//visibility:private"]):
+def compile_svelte(name = "svelte", srcs = None, visibility = ["//visibility:private"]):
+    if not srcs:
+        srcs = native.glob(["*.svelte"])
     for src in srcs:
         svelte(
             name = src.replace(".svelte", ""),
             entry_point = src,
-            deps = deps,
             visibility = visibility,
         )
 
-    native.filegroup(
+    js_library(
         name = name,
-        srcs = srcs,
+        srcs = [s.replace(".svelte", "") for s in srcs],
         visibility = visibility,
     )
 
@@ -88,17 +82,8 @@ def svelte_check(name = "svelte_check", srcs = []):
             "--fail-on-hints",
         ],
         data = [
-            "//ts:tsconfig.json",
-            "//ts/sveltelib",
-            "//ts/lib",
+            "//ts:tsconfig_bin",
             "@npm//sass",
         ] + srcs,
         env = {"SASS_PATH": "ts/sass"},
-        # a lack of sandboxing on Windows breaks the local svelte_check
-        # tests, so we need to disable them on Windows for now
-        target_compatible_with = select({
-            "@platforms//os:osx": [],
-            "@platforms//os:linux": [],
-            "//conditions:default": ["@platforms//os:linux"],
-        }),
     )
diff --git a/ts/svelte/svelte.ts b/ts/svelte/svelte.ts
index 958544446..e44804adc 100644
--- a/ts/svelte/svelte.ts
+++ b/ts/svelte/svelte.ts
@@ -90,8 +90,8 @@ const languageServiceHost: ts.LanguageServiceHost = {
 
 const languageService = ts.createLanguageService(languageServiceHost);
 
-function compile(tsPath: string, tsLibs: string[]) {
-    parsedCommandLine.fileNames = [tsPath, ...tsLibs];
+function compile(tsPath: string) {
+    parsedCommandLine.fileNames = [tsPath];
     const program = languageService.getProgram()!;
     const tsHost = ts.createCompilerHost(parsedCommandLine.options);
     const createdFiles = {};
@@ -124,8 +124,8 @@ function readFile(file) {
     });
 }
 
-async function writeDts(tsPath, dtsPath, tsLibs) {
-    const dtsSource = compile(tsPath, tsLibs);
+async function writeDts(tsPath, dtsPath) {
+    const dtsSource = compile(tsPath);
     await writeFile(dtsPath, dtsSource);
 }
 
@@ -192,12 +192,12 @@ async function writeJs(
 }
 
 async function compileSvelte(args) {
-    const [sveltePath, mjsPath, dtsPath, cssPath, binDir, genDir, ...tsLibs] = args;
+    const [sveltePath, mjsPath, dtsPath, cssPath, binDir, genDir] = args;
     const svelteSource = (await readFile(sveltePath)) as string;
 
     const mockTsPath = sveltePath + ".tsx";
     writeTs(svelteSource, sveltePath, mockTsPath);
-    await writeDts(mockTsPath, dtsPath, tsLibs);
+    await writeDts(mockTsPath, dtsPath);
     await writeJs(svelteSource, sveltePath, mjsPath, cssPath, binDir, genDir);
 
     return true;
diff --git a/ts/sveltelib/BUILD.bazel b/ts/sveltelib/BUILD.bazel
index 0803416df..2bda75bf3 100644
--- a/ts/sveltelib/BUILD.bazel
+++ b/ts/sveltelib/BUILD.bazel
@@ -1,17 +1,14 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("@npm//@bazel/typescript:index.bzl", "ts_project")
 load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
+load("//ts:typescript.bzl", "typescript")
 
 # Anki Library
 ################
 
-ts_library(
+typescript(
     name = "sveltelib",
     srcs = glob(["**/*.ts"]),
-    data = [],
-    module_name = "sveltelib",
-    tsconfig = "//:tsconfig.json",
-    visibility = ["//visibility:public"],
     deps = [
         "//ts/lib",
         "@npm//svelte",
@@ -22,12 +19,6 @@ ts_library(
 # Tests
 ################
 
-prettier_test(
-    name = "format_check",
-    srcs = glob(["*.ts"]),
-)
+prettier_test()
 
-eslint_test(
-    name = "eslint",
-    srcs = glob(["*.ts"]),
-)
+eslint_test()
diff --git a/ts/sveltelib/export-runtime.ts b/ts/sveltelib/export-runtime.ts
index f8ffeddcd..977608f54 100644
--- a/ts/sveltelib/export-runtime.ts
+++ b/ts/sveltelib/export-runtime.ts
@@ -5,7 +5,7 @@
 // If they were to bundle their own runtime, things like bindings and contexts
 // would not work.
 
-import { runtimeLibraries } from "lib/runtime-require";
+import { runtimeLibraries } from "../lib/runtime-require";
 import * as svelteRuntime from "svelte/internal";
 
 runtimeLibraries["svelte/internal"] = svelteRuntime;
diff --git a/ts/sveltelib/tsconfig.json b/ts/sveltelib/tsconfig.json
new file mode 100644
index 000000000..156ec7f9f
--- /dev/null
+++ b/ts/sveltelib/tsconfig.json
@@ -0,0 +1,5 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [{ "path": "../lib" }]
+}
diff --git a/ts/tsconfig.json b/ts/tsconfig.json
index 29c30547d..97082587e 100644
--- a/ts/tsconfig.json
+++ b/ts/tsconfig.json
@@ -1,6 +1,21 @@
 {
-    "exclude": ["node_modules", "dist"],
+    "include": [],
+    "exclude": ["node_modules"],
+    "references": [
+        { "path": "components" },
+        { "path": "congrats" },
+        { "path": "deck-options" },
+        { "path": "editable" },
+        { "path": "editor" },
+        { "path": "graphs" },
+        { "path": "html-filter" },
+        { "path": "lib" },
+        { "path": "reviewer" },
+        { "path": "sveltelib" }
+    ],
     "compilerOptions": {
+        "declaration": true,
+        "composite": true,
         "target": "es6",
         "module": "es6",
         "lib": [
@@ -12,16 +27,12 @@
             "dom",
             "dom.iterable"
         ],
+        "rootDir": ".",
+        "rootDirs": ["."],
         "baseUrl": ".",
-        "paths": {
-            "editable/*": ["../bazel-bin/ts/editable/*"],
-            "lib/*": ["../bazel-bin/ts/lib/*"],
-            "html-filter/*": ["../bazel-bin/ts/html-filter/*"]
-            /* "sveltelib/*": ["../bazel-bin/ts/sveltelib/*"], */
-            /* "components/*": ["../bazel-bin/ts/components/*"], */
-        },
+        "paths": {},
+        "types": [],
         "importsNotUsedAsValues": "error",
-        "outDir": "dist",
         /* Strict Type-Checking Options */
         "strict": true /* Enable all strict type-checking options. */,
         "noImplicitAny": false /* Raise error on expressions and declarations with an implied 'any' type. */,
@@ -36,7 +47,6 @@
         "allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
         "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
         "jsx": "react",
-        "types": ["svelte", "long", "node", "jest"],
         "noEmitHelpers": true,
         "importHelpers": true
     }
diff --git a/ts/typescript.bzl b/ts/typescript.bzl
new file mode 100644
index 000000000..f6c812375
--- /dev/null
+++ b/ts/typescript.bzl
@@ -0,0 +1,43 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_project")
+load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin", "js_library")
+
+def typescript(
+        name,
+        srcs = [],
+        generated = [],
+        tsconfig = "tsconfig.json",
+        visibility = ["//visibility:public"],
+        **kwargs):
+    # all tsconfig files must be in the bazel-out folder
+    copy_to_bin(
+        name = tsconfig + "_bin",
+        srcs = ["tsconfig.json"],
+    )
+
+    # copy sources into bin folder
+    for filename in srcs:
+        copy_to_bin(
+            name = filename + "_bin_copy",
+            srcs = [filename],
+        )
+    srcs = [s + "_bin_copy" for s in srcs] + generated
+
+    ts_project(
+        name = name,
+        srcs = srcs,
+        composite = True,
+        declaration = True,
+        extends = "//ts:tsconfig_bin",
+        tsconfig = tsconfig + "_bin",
+        visibility = visibility,
+        supports_workers = False,
+        # slow
+        validate = False,
+        **kwargs
+    )
+
+    js_library(
+        name = name + "_pkg",
+        deps = [name],
+        visibility = visibility,
+    )
diff --git a/ts/yarn.lock b/ts/yarn.lock
index f4d8671a4..1d4088fb5 100644
--- a/ts/yarn.lock
+++ b/ts/yarn.lock
@@ -304,22 +304,28 @@
     "@babel/helper-validator-identifier" "^7.14.9"
     to-fast-properties "^2.0.0"
 
-"@bazel/typescript@=3.5.1":
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-3.5.1.tgz#c6027d683adeefa2c3cebfa3ed5efa17c405a63b"
-  integrity sha512-dU5sGgaGdFWV1dJ1B+9iFbttgcKtmob+BvlM8mY7Nxq4j7/wVbgPjiVLOBeOD7kpzYep8JHXfhAokHt486IG+Q==
+"@bazel/esbuild@=4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@bazel/esbuild/-/esbuild-4.3.0.tgz#a511d2090c4fccf865b7f6eafc95673f0486450b"
+  integrity sha512-AUyyCYO17Uk/vaG9VSyDgLbQuW0ZY2ciDDp9frgHWPv55SdZolzAK0lA36QVJuz6/7I4EQBvox6KEpMPBR2f/A==
+
+"@bazel/typescript@=4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-4.3.0.tgz#c4131ba7980f8e72885f5ec19c265ad9431e1a71"
+  integrity sha512-ddPw0Xetl+a5UeZVHzpWsyMrUcAyhpGXknmfymx8vrWL+Y3yyquC7ZcYoYbkoCwIMBz7xhadm8NKIUYCrsEgaA==
   dependencies:
+    "@bazel/worker" "4.3.0"
     protobufjs "6.8.8"
     semver "5.6.0"
     source-map-support "0.5.9"
-    tsutils "2.27.2"
+    tsutils "3.21.0"
 
-"@bazel/worker@=3.5.1":
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-3.5.1.tgz#2bfa98eef3c463db87cc3e7b8d781de9620e8b85"
-  integrity sha512-191TNFaRlIp1zZCabS/tZ5xG5SvDAEWRvPwYVNRFlv5ojyELZG7o6nsrlUXTBeP/jN/aT1pj07DzCagb75yX9w==
+"@bazel/worker@4.3.0", "@bazel/worker@=4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-4.3.0.tgz#5ba7da1efa772f5dade5dfd4b662dcaa60ed7c1c"
+  integrity sha512-K34/g/4aUAX8TOQ1MgBaZ+YeZkiIlwETwA50gheCAsasz0SWjvgcpIbwNkaL9fmXOVhDj2o55J20khsl5ItBIw==
   dependencies:
-    protobufjs "6.8.8"
+    google-protobuf "^3.6.1"
 
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
@@ -376,27 +382,27 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.2.0.tgz#57f702837ec52899be58c3794dce5941c77a8b63"
-  integrity sha512-35z+RqsK2CCgNxn+lWyK8X4KkaDtfL4BggT7oeZ0JffIiAiEYFYPo5B67V50ZubqDS1ehBrdCR2jduFnIrZOYw==
+"@jest/console@^27.2.2":
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.2.2.tgz#a977245155c519ac2ef713ec0e722d13eda893c9"
+  integrity sha512-m7tbzPWyvSFfoanTknJoDnaeruDARsUe555tkVjG/qeaRDKwyPqqbgs4yFx583gmoETiAts1deeYozR5sVRhNA==
   dependencies:
     "@jest/types" "^27.1.1"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^27.2.0"
+    jest-message-util "^27.2.2"
     jest-util "^27.2.0"
     slash "^3.0.0"
 
-"@jest/core@^27.2.1":
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.2.1.tgz#93dc50e2aaba2c944e5765cf658dcd98d804c970"
-  integrity sha512-XcGt9UgPyzylThvezwUIMCNVp8xxN78Ic3WwhJZehZt4n2hPHR6Bd85A1nKFZBeqW58Vd+Cx/LaN6YL4n58KlA==
+"@jest/core@^27.2.2":
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.2.2.tgz#9eea16101b2f04bf799dcdbdf1792d4ef7553ecf"
+  integrity sha512-4b9km/h9pAGdCkwWYtbfoeiOtajOlGmr5rL1Eq6JCAVbOevOqxWHxJ6daWxRJW9eF6keXJoJ1H+uVAVcdZu8Bg==
   dependencies:
-    "@jest/console" "^27.2.0"
-    "@jest/reporters" "^27.2.1"
-    "@jest/test-result" "^27.2.0"
-    "@jest/transform" "^27.2.1"
+    "@jest/console" "^27.2.2"
+    "@jest/reporters" "^27.2.2"
+    "@jest/test-result" "^27.2.2"
+    "@jest/transform" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
@@ -405,64 +411,64 @@
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     jest-changed-files "^27.1.1"
-    jest-config "^27.2.1"
-    jest-haste-map "^27.2.0"
-    jest-message-util "^27.2.0"
+    jest-config "^27.2.2"
+    jest-haste-map "^27.2.2"
+    jest-message-util "^27.2.2"
     jest-regex-util "^27.0.6"
-    jest-resolve "^27.2.0"
-    jest-resolve-dependencies "^27.2.1"
-    jest-runner "^27.2.1"
-    jest-runtime "^27.2.1"
-    jest-snapshot "^27.2.1"
+    jest-resolve "^27.2.2"
+    jest-resolve-dependencies "^27.2.2"
+    jest-runner "^27.2.2"
+    jest-runtime "^27.2.2"
+    jest-snapshot "^27.2.2"
     jest-util "^27.2.0"
-    jest-validate "^27.2.0"
-    jest-watcher "^27.2.0"
+    jest-validate "^27.2.2"
+    jest-watcher "^27.2.2"
     micromatch "^4.0.4"
     p-each-series "^2.1.0"
     rimraf "^3.0.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.2.0.tgz#48d1dbfa65f8e4a5a5c6cbeb9c59d1a5c2776f6b"
-  integrity sha512-iPWmQI0wRIYSZX3wKu4FXHK4eIqkfq6n1DCDJS+v3uby7SOXrHvX4eiTBuEdSvtDRMTIH2kjrSkjHf/F9JIYyQ==
+"@jest/environment@^27.2.2":
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.2.2.tgz#2e57b9d2cc01028b0e35fae5833c1c63df4c5e41"
+  integrity sha512-gO9gVnZfn5ldeOJ5q+35Kru9QWGHEqZCB7W/M+8mD6uCwOGC9HR6mzpLSNRuDsxY/KhaGBYHpgFqtpe4Rl1gDQ==
   dependencies:
-    "@jest/fake-timers" "^27.2.0"
+    "@jest/fake-timers" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/node" "*"
     jest-mock "^27.1.1"
 
-"@jest/fake-timers@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.2.0.tgz#560841bc21ae7fbeff0cbff8de8f5cf43ad3561d"
-  integrity sha512-gSu3YHvQOoVaTWYGgHFB7IYFtcF2HBzX4l7s47VcjvkUgL4/FBnE20x7TNLa3W6ABERtGd5gStSwsA8bcn+c4w==
+"@jest/fake-timers@^27.2.2":
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.2.2.tgz#43e6f191c95ae74e95d0ddba2ecb8470b4a288b7"
+  integrity sha512-gDIIqs0yxyjyxEI9HlJ8SEJ4uCc8qr8BupG1Hcx7tvyk/SLocyXE63rFxL+HQ0ZLMvSyEcJUmYnvvHH1osWiGA==
   dependencies:
     "@jest/types" "^27.1.1"
     "@sinonjs/fake-timers" "^7.0.2"
     "@types/node" "*"
-    jest-message-util "^27.2.0"
+    jest-message-util "^27.2.2"
     jest-mock "^27.1.1"
     jest-util "^27.2.0"
 
-"@jest/globals@^27.2.1":
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.2.1.tgz#6842c70b6713fbe2fcaf89eac20d77eeeb0e282c"
-  integrity sha512-4P46Zr4cckSitsWtOMRvgMMn7mOKbBsQdYxHeGSIG3kpI4gNR2vk51balPulZHnBQCQb/XBptprtoSv1REfaew==
+"@jest/globals@^27.2.2":
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.2.2.tgz#df66aaafda5c69b2bb0dae548e3cfb345f549c31"
+  integrity sha512-fWa/Luwod1hyehnuep+zCnOTqTVvyc4HLUU/1VpFNOEu0tCWNSODyvKSSOjtb1bGOpCNjgaDcyjzo5f7rl6a7g==
   dependencies:
-    "@jest/environment" "^27.2.0"
+    "@jest/environment" "^27.2.2"
     "@jest/types" "^27.1.1"
-    expect "^27.2.1"
+    expect "^27.2.2"
 
-"@jest/reporters@^27.2.1":
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.2.1.tgz#2e43361b962e26975d40eafd7b4f14c70b4fe9a0"
-  integrity sha512-ILqR+bIIBlhaHjDtQR/0Z20YkKAQVM+NVRuJLaWFCoRx/rKQQSxG01ZLiLV0MsA6wkBHf6J9fzFuXp0k5l7epw==
+"@jest/reporters@^27.2.2":
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.2.2.tgz#e2d41cd9f8088676b81b9a9908cb1ba67bdbee78"
+  integrity sha512-ufwZ8XoLChEfPffDeVGroYbhbcYPom3zKDiv4Flhe97rr/o2IfUXoWkDUDoyJ3/V36RFIMjokSu0IJ/pbFtbHg==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^27.2.0"
-    "@jest/test-result" "^27.2.0"
-    "@jest/transform" "^27.2.1"
+    "@jest/console" "^27.2.2"
+    "@jest/test-result" "^27.2.2"
+    "@jest/transform" "^27.2.2"
     "@jest/types" "^27.1.1"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
@@ -474,10 +480,10 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.0.2"
-    jest-haste-map "^27.2.0"
-    jest-resolve "^27.2.0"
+    jest-haste-map "^27.2.2"
+    jest-resolve "^27.2.2"
     jest-util "^27.2.0"
-    jest-worker "^27.2.0"
+    jest-worker "^27.2.2"
     slash "^3.0.0"
     source-map "^0.6.0"
     string-length "^4.0.1"
@@ -493,30 +499,30 @@
     graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
-"@jest/test-result@^27.2.0":
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.2.0.tgz#377b46a41a6415dd4839fd0bed67b89fecea6b20"
-  integrity sha512-JPPqn8h0RGr4HyeY1Km+FivDIjTFzDROU46iAvzVjD42ooGwYoqYO/MQTilhfajdz6jpVnnphFrKZI5OYrBONA==
+"@jest/test-result@^27.2.2":
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.2.2.tgz#cd4ba1ca9b0521e463bd4b32349ba1842277563b"
+  integrity sha512-yENoDEoWlEFI7l5z7UYyJb/y5Q8RqbPd4neAVhKr6l+vVaQOPKf8V/IseSMJI9+urDUIxgssA7RGNyCRhGjZvw==
   dependencies:
-    "@jest/console" "^27.2.0"
+    "@jest/console" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^27.2.1":
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.2.1.tgz#1682cd3a16198fa358ff9565b0d2792919f36562"
-  integrity sha512-fWcEgWQXgvU4DFY5YHfQsGwqfJWyuCUzdOzLZTYtyLB3WK1mFPQGYAszM7mCEZjyVon5XRuCa+2/+hif/uMucQ==
+"@jest/test-sequencer@^27.2.2":
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.2.2.tgz#9a6d735317f525741a5913ee3cdefeffc9b0aba6"
+  integrity sha512-YnJqwNQP2Zeu0S4TMqkxg6NN7Y1EFq715n/nThNKrvIS9wmRZjDt2XYqsHbuvhAFjshi0iKDQ813NewFITBH+Q==
   dependencies:
-    "@jest/test-result" "^27.2.0"
+    "@jest/test-result" "^27.2.2"
     graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.0"
-    jest-runtime "^27.2.1"
+    jest-haste-map "^27.2.2"
+    jest-runtime "^27.2.2"
 
-"@jest/transform@^27.2.1":
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.2.1.tgz#743443adb84b3b7419951fc702515ce20ba6285e"
-  integrity sha512-xmB5vh81KK8DiiCMtI5vI59mP+GggNmc9BiN+fg4mKdQHV369+WuZc1Lq2xWFCOCsRPHt24D9h7Idp4YaMB1Ww==
+"@jest/transform@^27.2.2":
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.2.2.tgz#89b16b4de84354fb48d15712b3ea34cadc1cb600"
+  integrity sha512-l4Z/7PpajrOjCiXLWLfMY7fgljY0H8EwW7qdzPXXuv2aQF8kY2+Uyj3O+9Popnaw1V7JCw32L8EeI/thqFDkPA==
   dependencies:
     "@babel/core" "^7.1.0"
     "@jest/types" "^27.1.1"
@@ -525,7 +531,7 @@
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.0"
+    jest-haste-map "^27.2.2"
     jest-regex-util "^27.0.6"
     jest-util "^27.2.0"
     micromatch "^4.0.4"
@@ -1008,9 +1014,9 @@
     "@types/lodash" "*"
 
 "@types/lodash@*", "@types/lodash@^4.14.162":
-  version "4.14.173"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.173.tgz#9d3b674c67a26cf673756f6aca7b429f237f91ed"
-  integrity sha512-vv0CAYoaEjCw/mLy96GBTnRoZrSxkGE0BKzKimdR8P3OzrNYNvBgtW7p055A+E8C31vXNUhWKoFCbhq7gbyhFg==
+  version "4.14.175"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.175.tgz#b78dfa959192b01fae0ad90e166478769b215f45"
+  integrity sha512-XmdEOrKQ8a1Y/yxQFOMbC47G/V2VDO1GvMRnl4O75M4GW/abC5tnfzadQYkqEveqRM1dEJGFFegfPNA2vvx2iw==
 
 "@types/long@^4.0.0", "@types/long@^4.0.1":
   version "4.0.1"
@@ -1023,9 +1029,9 @@
   integrity sha512-shRZ7XnYFD/8n8zSjKvFdto1QNSf4tONZIlNEZGrJe8GsOE8DL/hG1Hbl8gZlfLnjS7+f5tZGIaTgfpyW38h4w==
 
 "@types/node@*", "@types/node@>=13.7.0":
-  version "16.9.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.6.tgz#040a64d7faf9e5d9e940357125f0963012e66f04"
-  integrity sha512-YHUZhBOMTM3mjFkXVcK+WwAcYmyhe1wL4lfqNtzI0b3qAy7yuSetnM7QJazgE5PFmgVTNGiLOgRFfJMqW7XpSQ==
+  version "16.10.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.1.tgz#f3647623199ca920960006b3dccf633ea905f243"
+  integrity sha512-4/Z9DMPKFexZj/Gn3LylFgamNKHm4K3QDi0gz9B26Uk0c8izYf97B5fxfpspMNkWlFupblKM/nV8+NA9Ffvr+w==
 
 "@types/node@^10.1.0":
   version "10.17.60"
@@ -1033,14 +1039,14 @@
   integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
 
 "@types/node@^14.14.20":
-  version "14.17.18"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.18.tgz#0198489a751005f71217744aa966cd1f29447c81"
-  integrity sha512-haYyibw4pbteEhkSg0xdDLAI3679L75EJ799ymVrPxOA922bPx3ML59SoDsQ//rHlvqpu+e36kcbR3XRQtFblA==
+  version "14.17.19"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.19.tgz#7341e9ac1b5d748d7a3ddc04336ed536a6f91c31"
+  integrity sha512-jjYI6NkyfXykucU6ELEoT64QyKOdvaA6enOqKtP4xUsGY0X0ZUZz29fUmrTRo+7v7c6TgDu82q3GHHaCEkqZwA==
 
 "@types/prettier@^2.1.5":
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.2.tgz#fc8c2825e4ed2142473b4a81064e6e081463d1b3"
-  integrity sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.1.tgz#e1303048d5389563e130f5bdd89d37a99acb75eb"
+  integrity sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw==
 
 "@types/prop-types@*":
   version "15.7.4"
@@ -1117,72 +1123,73 @@
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^4.22.0":
-  version "4.31.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.2.tgz#9f41efaee32cdab7ace94b15bd19b756dd099b0a"
-  integrity sha512-w63SCQ4bIwWN/+3FxzpnWrDjQRXVEGiTt9tJTRptRXeFvdZc/wLiz3FQUwNQ2CVoRGI6KUWMNUj/pk63noUfcA==
+  version "4.32.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.32.0.tgz#46d2370ae9311092f2a6f7246d28357daf2d4e89"
+  integrity sha512-+OWTuWRSbWI1KDK8iEyG/6uK2rTm3kpS38wuVifGUTDB6kjEuNrzBI1MUtxnkneuWG/23QehABe2zHHrj+4yuA==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.31.2"
-    "@typescript-eslint/scope-manager" "4.31.2"
+    "@typescript-eslint/experimental-utils" "4.32.0"
+    "@typescript-eslint/scope-manager" "4.32.0"
     debug "^4.3.1"
     functional-red-black-tree "^1.0.1"
+    ignore "^5.1.8"
     regexpp "^3.1.0"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@4.31.2":
-  version "4.31.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.2.tgz#98727a9c1e977dd5d20c8705e69cd3c2a86553fa"
-  integrity sha512-3tm2T4nyA970yQ6R3JZV9l0yilE2FedYg8dcXrTar34zC9r6JB7WyBQbpIVongKPlhEMjhQ01qkwrzWy38Bk1Q==
+"@typescript-eslint/experimental-utils@4.32.0":
+  version "4.32.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.32.0.tgz#53a8267d16ca5a79134739129871966c56a59dc4"
+  integrity sha512-WLoXcc+cQufxRYjTWr4kFt0DyEv6hDgSaFqYhIzQZ05cF+kXfqXdUh+//kgquPJVUBbL3oQGKQxwPbLxHRqm6A==
   dependencies:
     "@types/json-schema" "^7.0.7"
-    "@typescript-eslint/scope-manager" "4.31.2"
-    "@typescript-eslint/types" "4.31.2"
-    "@typescript-eslint/typescript-estree" "4.31.2"
+    "@typescript-eslint/scope-manager" "4.32.0"
+    "@typescript-eslint/types" "4.32.0"
+    "@typescript-eslint/typescript-estree" "4.32.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
 "@typescript-eslint/parser@^4.22.0":
-  version "4.31.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.31.2.tgz#54aa75986e3302d91eff2bbbaa6ecfa8084e9c34"
-  integrity sha512-EcdO0E7M/sv23S/rLvenHkb58l3XhuSZzKf6DBvLgHqOYdL6YFMYVtreGFWirxaU2mS1GYDby3Lyxco7X5+Vjw==
+  version "4.32.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.32.0.tgz#751ecca0e2fecd3d44484a9b3049ffc1871616e5"
+  integrity sha512-lhtYqQ2iEPV5JqV7K+uOVlPePjClj4dOw7K4/Z1F2yvjIUvyr13yJnDzkK6uon4BjHYuHy3EG0c2Z9jEhFk56w==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.31.2"
-    "@typescript-eslint/types" "4.31.2"
-    "@typescript-eslint/typescript-estree" "4.31.2"
+    "@typescript-eslint/scope-manager" "4.32.0"
+    "@typescript-eslint/types" "4.32.0"
+    "@typescript-eslint/typescript-estree" "4.32.0"
     debug "^4.3.1"
 
-"@typescript-eslint/scope-manager@4.31.2":
-  version "4.31.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.31.2.tgz#1d528cb3ed3bcd88019c20a57c18b897b073923a"
-  integrity sha512-2JGwudpFoR/3Czq6mPpE8zBPYdHWFGL6lUNIGolbKQeSNv4EAiHaR5GVDQaLA0FwgcdcMtRk+SBJbFGL7+La5w==
+"@typescript-eslint/scope-manager@4.32.0":
+  version "4.32.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz#e03c8668f8b954072b3f944d5b799c0c9225a7d5"
+  integrity sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w==
   dependencies:
-    "@typescript-eslint/types" "4.31.2"
-    "@typescript-eslint/visitor-keys" "4.31.2"
+    "@typescript-eslint/types" "4.32.0"
+    "@typescript-eslint/visitor-keys" "4.32.0"
 
-"@typescript-eslint/types@4.31.2":
-  version "4.31.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.2.tgz#2aea7177d6d744521a168ed4668eddbd912dfadf"
-  integrity sha512-kWiTTBCTKEdBGrZKwFvOlGNcAsKGJSBc8xLvSjSppFO88AqGxGNYtF36EuEYG6XZ9vT0xX8RNiHbQUKglbSi1w==
+"@typescript-eslint/types@4.32.0":
+  version "4.32.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.32.0.tgz#52c633c18da47aee09449144bf59565ab36df00d"
+  integrity sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w==
 
-"@typescript-eslint/typescript-estree@4.31.2":
-  version "4.31.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.2.tgz#abfd50594d8056b37e7428df3b2d185ef2d0060c"
-  integrity sha512-ieBq8U9at6PvaC7/Z6oe8D3czeW5d//Fo1xkF/s9394VR0bg/UaMYPdARiWyKX+lLEjY3w/FNZJxitMsiWv+wA==
+"@typescript-eslint/typescript-estree@4.32.0":
+  version "4.32.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.32.0.tgz#db00ccc41ccedc8d7367ea3f50c6994b8efa9f3b"
+  integrity sha512-tRYCgJ3g1UjMw1cGG8Yn1KzOzNlQ6u1h9AmEtPhb5V5a1TmiHWcRyF/Ic+91M4f43QeChyYlVTcf3DvDTZR9vw==
   dependencies:
-    "@typescript-eslint/types" "4.31.2"
-    "@typescript-eslint/visitor-keys" "4.31.2"
+    "@typescript-eslint/types" "4.32.0"
+    "@typescript-eslint/visitor-keys" "4.32.0"
     debug "^4.3.1"
     globby "^11.0.3"
     is-glob "^4.0.1"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@4.31.2":
-  version "4.31.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.2.tgz#7d5b4a4705db7fe59ecffb273c1d082760f635cc"
-  integrity sha512-PrBId7EQq2Nibns7dd/ch6S6/M4/iwLM9McbgeEbCXfxdwRUNxJ4UNreJ6Gh3fI2GNKNrWnQxKL7oCPmngKBug==
+"@typescript-eslint/visitor-keys@4.32.0":
+  version "4.32.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz#455ba8b51242f2722a497ffae29313f33b14cb7f"
+  integrity sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw==
   dependencies:
-    "@typescript-eslint/types" "4.31.2"
+    "@typescript-eslint/types" "4.32.0"
     eslint-visitor-keys "^2.0.0"
 
 "@yarnpkg/lockfile@^1.1.0":
@@ -1267,7 +1274,7 @@ ansi-escapes@^4.2.1:
   dependencies:
     type-fest "^0.21.3"
 
-ansi-regex@^5.0.0:
+ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -1331,12 +1338,12 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-babel-jest@^27.2.1:
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.2.1.tgz#48edfa5cf8d59ab293da94321a369ccc7b67a4b1"
-  integrity sha512-kkaekSJHew1zfDW3cA2QiSBPg4uiLpiW0OwJKqFv0r2/mFgym/IBn7hxPntL6FvS66G/ROh+lz4pRiCJAH1/UQ==
+babel-jest@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.2.2.tgz#d7e96f3f6f56be692de948092697e1bfea7f1184"
+  integrity sha512-XNFNNfGKnZXzhej7TleVP4s9ktH5JjRW8Rmcbb223JJwKB/gmTyeWN0JfiPtSgnjIjDXtKNoixiy0QUHtv3vFA==
   dependencies:
-    "@jest/transform" "^27.2.1"
+    "@jest/transform" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/babel__core" "^7.1.14"
     babel-plugin-istanbul "^6.0.0"
@@ -1481,9 +1488,11 @@ camelcase@^6.2.0:
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
 caniuse-lite@^1.0.30001259:
-  version "1.0.30001259"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001259.tgz#ae21691d3da9c4be6144403ac40f71d9f6efd790"
-  integrity sha512-V7mQTFhjITxuk9zBpI6nYsiTXhcPe05l+364nZjK7MFK/E7ibvYBSAXr4YcA6oPR8j3ZLM/LN+lUqUVAQEUZFg==
+  version "1.0.30001260"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001260.tgz#e3be3f34ddad735ca4a2736fa9e768ef34316270"
+  integrity sha512-Fhjc/k8725ItmrvW5QomzxLeojewxvqiYCKeFcfFEhut28IVLdpHU19dneOmltZQIE5HNbawj1HYD+1f2bM1Dg==
+  dependencies:
+    nanocolors "^0.1.0"
 
 catharsis@^0.9.0:
   version "0.9.0"
@@ -1820,9 +1829,9 @@ d3-scale-chromatic@3:
     d3-interpolate "1 - 3"
 
 d3-scale@4:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.1.tgz#c65aa7a357e4f58954a66e1edacc712bab4b1034"
-  integrity sha512-akUAsUujCFnw6Sf1dF7y/FXTxz+VvEIOB3ValKtLhNrzFp8q5wPO3VCAmsbCLJWRTxyJCZDoooodjOI1plFqlw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396"
+  integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==
   dependencies:
     d3-array "2.10.0 - 3"
     d3-format "1 - 3"
@@ -1884,9 +1893,9 @@ d3-zoom@3:
     d3-transition "2 - 3"
 
 d3@^7.0.0:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-7.0.3.tgz#5c100c0522fedadc2aec43243b16e881e8c07143"
-  integrity sha512-BEQCpEXI+Z9OnnlXLaS6txoYZZvvXuRyjZoudPuAnWGVOzHxGWC0TL8XRUs7V7IeZQPLfvGztcl54+jgOe122g==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-7.0.4.tgz#37dfeb3b526f64a0de2ddb705ea61649325207bd"
+  integrity sha512-ruRiyPYZEGeJBOOjVS5pHliNUZM2HAllEY7HKB2ff+9ENxOti4N+S+WZqo9ggUMr8tSPMm+riqKpJd1oYEDN5Q==
   dependencies:
     d3-array "3"
     d3-axis "3"
@@ -2032,9 +2041,9 @@ domexception@^2.0.1:
     webidl-conversions "^5.0.0"
 
 electron-to-chromium@^1.3.846:
-  version "1.3.846"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.846.tgz#a55fd59613dbcaed609e965e3e88f42b08c401d3"
-  integrity sha512-2jtSwgyiRzybHRxrc2nKI+39wH3AwQgn+sogQ+q814gv8hIFwrcZbV07Ea9f8AmK0ufPVZUvvAG1uZJ+obV4Jw==
+  version "1.3.850"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.850.tgz#c56c72abfeab051b4b328beb894461c5912d0456"
+  integrity sha512-ZzkDcdzePeF4dhoGZQT77V2CyJOpwfTZEOg4h0x6R/jQhGt/rIRpbRyVreWLtD7B/WsVxo91URm2WxMKR9JQZA==
 
 emittery@^0.8.1:
   version "0.8.1"
@@ -2241,16 +2250,16 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
-expect@^27.2.1:
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-27.2.1.tgz#5f882b308716618613f0106a488b46c303908157"
-  integrity sha512-ekOA2mBtT2phxcoPVHCXIzbJxCvRXhx2fr7m28IgGdZxUOh8UvxvoRz1FcPlfgZMpE92biHB6woIcAKXqR28hA==
+expect@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-27.2.2.tgz#65c414697415c0867ef588813e9c729ebab8a9a9"
+  integrity sha512-sjHBeEk47/eshN9oLbvPJZMgHQihOXXQzSMPCJ4MqKShbU9HOVFSNHEEU4dp4ujzxFSiNvPFzB2AMOFmkizhvA==
   dependencies:
     "@jest/types" "^27.1.1"
     ansi-styles "^5.0.0"
     jest-get-type "^27.0.6"
-    jest-matcher-utils "^27.2.0"
-    jest-message-util "^27.2.0"
+    jest-matcher-utils "^27.2.2"
+    jest-message-util "^27.2.2"
     jest-regex-util "^27.0.6"
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
@@ -2401,9 +2410,9 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
     is-glob "^4.0.1"
 
 glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -2436,6 +2445,11 @@ globby@^11.0.3:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
+google-protobuf@^3.6.1:
+  version "3.18.0"
+  resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.18.0.tgz#687449d8e858305d658dc1145852c306d8222f5a"
+  integrity sha512-WlaQWRkUOo/lm9uTgNH6nk9IQt814RggWPzKBfnAVewOFzSzRUSmS1yUWRT6ixW1vS7er5p6tmLSmwzpPpmc8A==
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.4:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
@@ -2516,7 +2530,7 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.4:
+ignore@^5.1.4, ignore@^5.1.8:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
@@ -2587,9 +2601,9 @@ is-ci@^3.0.0:
     ci-info "^3.1.1"
 
 is-core-module@^2.2.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
-  integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3"
+  integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==
   dependencies:
     has "^1.0.3"
 
@@ -2614,9 +2628,9 @@ is-generator-fn@^2.0.0:
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.2.tgz#859fc2e731e58c902f99fcabccb75a7dd07d29d8"
+  integrity sha512-ZZTOjRcDjuAAAv2cTBQP/lL59ZTArx77+7UzHdWW/XB1mrfp7DEaVpKmZ0XIzx+M7AxfhKcqV+nMetUQmFifwg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -2653,9 +2667,9 @@ isexe@^2.0.0:
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.1.tgz#e8900b3ed6069759229cf30f7067388d148aeb5e"
+  integrity sha512-GvCYYTxaCPqwMjobtVcVKvSHtAGe48MNhGjpK8LtVF8K0ISX7hCKl85LgtuaSneWVyQmaGcW3iXVV3GaZSLpmQ==
 
 istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
   version "4.0.3"
@@ -2702,75 +2716,75 @@ jest-changed-files@^27.1.1:
     execa "^5.0.0"
     throat "^6.0.1"
 
-jest-circus@^27.2.1:
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.2.1.tgz#c5166052b328c0df932cdaf89f5982085e7b4812"
-  integrity sha512-9q/8X8DgJmW8IqXsJNnS2E28iarx990hf6D+frS3P0lB+avhFDD33alLwZzKgm45u0wvEi6iFh43WjNbp5fhjw==
+jest-circus@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.2.2.tgz#a3647082f3eba1226f7664a36a2b7ebf45ceaf7b"
+  integrity sha512-8txlqs0EDrvPasCgwfLMkG0l3F4FxqQa6lxOsvYfOl04eSJjRw3F4gk9shakuC00nMD+VT+SMtFYXxe64f0VZw==
   dependencies:
-    "@jest/environment" "^27.2.0"
-    "@jest/test-result" "^27.2.0"
+    "@jest/environment" "^27.2.2"
+    "@jest/test-result" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
     dedent "^0.7.0"
-    expect "^27.2.1"
+    expect "^27.2.2"
     is-generator-fn "^2.0.0"
-    jest-each "^27.2.0"
-    jest-matcher-utils "^27.2.0"
-    jest-message-util "^27.2.0"
-    jest-runtime "^27.2.1"
-    jest-snapshot "^27.2.1"
+    jest-each "^27.2.2"
+    jest-matcher-utils "^27.2.2"
+    jest-message-util "^27.2.2"
+    jest-runtime "^27.2.2"
+    jest-snapshot "^27.2.2"
     jest-util "^27.2.0"
-    pretty-format "^27.2.0"
+    pretty-format "^27.2.2"
     slash "^3.0.0"
     stack-utils "^2.0.3"
     throat "^6.0.1"
 
 jest-cli@^27.0.0-next.7:
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.2.1.tgz#031e887245945864cc6ed8605c939f1937858c09"
-  integrity sha512-IfxuGkBZS/ogY7yFvvD1dFidzQRXlSBHtUZQ3UTIHydzNMF4/ZRTdGFso6HkbCkemwLh4hnNybONexEqWmYwjw==
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.2.2.tgz#0973a717c109f23de642b63486f3cb71c5a971be"
+  integrity sha512-jbEythw22LR/IHYgNrjWdO74wO9wyujCxTMjbky0GLav4rC4y6qDQr4TqQ2JPP51eDYJ2awVn83advEVSs5Brg==
   dependencies:
-    "@jest/core" "^27.2.1"
-    "@jest/test-result" "^27.2.0"
+    "@jest/core" "^27.2.2"
+    "@jest/test-result" "^27.2.2"
     "@jest/types" "^27.1.1"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     import-local "^3.0.2"
-    jest-config "^27.2.1"
+    jest-config "^27.2.2"
     jest-util "^27.2.0"
-    jest-validate "^27.2.0"
+    jest-validate "^27.2.2"
     prompts "^2.0.1"
     yargs "^16.0.3"
 
-jest-config@^27.2.1:
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.2.1.tgz#2e727e023fc4b77a9f067a40c5448a939aa8386b"
-  integrity sha512-BAOemP8udmFw9nkgaLAac7vXORdvrt4yrJWoh7uYb0nPZeSsu0kGwJU18SwtY4paq9fed5OgAssC3A+Bf4WMQA==
+jest-config@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.2.2.tgz#970d8466c60ac106ac9d7d0b8dcf3ff150fa713a"
+  integrity sha512-2nhms3lp52ZpU0636bB6zIFHjDVtYxzFQIOHZjBFUeXcb6b41sEkWojbHaJ4FEIO44UbccTLa7tvNpiFCgPE7w==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^27.2.1"
+    "@jest/test-sequencer" "^27.2.2"
     "@jest/types" "^27.1.1"
-    babel-jest "^27.2.1"
+    babel-jest "^27.2.2"
     chalk "^4.0.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
     graceful-fs "^4.2.4"
     is-ci "^3.0.0"
-    jest-circus "^27.2.1"
-    jest-environment-jsdom "^27.2.0"
-    jest-environment-node "^27.2.0"
+    jest-circus "^27.2.2"
+    jest-environment-jsdom "^27.2.2"
+    jest-environment-node "^27.2.2"
     jest-get-type "^27.0.6"
-    jest-jasmine2 "^27.2.1"
+    jest-jasmine2 "^27.2.2"
     jest-regex-util "^27.0.6"
-    jest-resolve "^27.2.0"
-    jest-runner "^27.2.1"
+    jest-resolve "^27.2.2"
+    jest-runner "^27.2.2"
     jest-util "^27.2.0"
-    jest-validate "^27.2.0"
+    jest-validate "^27.2.2"
     micromatch "^4.0.4"
-    pretty-format "^27.2.0"
+    pretty-format "^27.2.2"
 
 jest-diff@^26.0.0:
   version "26.6.2"
@@ -2782,15 +2796,15 @@ jest-diff@^26.0.0:
     jest-get-type "^26.3.0"
     pretty-format "^26.6.2"
 
-jest-diff@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.2.0.tgz#bda761c360f751bab1e7a2fe2fc2b0a35ce8518c"
-  integrity sha512-QSO9WC6btFYWtRJ3Hac0sRrkspf7B01mGrrQEiCW6TobtViJ9RWL0EmOs/WnBsZDsI/Y2IoSHZA2x6offu0sYw==
+jest-diff@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.2.2.tgz#3992fe5f55f209676c5d3fd956e3f3d4145f76b8"
+  integrity sha512-o3LaDbQDSaMJif4yztJAULI4xVatxbBasbKLbEw3K8CiRdDdbxMrLArS9EKDHQFYh6Tgfrm1PC2mIYR1xhu0hQ==
   dependencies:
     chalk "^4.0.0"
     diff-sequences "^27.0.6"
     jest-get-type "^27.0.6"
-    pretty-format "^27.2.0"
+    pretty-format "^27.2.2"
 
 jest-docblock@^27.0.6:
   version "27.0.6"
@@ -2799,37 +2813,37 @@ jest-docblock@^27.0.6:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.2.0.tgz#4c531c7223de289429fc7b2473a86e653c86d61f"
-  integrity sha512-biDmmUQjg+HZOB7MfY2RHSFL3j418nMoC3TK3pGAj880fQQSxvQe1y2Wy23JJJNUlk6YXiGU0yWy86Le1HBPmA==
+jest-each@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.2.2.tgz#62da8dd68b9fc61ab6e9e344692eeb1251f8c91d"
+  integrity sha512-ZCDhkvwHeXHsxoFxvW43fabL18iLiVDxaipG5XWG7dSd+XWXXpzMQvBWYT9Wvzhg5x4hvrLQ24LtiOKw3I09xA==
   dependencies:
     "@jest/types" "^27.1.1"
     chalk "^4.0.0"
     jest-get-type "^27.0.6"
     jest-util "^27.2.0"
-    pretty-format "^27.2.0"
+    pretty-format "^27.2.2"
 
-jest-environment-jsdom@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.2.0.tgz#c654dfae50ca2272c2a2e2bb95ff0af298283a3c"
-  integrity sha512-wNQJi6Rd/AkUWqTc4gWhuTIFPo7tlMK0RPZXeM6AqRHZA3D3vwvTa9ktAktyVyWYmUoXdYstOfyYMG3w4jt7eA==
+jest-environment-jsdom@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.2.2.tgz#fb3075b4be6289961dcc4942e98f1862b3a8c4cb"
+  integrity sha512-mzCLEdnpGWDJmNB6WIPLlZM+hpXdeiya9TryiByqcUdpliNV1O+LGC2SewzjmB4IblabGfvr3KcPN0Nme2wnDw==
   dependencies:
-    "@jest/environment" "^27.2.0"
-    "@jest/fake-timers" "^27.2.0"
+    "@jest/environment" "^27.2.2"
+    "@jest/fake-timers" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/node" "*"
     jest-mock "^27.1.1"
     jest-util "^27.2.0"
     jsdom "^16.6.0"
 
-jest-environment-node@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.2.0.tgz#73ef2151cb62206669becb94cd84f33276252de5"
-  integrity sha512-WbW+vdM4u88iy6Q3ftUEQOSgMPtSgjm3qixYYK2AKEuqmFO2zmACTw1vFUB0qI/QN88X6hA6ZkVKIdIWWzz+yg==
+jest-environment-node@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.2.2.tgz#60ba7d7fee956f68964d47a785d0195ce125aaa3"
+  integrity sha512-XgUscWs6H6UNqC96/QJjmUGZzzpql/JyprLSXVu7wkgM8tjbJdEkSqwrVAvJPm1yu526ImrmsIoh2BTHxkwL/g==
   dependencies:
-    "@jest/environment" "^27.2.0"
-    "@jest/fake-timers" "^27.2.0"
+    "@jest/environment" "^27.2.2"
+    "@jest/fake-timers" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/node" "*"
     jest-mock "^27.1.1"
@@ -2845,10 +2859,10 @@ jest-get-type@^27.0.6:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz#0eb5c7f755854279ce9b68a9f1a4122f69047cfe"
   integrity sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==
 
-jest-haste-map@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.2.0.tgz#703b3a473e3f2e27d75ab07864ffd7bbaad0d75e"
-  integrity sha512-laFet7QkNlWjwZtMGHCucLvF8o9PAh2cgePRck1+uadSM4E4XH9J4gnx4do+a6do8ZV5XHNEAXEkIoNg5XUH2Q==
+jest-haste-map@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.2.2.tgz#81ccb57b1e1cd513aaaadf5016aad5dab0ede552"
+  integrity sha512-kaKiq+GbAvk6/sq++Ymor4Vzk6+lr0vbKs2HDVPdkKsHX2lIJRyvhypZG/QsNfQnROKWIZSpUpGuv2HySSosvA==
   dependencies:
     "@jest/types" "^27.1.1"
     "@types/graceful-fs" "^4.1.2"
@@ -2859,58 +2873,58 @@ jest-haste-map@^27.2.0:
     jest-regex-util "^27.0.6"
     jest-serializer "^27.0.6"
     jest-util "^27.2.0"
-    jest-worker "^27.2.0"
+    jest-worker "^27.2.2"
     micromatch "^4.0.4"
     walker "^1.0.7"
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-jasmine2@^27.2.1:
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.2.1.tgz#30ee71f38670a621ecf3b6dcb89875933f780de6"
-  integrity sha512-3vytj3+S49+XYsxGJyjlchDo4xblYzjDY4XK7pV2IAdspbMFOpmeNMOeDonYuvlbUtcV8yrFLA6XtliXapDmMA==
+jest-jasmine2@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.2.2.tgz#bf87c8820a192c86b65a7c4c1a54caae52124f04"
+  integrity sha512-SczhZNfmZID9HbJ1GHhO4EzeL/PMRGeAUw23ddPUdd6kFijEZpT2yOxyNCBUKAsVQ/14OB60kjgnbuFOboZUNg==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^27.2.0"
+    "@jest/environment" "^27.2.2"
     "@jest/source-map" "^27.0.6"
-    "@jest/test-result" "^27.2.0"
+    "@jest/test-result" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
-    expect "^27.2.1"
+    expect "^27.2.2"
     is-generator-fn "^2.0.0"
-    jest-each "^27.2.0"
-    jest-matcher-utils "^27.2.0"
-    jest-message-util "^27.2.0"
-    jest-runtime "^27.2.1"
-    jest-snapshot "^27.2.1"
+    jest-each "^27.2.2"
+    jest-matcher-utils "^27.2.2"
+    jest-message-util "^27.2.2"
+    jest-runtime "^27.2.2"
+    jest-snapshot "^27.2.2"
     jest-util "^27.2.0"
-    pretty-format "^27.2.0"
+    pretty-format "^27.2.2"
     throat "^6.0.1"
 
-jest-leak-detector@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.2.0.tgz#9a7ca2dad1a21c4e49ad2a8ad7f1214ffdb86a28"
-  integrity sha512-e91BIEmbZw5+MHkB4Hnrq7S86coTxUMCkz4n7DLmQYvl9pEKmRx9H/JFH87bBqbIU5B2Ju1soKxRWX6/eGFGpA==
+jest-leak-detector@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.2.2.tgz#5af54273efcf5114ad406f4448860c2396319e12"
+  integrity sha512-fQIYKkhXUs/4EpE4wO1AVsv7aNH3o0km1BGq3vxvSfYdwG9GLMf+b0z/ghLmBYNxb+tVpm/zv2caoKm3GfTazg==
   dependencies:
     jest-get-type "^27.0.6"
-    pretty-format "^27.2.0"
+    pretty-format "^27.2.2"
 
-jest-matcher-utils@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.2.0.tgz#b4d224ab88655d5fab64b96b989ac349e2f5da43"
-  integrity sha512-F+LG3iTwJ0gPjxBX6HCyrARFXq6jjiqhwBQeskkJQgSLeF1j6ui1RTV08SR7O51XTUhtc8zqpDj8iCG4RGmdKw==
+jest-matcher-utils@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.2.2.tgz#a6c0a10dce6bfe8250bbed3e2f1b206568d73bde"
+  integrity sha512-xN3wT4p2i9DGB6zmL3XxYp5lJmq9Q6ff8XKlMtVVBS2SAshmgsPBALJFQ8dWRd2G/xf5q/N0SD0Mipt8QBA26A==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^27.2.0"
+    jest-diff "^27.2.2"
     jest-get-type "^27.0.6"
-    pretty-format "^27.2.0"
+    pretty-format "^27.2.2"
 
-jest-message-util@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.2.0.tgz#2f65c71df55267208686b1d7514e18106c91ceaf"
-  integrity sha512-y+sfT/94CiP8rKXgwCOzO1mUazIEdEhrLjuiu+RKmCP+8O/TJTSne9dqQRbFIHBtlR2+q7cddJlWGir8UATu5w==
+jest-message-util@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.2.2.tgz#cdbb1b82dfe5f601ae35f5c6a28bf7823e6bcf99"
+  integrity sha512-/iS5/m2FSF7Nn6APFoxFymJpyhB/gPf0CJa7uFSkbYaWvrADUfQ9NTsuyjpszKErOS2/huFs44ysWhlQTKvL8Q==
   dependencies:
     "@babel/code-frame" "^7.12.13"
     "@jest/types" "^27.1.1"
@@ -2918,7 +2932,7 @@ jest-message-util@^27.2.0:
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     micromatch "^4.0.4"
-    pretty-format "^27.2.0"
+    pretty-format "^27.2.2"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
@@ -2940,40 +2954,40 @@ jest-regex-util@^27.0.6:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5"
   integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==
 
-jest-resolve-dependencies@^27.2.1:
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.2.1.tgz#239be969ece749d4dc2e1efcf3d2b86c99525c2e"
-  integrity sha512-9bKEwmz4YshGPjGZAVZOVw6jt7pq2/FjWJmyhnWhvDuiRCHVZBcJhycinX+e/EJ7jafsq26bTpzBIQas3xql1g==
+jest-resolve-dependencies@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.2.2.tgz#7467c67cb8b5630ec28e2f0c72a0b62e56668083"
+  integrity sha512-nvJS+DyY51HHdZnMIwXg7fimQ5ylFx4+quQXspQXde2rXYy+4v75UYoX/J65Ln8mKCNc6YF8HEhfGaRBOrxxHg==
   dependencies:
     "@jest/types" "^27.1.1"
     jest-regex-util "^27.0.6"
-    jest-snapshot "^27.2.1"
+    jest-snapshot "^27.2.2"
 
-jest-resolve@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.2.0.tgz#f5d053693ab3806ec2f778e6df8b0aa4cfaef95f"
-  integrity sha512-v09p9Ib/VtpHM6Cz+i9lEAv1Z/M5NVxsyghRHRMEUOqwPQs3zwTdwp1xS3O/k5LocjKiGS0OTaJoBSpjbM2Jlw==
+jest-resolve@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.2.2.tgz#1bad93dbc6c20edb874e6720e82e4e48900b120b"
+  integrity sha512-tfbHcBs/hJTb3fPQ/3hLWR+TsLNTzzK98TU+zIAsrL9nNzWfWROwopUOmiSUqmHMZW5t9au/433kSF2/Af+tTw==
   dependencies:
     "@jest/types" "^27.1.1"
     chalk "^4.0.0"
     escalade "^3.1.1"
     graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.0"
+    jest-haste-map "^27.2.2"
     jest-pnp-resolver "^1.2.2"
     jest-util "^27.2.0"
-    jest-validate "^27.2.0"
+    jest-validate "^27.2.2"
     resolve "^1.20.0"
     slash "^3.0.0"
 
-jest-runner@^27.2.1:
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.2.1.tgz#3443b1fc08b8a50f305dfc2d41dd2badf335843b"
-  integrity sha512-USHitkUUzcB3Y5mRdzlp+KHgRRR2VsXDq5OeATuDmq1qXfT/RwwnQykUhn+KVx3FotxK3pID74UY7o6HYIR8vA==
+jest-runner@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.2.2.tgz#e719a8ce2a16575677105f692fdff7cd00602325"
+  integrity sha512-+bUFwBq+yTnvsOFuxetoQtkuOnqdAk2YuIGjlLmc7xLAXn/V1vjhXrLencgij0BUTTUvG9Aul3+5XDss4Wa8Eg==
   dependencies:
-    "@jest/console" "^27.2.0"
-    "@jest/environment" "^27.2.0"
-    "@jest/test-result" "^27.2.0"
-    "@jest/transform" "^27.2.1"
+    "@jest/console" "^27.2.2"
+    "@jest/environment" "^27.2.2"
+    "@jest/test-result" "^27.2.2"
+    "@jest/transform" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/node" "*"
     chalk "^4.0.0"
@@ -2981,30 +2995,30 @@ jest-runner@^27.2.1:
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     jest-docblock "^27.0.6"
-    jest-environment-jsdom "^27.2.0"
-    jest-environment-node "^27.2.0"
-    jest-haste-map "^27.2.0"
-    jest-leak-detector "^27.2.0"
-    jest-message-util "^27.2.0"
-    jest-resolve "^27.2.0"
-    jest-runtime "^27.2.1"
+    jest-environment-jsdom "^27.2.2"
+    jest-environment-node "^27.2.2"
+    jest-haste-map "^27.2.2"
+    jest-leak-detector "^27.2.2"
+    jest-message-util "^27.2.2"
+    jest-resolve "^27.2.2"
+    jest-runtime "^27.2.2"
     jest-util "^27.2.0"
-    jest-worker "^27.2.0"
+    jest-worker "^27.2.2"
     source-map-support "^0.5.6"
     throat "^6.0.1"
 
-jest-runtime@^27.2.1:
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.2.1.tgz#db506f679356f5b94b7be20e770f2541b7c2b339"
-  integrity sha512-QJNnwL4iteDE/Jq4TfQK7AjhPoUZflBKTtUIkRnFYFkTAZTP/o8k7ekaROiVjmo+NYop5+DQPqX6pz4vWbZSOQ==
+jest-runtime@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.2.2.tgz#cc29d3adde948d531657a67d33c9f8d9bb58a6fc"
+  integrity sha512-PtTHCK5jT+KrIpKpjJsltu/dK5uGhBtTNLOk1Z+ZD2Jrxam2qQsOqDFYLszcK0jc2TLTNsrVpclqSftn7y3aXA==
   dependencies:
-    "@jest/console" "^27.2.0"
-    "@jest/environment" "^27.2.0"
-    "@jest/fake-timers" "^27.2.0"
-    "@jest/globals" "^27.2.1"
+    "@jest/console" "^27.2.2"
+    "@jest/environment" "^27.2.2"
+    "@jest/fake-timers" "^27.2.2"
+    "@jest/globals" "^27.2.2"
     "@jest/source-map" "^27.0.6"
-    "@jest/test-result" "^27.2.0"
-    "@jest/transform" "^27.2.1"
+    "@jest/test-result" "^27.2.2"
+    "@jest/transform" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
@@ -3014,14 +3028,14 @@ jest-runtime@^27.2.1:
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.2.4"
-    jest-haste-map "^27.2.0"
-    jest-message-util "^27.2.0"
+    jest-haste-map "^27.2.2"
+    jest-message-util "^27.2.2"
     jest-mock "^27.1.1"
     jest-regex-util "^27.0.6"
-    jest-resolve "^27.2.0"
-    jest-snapshot "^27.2.1"
+    jest-resolve "^27.2.2"
+    jest-snapshot "^27.2.2"
     jest-util "^27.2.0"
-    jest-validate "^27.2.0"
+    jest-validate "^27.2.2"
     slash "^3.0.0"
     strip-bom "^4.0.0"
     yargs "^16.0.3"
@@ -3034,10 +3048,10 @@ jest-serializer@^27.0.6:
     "@types/node" "*"
     graceful-fs "^4.2.4"
 
-jest-snapshot@^27.2.1:
-  version "27.2.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.2.1.tgz#385accf3bb71ac84e9a6bda4fc9bb458d53abb35"
-  integrity sha512-8CTg2YrgZuQbPHW7G0YvLTj4yTRXLmSeEO+ka3eC5lbu5dsTRyoDNS1L7x7EFUTyYQhFH9HQG1/TNlbUgR9Lug==
+jest-snapshot@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.2.2.tgz#898f0eedde658e723461d3cdcaedb404e716fa01"
+  integrity sha512-7ODSvULMiiOVuuLvLZpDlpqqTqX9hDfdmijho5auVu9qRYREolvrvgH4kSNOKfcqV3EZOTuLKNdqsz1PM20PQA==
   dependencies:
     "@babel/core" "^7.7.2"
     "@babel/generator" "^7.7.2"
@@ -3045,23 +3059,23 @@ jest-snapshot@^27.2.1:
     "@babel/plugin-syntax-typescript" "^7.7.2"
     "@babel/traverse" "^7.7.2"
     "@babel/types" "^7.0.0"
-    "@jest/transform" "^27.2.1"
+    "@jest/transform" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/babel__traverse" "^7.0.4"
     "@types/prettier" "^2.1.5"
     babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^27.2.1"
+    expect "^27.2.2"
     graceful-fs "^4.2.4"
-    jest-diff "^27.2.0"
+    jest-diff "^27.2.2"
     jest-get-type "^27.0.6"
-    jest-haste-map "^27.2.0"
-    jest-matcher-utils "^27.2.0"
-    jest-message-util "^27.2.0"
-    jest-resolve "^27.2.0"
+    jest-haste-map "^27.2.2"
+    jest-matcher-utils "^27.2.2"
+    jest-message-util "^27.2.2"
+    jest-resolve "^27.2.2"
     jest-util "^27.2.0"
     natural-compare "^1.4.0"
-    pretty-format "^27.2.0"
+    pretty-format "^27.2.2"
     semver "^7.3.2"
 
 jest-util@^27.2.0:
@@ -3076,24 +3090,24 @@ jest-util@^27.2.0:
     is-ci "^3.0.0"
     picomatch "^2.2.3"
 
-jest-validate@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.2.0.tgz#b7535f12d95dd3b4382831f4047384ca098642ab"
-  integrity sha512-uIEZGkFKk3+4liA81Xu0maG5aGDyPLdp+4ed244c+Ql0k3aLWQYcMbaMLXOIFcb83LPHzYzqQ8hwNnIxTqfAGQ==
+jest-validate@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.2.2.tgz#e672118f1d9aa57b25b4c7998edc101dabd7020b"
+  integrity sha512-01mwTAs2kgDuX98Ua3Xhdhp5lXsLU4eyg6k56adTtrXnU/GbLd9uAsh5nc4MWVtUXMeNmHUyEiD4ibLqE8MuNw==
   dependencies:
     "@jest/types" "^27.1.1"
     camelcase "^6.2.0"
     chalk "^4.0.0"
     jest-get-type "^27.0.6"
     leven "^3.1.0"
-    pretty-format "^27.2.0"
+    pretty-format "^27.2.2"
 
-jest-watcher@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.2.0.tgz#dc2eef4c13c6d41cebf3f1fc5f900a54b51c2ea0"
-  integrity sha512-SjRWhnr+qO8aBsrcnYIyF+qRxNZk6MZH8TIDgvi+VlsyrvOyqg0d+Rm/v9KHiTtC9mGGeFi9BFqgavyWib6xLg==
+jest-watcher@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.2.2.tgz#8b00253d7e880c6637b402228a76f2fe5ea08132"
+  integrity sha512-7HJwZq06BCfM99RacCVzXO90B20/dNJvq+Ouiu/VrFdFRCpbnnqlQUEk4KAhBSllgDrTPgKu422SCF5KKBHDRA==
   dependencies:
-    "@jest/test-result" "^27.2.0"
+    "@jest/test-result" "^27.2.2"
     "@jest/types" "^27.1.1"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
@@ -3101,10 +3115,10 @@ jest-watcher@^27.2.0:
     jest-util "^27.2.0"
     string-length "^4.0.1"
 
-jest-worker@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.2.0.tgz#11eef39f1c88f41384ca235c2f48fe50bc229bc0"
-  integrity sha512-laB0ZVIBz+voh/QQy9dmUuuDsadixeerrKqyVpgPz+CCWiOYjOBabUXHIXZhsdvkWbLqSHbgkAHWl5cg24Q6RA==
+jest-worker@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.2.2.tgz#636deeae8068abbf2b34b4eb9505f8d4e5bd625c"
+  integrity sha512-aG1xq9KgWB2CPC8YdMIlI8uZgga2LFNcGbHJxO8ctfXAydSaThR4EewKQGg3tBOC+kS3vhPGgymsBdi9VINjPw==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
@@ -3492,10 +3506,10 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-nanocolors@^0.1.5:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.6.tgz#bc2350d3edfdbfadd7ac018c855ae7c13905a6ad"
-  integrity sha512-2pvTw6vYRaBLGir2xR7MxaJtyWkrn+C53EpW8yPotG+pdAwBvt0Xwk4VJ6VHLY0aLthVZPvDfm9TdZvrvAm5UQ==
+nanocolors@^0.1.0, nanocolors@^0.1.5:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
+  integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -3762,13 +3776,13 @@ pretty-format@^26.0.0, pretty-format@^26.6.2:
     ansi-styles "^4.0.0"
     react-is "^17.0.1"
 
-pretty-format@^27.2.0:
-  version "27.2.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.2.0.tgz#ee37a94ce2a79765791a8649ae374d468c18ef19"
-  integrity sha512-KyJdmgBkMscLqo8A7K77omgLx5PWPiXJswtTtFV7XgVZv2+qPk6UivpXXO+5k6ZEbWIbLoKdx1pZ6ldINzbwTA==
+pretty-format@^27.2.2:
+  version "27.2.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.2.2.tgz#c080f1ab7ac64302e4d438f208596fc649dbeeb3"
+  integrity sha512-+DdLh+rtaElc2SQOE/YPH8k2g3Rf2OXWEpy06p8Szs3hdVSYD87QOOlYRHWAeb/59XTmeVmRKvDD0svHqf6ycA==
   dependencies:
     "@jest/types" "^27.1.1"
-    ansi-regex "^5.0.0"
+    ansi-regex "^5.0.1"
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
@@ -4213,20 +4227,20 @@ string-length@^4.0.1:
     strip-ansi "^6.0.0"
 
 string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
-  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    ansi-regex "^5.0.0"
+    ansi-regex "^5.0.1"
 
 strip-bom@^4.0.0:
   version "4.0.0"
@@ -4315,9 +4329,9 @@ svelte2tsx@^0.4.6:
     pascal-case "^3.1.1"
 
 svelte@^3.25.0:
-  version "3.42.6"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.42.6.tgz#45a534d76fcdb551a2f23abf2cfee648fa248d03"
-  integrity sha512-lAcryr9Do2PeGtbodspX5I4kWj4yWYAa2WGpDCwzNkP3y8WZTxigMd4/TMO1rBZEOkMYGn4ZXrbAlSEGhK6q3w==
+  version "3.43.0"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.43.0.tgz#d28d06ec523bf0cea3de15558a3241c339a85762"
+  integrity sha512-T2pMPHrxXp+SM8pLLUXLQgkdo+JhTls7aqj9cD7z8wT2ccP+OrCAmtQS7h6pvMjitaZhXFNnCK582NxDpy8HSw==
 
 symbol-tree@^3.2.4:
   version "3.2.4"
@@ -4430,14 +4444,7 @@ tslib@^2.0.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
-tsutils@2.27.2:
-  version "2.27.2"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7"
-  integrity sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg==
-  dependencies:
-    tslib "^1.8.1"
-
-tsutils@^3.21.0:
+tsutils@3.21.0, tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
   integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
@@ -4523,9 +4530,9 @@ v8-compile-cache@^2.0.3:
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
 v8-to-istanbul@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz#4229f2a99e367f3f018fa1d5c2b8ec684667c69c"
-  integrity sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg==
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz#0aeb763894f1a0a1676adf8a8b7612a38902446c"
+  integrity sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"