From 264dd8f1ea66c65772f8648023ca9298122084fe Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Thu, 5 Nov 2020 11:01:30 +1000
Subject: [PATCH] fix external consumption of ts rules, and simplify import
 path

---
 WORKSPACE                         |  2 +-
 defs.bzl                          | 17 +++++------------
 docs/windows.md                   | 11 ++++++++++-
 ts/congrats/CongratsPage.svelte   |  6 +++---
 ts/congrats/bootstrap.ts          |  6 +++---
 ts/congrats/lib.ts                |  8 ++++----
 ts/graphs/AddedGraph.svelte       |  4 ++--
 ts/graphs/ButtonsGraph.svelte     |  4 ++--
 ts/graphs/CalendarGraph.svelte    |  4 ++--
 ts/graphs/CardCounts.svelte       |  4 ++--
 ts/graphs/EaseGraph.svelte        |  4 ++--
 ts/graphs/FutureDue.svelte        |  4 ++--
 ts/graphs/GraphRangeRadios.svelte |  4 ++--
 ts/graphs/GraphsPage.svelte       |  4 ++--
 ts/graphs/HistogramGraph.svelte   |  2 +-
 ts/graphs/HourGraph.svelte        |  4 ++--
 ts/graphs/IntervalsGraph.svelte   |  6 +++---
 ts/graphs/NoDataOverlay.svelte    |  2 +-
 ts/graphs/ReviewsGraph.svelte     |  4 ++--
 ts/graphs/TableData.svelte        |  2 +-
 ts/graphs/TodayStats.svelte       |  4 ++--
 ts/graphs/added.ts                |  6 +++---
 ts/graphs/bootstrap.ts            |  6 +++---
 ts/graphs/buttons.ts              |  4 ++--
 ts/graphs/calendar.ts             |  4 ++--
 ts/graphs/card-counts.ts          |  6 +++---
 ts/graphs/ease.ts                 |  6 +++---
 ts/graphs/future-due.ts           |  8 ++++----
 ts/graphs/graph-helpers.ts        |  4 ++--
 ts/graphs/hours.ts                |  4 ++--
 ts/graphs/intervals.ts            |  8 ++++----
 ts/graphs/reviews.ts              |  6 +++---
 ts/graphs/today.ts                |  6 +++---
 ts/lib/BUILD.bazel                |  1 +
 34 files changed, 89 insertions(+), 86 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index e36a6fb71..436273099 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,5 +1,5 @@
 workspace(
-    name = "anki",
+    name = "net_ankiweb_anki",
     managed_directories = {"@npm": [
         "ts/node_modules",
     ]},
diff --git a/defs.bzl b/defs.bzl
index e8a7d2273..d8e53854a 100644
--- a/defs.bzl
+++ b/defs.bzl
@@ -1,7 +1,7 @@
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories")
 load("@io_bazel_rules_rust//:workspace.bzl", "bazel_version")
-load("@anki//cargo:crates.bzl", "raze_fetch_remote_crates")
+load("@net_ankiweb_anki//cargo:crates.bzl", "raze_fetch_remote_crates")
 load(":python.bzl", "setup_local_python")
 load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")
 load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories")
@@ -29,15 +29,9 @@ def setup_deps():
 
     native.register_toolchains("@python//:python3_toolchain")
 
-    # pip_install(
-    #     name = "py_deps",
-    #     python_interpreter_target = "@python//:python",
-    #     requirements = "@anki//pip:requirements.txt",
-    # )
-
     pip_import(
         name = "py_deps",
-        requirements = "@anki//pip:requirements.txt",
+        requirements = "@net_ankiweb_anki//pip:requirements.txt",
         python_runtime = "@python//:python",
     )
 
@@ -46,13 +40,12 @@ def setup_deps():
         python_runtime = "@python//:python",
     )
 
-    node_repositories(package_json = ["@anki//ts:package.json"])
+    node_repositories(package_json = ["@net_ankiweb_anki//ts:package.json"])
 
     yarn_install(
         name = "npm",
-        package_json = "@anki//ts:package.json",
-        # strict_visibility = True,
-        yarn_lock = "@anki//ts:yarn.lock",
+        package_json = "@net_ankiweb_anki//ts:package.json",
+        yarn_lock = "@net_ankiweb_anki//ts:yarn.lock",
     )
 
     sass_repositories()
diff --git a/docs/windows.md b/docs/windows.md
index 7e4c1b1c5..f3ad9a1bc 100644
--- a/docs/windows.md
+++ b/docs/windows.md
@@ -79,9 +79,18 @@ not being installed.
 
 ## More
 
-For info on running tests, building wheels and so on, please see [Development](./development.md).
+For info on running tests, building wheels and so on, please see
+[Development](./development.md).
 
 Note that where the instructions on that page say "bazel", please use ".\bazel"
 instead. This runs bazel.bat inside the Anki source folder, instead of
 calling Bazel directly. This takes care of setting up the path and output folder
 correctly, which avoids issues with long path names.
+
+## Cleaning notes
+
+Unlike the old Make system, a "clean build" should almost never be required
+unless you are debugging issues with the build system. But if you need to run
+"bazel clean --expunge", make sure you remove the ts/node_modules folder
+afterwards, or it will cause a "no such file or directory node_modules/anki"
+error on the subsequent build on Windows.
diff --git a/ts/congrats/CongratsPage.svelte b/ts/congrats/CongratsPage.svelte
index 9e5d55626..829dfeebb 100644
--- a/ts/congrats/CongratsPage.svelte
+++ b/ts/congrats/CongratsPage.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-    import { I18n } from "anki/ts/lib/i18n";
-    import pb from "anki/ts/lib/backend_proto";
+    import { I18n } from "anki/i18n";
+    import pb from "anki/backend_proto";
     import { buildNextLearnMsg } from "./lib";
-    import { bridgeLink } from "anki/ts/lib/bridgecommand";
+    import { bridgeLink } from "anki/bridgecommand";
 
     export let info: pb.BackendProto.CongratsInfoOut;
     export let i18n: I18n;
diff --git a/ts/congrats/bootstrap.ts b/ts/congrats/bootstrap.ts
index 6221895d7..360803ceb 100644
--- a/ts/congrats/bootstrap.ts
+++ b/ts/congrats/bootstrap.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 { setupI18n } from "anki/ts/lib/i18n";
-import CongratsPage from "anki/ts/congrats/CongratsPage.svelte";
+import { setupI18n } from "anki/i18n";
+import CongratsPage from "./CongratsPage.svelte";
 import { getCongratsInfo } from "./lib";
-import { checkNightMode } from "anki/ts/lib/nightmode";
+import { checkNightMode } from "anki/nightmode";
 
 export async function congrats(target: HTMLDivElement): Promise<void> {
     checkNightMode();
diff --git a/ts/congrats/lib.ts b/ts/congrats/lib.ts
index 4341292f7..f4464c747 100644
--- a/ts/congrats/lib.ts
+++ b/ts/congrats/lib.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 pb from "anki/ts/lib/backend_proto";
-import { postRequest } from "anki/ts/lib/postrequest";
-import { naturalUnit, unitAmount, unitName } from "anki/ts/lib/time";
-import type { I18n } from "anki/ts/lib/i18n";
+import pb from "anki/backend_proto";
+import { postRequest } from "anki/postrequest";
+import { naturalUnit, unitAmount, unitName } from "anki/time";
+import type { I18n } from "anki/i18n";
 
 export async function getCongratsInfo(): Promise<pb.BackendProto.CongratsInfoOut> {
     return pb.BackendProto.CongratsInfoOut.decode(
diff --git a/ts/graphs/AddedGraph.svelte b/ts/graphs/AddedGraph.svelte
index 065ccd141..7d9485611 100644
--- a/ts/graphs/AddedGraph.svelte
+++ b/ts/graphs/AddedGraph.svelte
@@ -1,11 +1,11 @@
 <script lang="typescript">
     import { RevlogRange, GraphRange } from "./graph-helpers";
     import type { TableDatum } from "./graph-helpers";
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type { I18n } from "anki/i18n";
     import type { HistogramData } from "./histogram-graph";
     import { gatherData, buildHistogram } from "./added";
     import type { GraphData } from "./added";
-    import type pb from "anki/ts/lib/backend_proto";
+    import type pb from "anki/backend_proto";
     import HistogramGraph from "./HistogramGraph.svelte";
     import GraphRangeRadios from "./GraphRangeRadios.svelte";
     import TableData from "./TableData.svelte";
diff --git a/ts/graphs/ButtonsGraph.svelte b/ts/graphs/ButtonsGraph.svelte
index 7e78a6c46..2c9eafddf 100644
--- a/ts/graphs/ButtonsGraph.svelte
+++ b/ts/graphs/ButtonsGraph.svelte
@@ -2,8 +2,8 @@
     import { defaultGraphBounds, GraphRange, RevlogRange } from "./graph-helpers";
     import AxisTicks from "./AxisTicks.svelte";
     import { renderButtons } from "./buttons";
-    import type pb from "anki/ts/lib/backend_proto";
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type pb from "anki/backend_proto";
+    import type { I18n } from "anki/i18n";
     import NoDataOverlay from "./NoDataOverlay.svelte";
     import GraphRangeRadios from "./GraphRangeRadios.svelte";
 
diff --git a/ts/graphs/CalendarGraph.svelte b/ts/graphs/CalendarGraph.svelte
index f5ebe989c..059668333 100644
--- a/ts/graphs/CalendarGraph.svelte
+++ b/ts/graphs/CalendarGraph.svelte
@@ -4,8 +4,8 @@
     import { defaultGraphBounds, RevlogRange } from "./graph-helpers";
     import { gatherData, renderCalendar } from "./calendar";
     import type { GraphData } from "./calendar";
-    import type pb from "anki/ts/lib/backend_proto";
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type pb from "anki/backend_proto";
+    import type { I18n } from "anki/i18n";
 
     export let sourceData: pb.BackendProto.GraphsOut | null = null;
     export let revlogRange: RevlogRange;
diff --git a/ts/graphs/CardCounts.svelte b/ts/graphs/CardCounts.svelte
index 878d8d6bb..b31794c22 100644
--- a/ts/graphs/CardCounts.svelte
+++ b/ts/graphs/CardCounts.svelte
@@ -2,8 +2,8 @@
     import { defaultGraphBounds } from "./graph-helpers";
     import { gatherData, renderCards } from "./card-counts";
     import type { GraphData, TableDatum } from "./card-counts";
-    import type pb from "anki/ts/lib/backend_proto";
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type pb from "anki/backend_proto";
+    import type { I18n } from "anki/i18n";
 
     export let sourceData: pb.BackendProto.GraphsOut;
     export let i18n: I18n;
diff --git a/ts/graphs/EaseGraph.svelte b/ts/graphs/EaseGraph.svelte
index c3f8ab4af..76725fb6e 100644
--- a/ts/graphs/EaseGraph.svelte
+++ b/ts/graphs/EaseGraph.svelte
@@ -1,9 +1,9 @@
 <script lang="typescript">
     import type { HistogramData } from "./histogram-graph";
     import { gatherData, prepareData } from "./ease";
-    import type pb from "anki/ts/lib/backend_proto";
+    import type pb from "anki/backend_proto";
     import HistogramGraph from "./HistogramGraph.svelte";
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type { I18n } from "anki/i18n";
     import type { TableDatum } from "./graph-helpers";
     import TableData from "./TableData.svelte";
 
diff --git a/ts/graphs/FutureDue.svelte b/ts/graphs/FutureDue.svelte
index 699b272c0..984707a09 100644
--- a/ts/graphs/FutureDue.svelte
+++ b/ts/graphs/FutureDue.svelte
@@ -1,11 +1,11 @@
 <script lang="typescript">
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type { I18n } from "anki/i18n";
     import type { HistogramData } from "./histogram-graph";
     import { GraphRange, RevlogRange } from "./graph-helpers";
     import type { TableDatum } from "./graph-helpers";
     import { gatherData, buildHistogram } from "./future-due";
     import type { GraphData } from "./future-due";
-    import type pb from "anki/ts/lib/backend_proto";
+    import type pb from "anki/backend_proto";
     import HistogramGraph from "./HistogramGraph.svelte";
     import GraphRangeRadios from "./GraphRangeRadios.svelte";
     import TableData from "./TableData.svelte";
diff --git a/ts/graphs/GraphRangeRadios.svelte b/ts/graphs/GraphRangeRadios.svelte
index 86bcec051..72b669e09 100644
--- a/ts/graphs/GraphRangeRadios.svelte
+++ b/ts/graphs/GraphRangeRadios.svelte
@@ -1,7 +1,7 @@
 <script lang="typescript">
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type { I18n } from "anki/i18n";
     import { RevlogRange, GraphRange } from "./graph-helpers";
-    import { timeSpan, MONTH, YEAR } from "anki/ts/lib/time";
+    import { timeSpan, MONTH, YEAR } from "anki/time";
 
     export let i18n: I18n;
     export let revlogRange: RevlogRange;
diff --git a/ts/graphs/GraphsPage.svelte b/ts/graphs/GraphsPage.svelte
index af4457181..643d42a8c 100644
--- a/ts/graphs/GraphsPage.svelte
+++ b/ts/graphs/GraphsPage.svelte
@@ -3,8 +3,8 @@
 </script>
 
 <script lang="typescript">
-    import type { I18n } from "anki/ts/lib/i18n";
-    import type pb from "anki/ts/lib/backend_proto";
+    import type { I18n } from "anki/i18n";
+    import type pb from "anki/backend_proto";
     import { getGraphData, RevlogRange } from "./graph-helpers";
     import IntervalsGraph from "./IntervalsGraph.svelte";
     import EaseGraph from "./EaseGraph.svelte";
diff --git a/ts/graphs/HistogramGraph.svelte b/ts/graphs/HistogramGraph.svelte
index 48ff746bd..d178d33af 100644
--- a/ts/graphs/HistogramGraph.svelte
+++ b/ts/graphs/HistogramGraph.svelte
@@ -4,7 +4,7 @@
     import AxisTicks from "./AxisTicks.svelte";
     import { defaultGraphBounds } from "./graph-helpers";
     import NoDataOverlay from "./NoDataOverlay.svelte";
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type { I18n } from "anki/i18n";
 
     export let data: HistogramData | null = null;
     export let i18n: I18n;
diff --git a/ts/graphs/HourGraph.svelte b/ts/graphs/HourGraph.svelte
index b458fa411..63406dd3f 100644
--- a/ts/graphs/HourGraph.svelte
+++ b/ts/graphs/HourGraph.svelte
@@ -2,8 +2,8 @@
     import { defaultGraphBounds, RevlogRange, GraphRange } from "./graph-helpers";
     import AxisTicks from "./AxisTicks.svelte";
     import { renderHours } from "./hours";
-    import type pb from "anki/ts/lib/backend_proto";
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type pb from "anki/backend_proto";
+    import type { I18n } from "anki/i18n";
     import NoDataOverlay from "./NoDataOverlay.svelte";
     import GraphRangeRadios from "./GraphRangeRadios.svelte";
 
diff --git a/ts/graphs/IntervalsGraph.svelte b/ts/graphs/IntervalsGraph.svelte
index 520e664b7..5f94b9fc2 100644
--- a/ts/graphs/IntervalsGraph.svelte
+++ b/ts/graphs/IntervalsGraph.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
-    import { timeSpan, MONTH } from "anki/ts/lib/time";
-    import type { I18n } from "anki/ts/lib/i18n";
+    import { timeSpan, MONTH } from "anki/time";
+    import type { I18n } from "anki/i18n";
     import type { HistogramData } from "./histogram-graph";
     import {
         gatherIntervalData,
@@ -8,7 +8,7 @@
         prepareIntervalData,
     } from "./intervals";
     import type { IntervalGraphData } from "./intervals";
-    import type pb from "anki/ts/lib/backend_proto";
+    import type pb from "anki/backend_proto";
     import HistogramGraph from "./HistogramGraph.svelte";
     import type { TableDatum } from "./graph-helpers";
     import TableData from "./TableData.svelte";
diff --git a/ts/graphs/NoDataOverlay.svelte b/ts/graphs/NoDataOverlay.svelte
index 4006e6b24..aaf5c51f7 100644
--- a/ts/graphs/NoDataOverlay.svelte
+++ b/ts/graphs/NoDataOverlay.svelte
@@ -1,5 +1,5 @@
 <script lang="typescript">
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type { I18n } from "anki/i18n";
     import type { GraphBounds } from "./graph-helpers";
     export let bounds: GraphBounds;
     export let i18n: I18n;
diff --git a/ts/graphs/ReviewsGraph.svelte b/ts/graphs/ReviewsGraph.svelte
index 1e3a2d07b..78f3b7fbf 100644
--- a/ts/graphs/ReviewsGraph.svelte
+++ b/ts/graphs/ReviewsGraph.svelte
@@ -4,8 +4,8 @@
     import type { TableDatum } from "./graph-helpers";
     import { gatherData, renderReviews } from "./reviews";
     import type { GraphData } from "./reviews";
-    import type pb from "anki/ts/lib/backend_proto";
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type pb from "anki/backend_proto";
+    import type { I18n } from "anki/i18n";
     import NoDataOverlay from "./NoDataOverlay.svelte";
     import GraphRangeRadios from "./GraphRangeRadios.svelte";
     import TableData from "./TableData.svelte";
diff --git a/ts/graphs/TableData.svelte b/ts/graphs/TableData.svelte
index 5048f3ca7..d342937dd 100644
--- a/ts/graphs/TableData.svelte
+++ b/ts/graphs/TableData.svelte
@@ -1,5 +1,5 @@
 <script lang="typescript">
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type { I18n } from "anki/i18n";
     import type { TableDatum } from "./graph-helpers";
 
     export let i18n: I18n;
diff --git a/ts/graphs/TodayStats.svelte b/ts/graphs/TodayStats.svelte
index 7bbf4f283..dc99f3fef 100644
--- a/ts/graphs/TodayStats.svelte
+++ b/ts/graphs/TodayStats.svelte
@@ -1,8 +1,8 @@
 <script lang="typescript">
     import { gatherData } from "./today";
     import type { TodayData } from "./today";
-    import type pb from "anki/ts/lib/backend_proto";
-    import type { I18n } from "anki/ts/lib/i18n";
+    import type pb from "anki/backend_proto";
+    import type { I18n } from "anki/i18n";
 
     export let sourceData: pb.BackendProto.GraphsOut | null = null;
     export let i18n: I18n;
diff --git a/ts/graphs/added.ts b/ts/graphs/added.ts
index 3892cbf7a..74caf2206 100644
--- a/ts/graphs/added.ts
+++ b/ts/graphs/added.ts
@@ -6,13 +6,13 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import type pb from "anki/ts/lib/backend_proto";
+import type pb from "anki/backend_proto";
 import { extent, histogram, sum } from "d3-array";
 import { scaleLinear, scaleSequential } from "d3-scale";
 import type { HistogramData } from "./histogram-graph";
 import { interpolateBlues } from "d3-scale-chromatic";
-import type { I18n } from "anki/ts/lib/i18n";
-import { dayLabel } from "anki/ts/lib/time";
+import type { I18n } from "anki/i18n";
+import { dayLabel } from "anki/time";
 import { GraphRange } from "./graph-helpers";
 import type { TableDatum } from "./graph-helpers";
 
diff --git a/ts/graphs/bootstrap.ts b/ts/graphs/bootstrap.ts
index 664d3ac18..ccc63403e 100644
--- a/ts/graphs/bootstrap.ts
+++ b/ts/graphs/bootstrap.ts
@@ -1,9 +1,9 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import { setupI18n } from "anki/ts/lib/i18n";
-import GraphsPage from "anki/ts/graphs/GraphsPage.svelte";
-import { checkNightMode } from "anki/ts/lib/nightmode";
+import { setupI18n } from "anki/i18n";
+import GraphsPage from "./GraphsPage.svelte";
+import { checkNightMode } from "anki/nightmode";
 
 export function graphs(target: HTMLDivElement): void {
     setupI18n().then((i18n) => {
diff --git a/ts/graphs/buttons.ts b/ts/graphs/buttons.ts
index ed5912f69..c640113af 100644
--- a/ts/graphs/buttons.ts
+++ b/ts/graphs/buttons.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import pb from "anki/ts/lib/backend_proto";
+import pb from "anki/backend_proto";
 import { interpolateRdYlGn } from "d3-scale-chromatic";
 import "d3-transition";
 import { select, mouse } from "d3-selection";
@@ -19,7 +19,7 @@ import {
     GraphRange,
     millisecondCutoffForRange,
 } from "./graph-helpers";
-import type { I18n } from "anki/ts/lib/i18n";
+import type { I18n } from "anki/i18n";
 import { sum } from "d3-array";
 
 type ButtonCounts = [number, number, number, number];
diff --git a/ts/graphs/calendar.ts b/ts/graphs/calendar.ts
index 200facd67..f9e4decfd 100644
--- a/ts/graphs/calendar.ts
+++ b/ts/graphs/calendar.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import type pb from "anki/ts/lib/backend_proto";
+import type pb from "anki/backend_proto";
 import { interpolateBlues } from "d3-scale-chromatic";
 import "d3-transition";
 import { select, mouse } from "d3-selection";
@@ -14,7 +14,7 @@ import { scaleLinear, scaleSequential } from "d3-scale";
 import { showTooltip, hideTooltip } from "./tooltip";
 import { GraphBounds, setDataAvailable, RevlogRange } from "./graph-helpers";
 import { timeDay, timeYear, timeWeek } from "d3-time";
-import type { I18n } from "anki/ts/lib/i18n";
+import type { I18n } from "anki/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 e6b11280c..ff86a774d 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 } from "anki/ts/lib/cards";
-import type pb from "anki/ts/lib/backend_proto";
+import { CardQueue } from "anki/cards";
+import type pb from "anki/backend_proto";
 import { schemeGreens, schemeBlues } from "d3-scale-chromatic";
 import "d3-transition";
 import { select } from "d3-selection";
@@ -16,7 +16,7 @@ import { pie, arc } from "d3-shape";
 import { interpolate } from "d3-interpolate";
 import type { GraphBounds } from "./graph-helpers";
 import { cumsum } from "d3-array";
-import type { I18n } from "anki/ts/lib/i18n";
+import type { I18n } from "anki/i18n";
 
 type Count = [string, number];
 export interface GraphData {
diff --git a/ts/graphs/ease.ts b/ts/graphs/ease.ts
index cbdd5b4ed..ed512d6b7 100644
--- a/ts/graphs/ease.ts
+++ b/ts/graphs/ease.ts
@@ -6,13 +6,13 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import type pb from "anki/ts/lib/backend_proto";
+import type pb from "anki/backend_proto";
 import { extent, histogram, sum } from "d3-array";
 import { scaleLinear, scaleSequential } from "d3-scale";
-import { CardQueue } from "anki/ts/lib/cards";
+import { CardQueue } from "anki/cards";
 import type { HistogramData } from "./histogram-graph";
 import { interpolateRdYlGn } from "d3-scale-chromatic";
-import type { I18n } from "anki/ts/lib/i18n";
+import type { I18n } from "anki/i18n";
 import type { TableDatum } from "./graph-helpers";
 
 export interface GraphData {
diff --git a/ts/graphs/future-due.ts b/ts/graphs/future-due.ts
index 5b154a6d8..09e33133b 100644
--- a/ts/graphs/future-due.ts
+++ b/ts/graphs/future-due.ts
@@ -6,14 +6,14 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import type pb from "anki/ts/lib/backend_proto";
+import type pb from "anki/backend_proto";
 import { extent, histogram, rollup, sum, Bin } from "d3-array";
 import { scaleLinear, scaleSequential } from "d3-scale";
-import { CardQueue } from "anki/ts/lib/cards";
+import { CardQueue } from "anki/cards";
 import type { HistogramData } from "./histogram-graph";
 import { interpolateGreens } from "d3-scale-chromatic";
-import { dayLabel } from "anki/ts/lib/time";
-import type { I18n } from "anki/ts/lib/i18n";
+import { dayLabel } from "anki/time";
+import type { I18n } from "anki/i18n";
 import { GraphRange } from "./graph-helpers";
 import type { TableDatum } from "./graph-helpers";
 
diff --git a/ts/graphs/graph-helpers.ts b/ts/graphs/graph-helpers.ts
index b66bb718f..bed36f6d1 100644
--- a/ts/graphs/graph-helpers.ts
+++ b/ts/graphs/graph-helpers.ts
@@ -6,9 +6,9 @@
 @typescript-eslint/no-explicit-any: "off",
 @typescript-eslint/ban-ts-ignore: "off" */
 
-import pb from "anki/ts/lib/backend_proto";
+import pb from "anki/backend_proto";
 import type { Selection } from "d3-selection";
-import { postRequest } from "anki/ts/lib/postrequest";
+import { postRequest } from "anki/postrequest";
 
 export async function getGraphData(
     search: string,
diff --git a/ts/graphs/hours.ts b/ts/graphs/hours.ts
index 735365b20..6fe4a99ff 100644
--- a/ts/graphs/hours.ts
+++ b/ts/graphs/hours.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import pb from "anki/ts/lib/backend_proto";
+import pb from "anki/backend_proto";
 import { interpolateBlues } from "d3-scale-chromatic";
 import "d3-transition";
 import { select, mouse } from "d3-selection";
@@ -20,7 +20,7 @@ import {
     millisecondCutoffForRange,
 } from "./graph-helpers";
 import { area, curveBasis } from "d3-shape";
-import type { I18n } from "anki/ts/lib/i18n";
+import type { I18n } from "anki/i18n";
 
 type ButtonCounts = [number, number, number, number];
 
diff --git a/ts/graphs/intervals.ts b/ts/graphs/intervals.ts
index 170908239..f7a7b1060 100644
--- a/ts/graphs/intervals.ts
+++ b/ts/graphs/intervals.ts
@@ -6,15 +6,15 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import type pb from "anki/ts/lib/backend_proto";
+import type pb from "anki/backend_proto";
 import { extent, histogram, quantile, sum, mean } from "d3-array";
 import { scaleLinear, scaleSequential } from "d3-scale";
-import { CardQueue } from "anki/ts/lib/cards";
+import { CardQueue } from "anki/cards";
 import type { HistogramData } from "./histogram-graph";
 import { interpolateBlues } from "d3-scale-chromatic";
-import type { I18n } from "anki/ts/lib/i18n";
+import type { I18n } from "anki/i18n";
 import type { TableDatum } from "./graph-helpers";
-import { timeSpan } from "anki/ts/lib/time";
+import { timeSpan } from "anki/time";
 
 export interface IntervalGraphData {
     intervals: number[];
diff --git a/ts/graphs/reviews.ts b/ts/graphs/reviews.ts
index 4a328c7d2..a48c1e49f 100644
--- a/ts/graphs/reviews.ts
+++ b/ts/graphs/reviews.ts
@@ -6,7 +6,7 @@
 @typescript-eslint/no-explicit-any: "off",
  */
 
-import pb from "anki/ts/lib/backend_proto";
+import pb from "anki/backend_proto";
 import {
     interpolateBlues,
     interpolateGreens,
@@ -22,8 +22,8 @@ import { GraphBounds, setDataAvailable, GraphRange } from "./graph-helpers";
 import type { TableDatum } from "./graph-helpers";
 import { area, curveBasis } from "d3-shape";
 import { min, histogram, sum, max, Bin, cumsum } from "d3-array";
-import { timeSpan, dayLabel } from "anki/ts/lib/time";
-import type { I18n } from "anki/ts/lib/i18n";
+import { timeSpan, dayLabel } from "anki/time";
+import type { I18n } from "anki/i18n";
 
 interface Reviews {
     mature: number;
diff --git a/ts/graphs/today.ts b/ts/graphs/today.ts
index 5c2f71916..464742416 100644
--- a/ts/graphs/today.ts
+++ b/ts/graphs/today.ts
@@ -1,9 +1,9 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import pb from "anki/ts/lib/backend_proto";
-import { studiedToday } from "anki/ts/lib/time";
-import type { I18n } from "anki/ts/lib/i18n";
+import pb from "anki/backend_proto";
+import { studiedToday } from "anki/time";
+import type { I18n } from "anki/i18n";
 
 export interface TodayData {
     title: string;
diff --git a/ts/lib/BUILD.bazel b/ts/lib/BUILD.bazel
index 5294681d2..6d1717998 100644
--- a/ts/lib/BUILD.bazel
+++ b/ts/lib/BUILD.bazel
@@ -28,6 +28,7 @@ ts_library(
     data = [
         "backend_proto",
     ],
+    module_name = "anki",
     tsconfig = "//:tsconfig.json",
     visibility = ["//visibility:public"],
     deps = [