From fed5c3da0e3c02bb3b119e1b863ac8b7b5396d34 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Mon, 18 Oct 2021 13:00:55 +1000
Subject: [PATCH] drop ts_library() requirement in ts/svelte

---
 ts/svelte/BUILD.bazel   | 15 ++++++---------
 ts/svelte/svelte.ts     |  2 +-
 ts/svelte/tsconfig.json | 13 +++++++++++++
 3 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 ts/svelte/tsconfig.json

diff --git a/ts/svelte/BUILD.bazel b/ts/svelte/BUILD.bazel
index bac9815f1..6c7149a18 100644
--- a/ts/svelte/BUILD.bazel
+++ b/ts/svelte/BUILD.bazel
@@ -1,28 +1,25 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//ts:typescript.bzl", "typescript")
 
 _deps = [
     "@npm//@bazel/worker",
+    "@npm//@types/node",
     "@npm//sass",
     "@npm//svelte",
     "@npm//svelte-preprocess",
     "@npm//svelte2tsx",
     "@npm//typescript",
-    "@npm//@types/node",
 ]
 
-ts_library(
-    name = "svelte_bin_ts",
+typescript(
+    name = "svelte_worker_ts",
     srcs = ["svelte.ts"],
-    tsconfig = "//ts:tsconfig_bin",
     deps = _deps,
 )
 
 nodejs_binary(
     name = "svelte_bin",
-    data = ["svelte_bin_ts"] + _deps,
-    entry_point = ":svelte.ts",
-    # should fix .js files being not found on subsequent worker requests
-    templated_args = ["--bazel_patch_module_resolver"],
+    data = [":svelte_worker_ts"] + _deps,
+    entry_point = ":svelte.js",
     visibility = ["//visibility:public"],
 )
diff --git a/ts/svelte/svelte.ts b/ts/svelte/svelte.ts
index aee508b89..0ebd3ef0a 100644
--- a/ts/svelte/svelte.ts
+++ b/ts/svelte/svelte.ts
@@ -8,7 +8,7 @@ import { svelte2tsx } from "svelte2tsx";
 import preprocess from "svelte-preprocess";
 import { basename } from "path";
 import * as ts from "typescript";
-import * as svelte from "svelte/compiler.js";
+import * as svelte from "svelte/compiler";
 
 const parsedCommandLine: ts.ParsedCommandLine = {
     fileNames: [],
diff --git a/ts/svelte/tsconfig.json b/ts/svelte/tsconfig.json
new file mode 100644
index 000000000..70b41b73c
--- /dev/null
+++ b/ts/svelte/tsconfig.json
@@ -0,0 +1,13 @@
+{
+    "extends": "../tsconfig.json",
+    "include": ["*"],
+    "references": [],
+    "compilerOptions": {
+        // ignore missing optional modules like postcss
+        "skipLibCheck": true,
+        // ensure node can run the resulting code
+        "noEmitHelpers": false,
+        "importHelpers": false,
+        "module": "commonjs",
+    }
+}