diff --git a/ts/.prettierignore b/ts/.prettierignore index ac995e48b..d3ac072af 100644 --- a/ts/.prettierignore +++ b/ts/.prettierignore @@ -1,4 +1,4 @@ licenses.json vendor -*.svelte.d.ts +i18n-generated.ts backend_proto.d.ts diff --git a/ts/lib/BUILD.bazel b/ts/lib/BUILD.bazel index d587aea7b..105ff7e4c 100644 --- a/ts/lib/BUILD.bazel +++ b/ts/lib/BUILD.bazel @@ -6,6 +6,10 @@ load("@rules_python//python:defs.bzl", "py_binary") load("@py_deps//:requirements.bzl", "requirement") load("//ts:jest.bzl", "jest_test") +_generated = [ + "i18n-generated.ts", +] + protobufjs_library( name = "backend_proto", proto = "//proto:backend_proto_lib", @@ -35,9 +39,11 @@ genrule( typescript( name = "lib", - generated = [ - ":i18n-generated.ts", - ], + srcs = glob( + ["*.ts"], + exclude = _generated, + ), + generated = [":" + file for file in _generated], deps = [ ":backend_proto", "@npm//@fluent/bundle", @@ -52,9 +58,9 @@ typescript( # Tests ################ -prettier_test() +prettier_test(exclude = _generated) -eslint_test() +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-generated.ts b/ts/lib/i18n-generated.ts new file mode 120000 index 000000000..b41e33779 --- /dev/null +++ b/ts/lib/i18n-generated.ts @@ -0,0 +1 @@ +../../bazel-bin/ts/lib/i18n-generated.ts \ No newline at end of file diff --git a/ts/lib/proto.ts b/ts/lib/proto.ts index 08b1a8853..e182f6c10 100644 --- a/ts/lib/proto.ts +++ b/ts/lib/proto.ts @@ -2,6 +2,7 @@ // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import { anki } from "./backend_proto"; + import Cards = anki.cards; import DeckConfig = anki.deckconfig; import Notetypes = anki.notetypes;