1 files changed, 12 insertions, 57 deletions
diff --git a/tensorflow/tensorboard/components/vz_projector/test/BUILD b/tensorflow/tensorboard/components/vz_projector/test/BUILD
index 7629272c35..a73c50dcd6 100644
--- a/tensorflow/tensorboard/components/vz_projector/test/BUILD
+++ b/tensorflow/tensorboard/components/vz_projector/test/BUILD
@@ -3,76 +3,31 @@ package(
     default_visibility = ["//tensorflow:internal"],
 )
 
-load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")
-load("//tensorflow/tensorboard:hacks.bzl", "tensorboard_typescript_bundle")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_typescript_genrule")
+load("//tensorflow/tensorboard:web.bzl", "ts_web_library")
 
 licenses(["notice"])  # Apache 2.0
 
-web_library(
+ts_web_library(
     name = "test",
     srcs = [
-        "bundle.js",
+        "assert.ts",
+        "data-provider_test.ts",
+        "data_test.ts",
+        "sptree_test.ts",
         "tests.html",
+        "util_test.ts",
+        # "scatterPlotRectangleSelector_test.ts",
+        # "vz-projector-projections-panel_test.ts",
     ],
     path = "/vz-projector/test",
     deps = [
+        "//tensorflow/tensorboard/components/tf_imports:polymer",
+        "//tensorflow/tensorboard/components/tf_imports:web_component_tester",
+        "//tensorflow/tensorboard/components/tf_imports:webcomponentsjs",
         "//tensorflow/tensorboard/components/vz_projector",
-        "@org_npmjs_registry_web_component_tester",
-        "@org_polymer",
-        "@org_polymer_webcomponentsjs",
     ],
 )
 
-tensorboard_typescript_genrule(
-    name = "ts",
-    srcs = ["bundle.ts"],
-    typings = [
-        "@org_definitelytyped//:chai.d.ts",
-        "@org_definitelytyped//:mocha.d.ts",
-        "@org_definitelytyped//:polymer.d.ts",
-        "@org_definitelytyped//:three.d.ts",
-        "@org_definitelytyped//:webcomponents.js.d.ts",
-        "//tensorflow/tensorboard/components/tf_imports:d3.d.ts",
-        "//tensorflow/tensorboard/components/tf_imports:plottable.d.ts",
-        "//tensorflow/tensorboard/components/vz_projector:bundle.d.ts",
-    ],
-)
-
-tensorboard_typescript_bundle(
-    name = "bundle",
-    out = "bundle.ts",
-    namespace_srcs = {
-        "VZ.Projector.Test": [
-            "assert.ts",
-            "sptree_test.ts",
-            "data_test.ts",
-            "data-provider_test.ts",
-            "util_test.ts",
-
-            # TODO(smilkov): Migrate these away from jasmine.
-            # "scatterPlotRectangleSelector_test.ts",
-            # "vz-projector-projections-panel_test.ts",
-        ],
-    },
-    namespace_symbol_aliases = {
-        "VZ.Projector.Test": {
-            "BoundingBox": "VZ.Projector.ScatterPlotRectangleSelector.BoundingBox",
-            "DataPoint": "VZ.Projector.Data.DataPoint",
-            "DataSet": "VZ.Projector.Data.DataSet",
-            "ProjectionsPanel": "VZ.Projector.ProjectorProjectionsPanel.ProjectionsPanel",
-            "SPTree": "VZ.Projector.SPTree.SPTree",
-            "ScatterPlotRectangleSelector": "VZ.Projector.ScatterPlotRectangleSelector.ScatterPlotRectangleSelector",
-            "SpriteAndMetadataInfo": "VZ.Projector.Data.SpriteAndMetadataInfo",
-            "State": "VZ.Projector.Data.State",
-            "State": "VZ.Projector.Data.State",
-            "data_provider": "VZ.Projector.DataProvider",
-            "stateGetAccessorDimensions": "VZ.Projector.Data.stateGetAccessorDimensions",
-            "util": "VZ.Projector.Util",
-        },
-    },
-)
-
 filegroup(
     name = "all_files",
     testonly = 0,