From b4647beb8f3bbc1e58afec6c3433bb916bb80b4a Mon Sep 17 00:00:00 2001 From: Derek Bailey Date: Tue, 14 Jun 2022 20:58:00 -0700 Subject: [PATCH] Revert "Move reflection_ts_fbs into a separate directory (#7342)" (#7349) This reverts commit 090caa280993477f6eee5c8787b8d26c53b0a5e9. --- reflection/BUILD.bazel | 9 +++++++++ reflection/ts/BUILD.bazel | 8 -------- typescript.bzl | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 reflection/ts/BUILD.bazel diff --git a/reflection/BUILD.bazel b/reflection/BUILD.bazel index f2760933c..fd548776b 100644 --- a/reflection/BUILD.bazel +++ b/reflection/BUILD.bazel @@ -1,5 +1,14 @@ +load("//:typescript.bzl", "flatbuffer_ts_library") + filegroup( name = "reflection_fbs_schema", srcs = ["reflection.fbs"], visibility = ["//visibility:public"], ) + +flatbuffer_ts_library( + name = "reflection_ts_fbs", + srcs = ["reflection.fbs"], + include_reflection = False, + visibility = ["//visibility:public"], +) diff --git a/reflection/ts/BUILD.bazel b/reflection/ts/BUILD.bazel deleted file mode 100644 index 64047812f..000000000 --- a/reflection/ts/BUILD.bazel +++ /dev/null @@ -1,8 +0,0 @@ -load("//:typescript.bzl", "flatbuffer_ts_library") - -flatbuffer_ts_library( - name = "reflection_ts_fbs", - srcs = ["//reflection:reflection_fbs_schema"], - include_reflection = False, - visibility = ["//visibility:public"], -) diff --git a/typescript.bzl b/typescript.bzl index 16e2581b9..5ed4be024 100644 --- a/typescript.bzl +++ b/typescript.bzl @@ -86,7 +86,7 @@ def flatbuffer_ts_library( "types": ["node"], }, }, - deps = deps + ["//ts:flatbuffers"] + (["//reflection/ts:reflection_ts_fbs"] if include_reflection else []), + deps = deps + ["//ts:flatbuffers"] + (["//reflection:reflection_ts_fbs"] if include_reflection else []), ) js_library( name = name,