1 files changed, 15 insertions, 108 deletions

diff --git a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
index f9a990e379..b504fe79f9 100644
--- a/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
+++ b/tensorflow/tensorboard/components/tf_dashboard_common/BUILD
@@ -1,33 +1,33 @@
 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:defs.bzl", "tensorboard_webcomponent_library")
+load("//tensorflow/tensorboard:web.bzl", "ts_web_library")
 
 licenses(["notice"])  # Apache 2.0
 
-web_library(
+ts_web_library(
     name = "tf_dashboard_common",
     srcs = [
+        "dashboard-behavior.ts",
         "dashboard-style.html",
+        "reload-behavior.ts",
         "run-color-style.html",
         "scrollbar-style.html",
         "tensorboard-color.html",
         "tf-categorizer.html",
-        "tf-categorizer-bundle.js",
+        "tf-categorizer.ts",
         "tf-chart-scaffold.html",
         "tf-collapsable-pane.html",
         "tf-dashboard.html",
-        "tf-dashboard.js",
         "tf-dashboard-layout.html",
         "tf-downloader.html",
         "tf-multi-checkbox.html",
-        "tf-multi-checkbox-bundle.js",
+        "tf-multi-checkbox.ts",
         "tf-no-data-warning.html",
         "tf-option-selector.html",
         "tf-panes-helper.html",
         "tf-regex-group.html",
-        "tf-regex-group-bundle.js",
+        "tf-regex-group.ts",
         "tf-run-selector.html",
         "tf-sidebar-helper.html",
     ],
@@ -35,9 +35,9 @@ web_library(
     deps = [
         "//tensorflow/tensorboard/components/tf_imports:d3",
         "//tensorflow/tensorboard/components/tf_imports:lodash",
+        "//tensorflow/tensorboard/components/tf_imports:polymer",
         "//tensorflow/tensorboard/components/tf_storage",
         "//tensorflow/tensorboard/components/vz_sorting",
-        "@org_polymer",
         "@org_polymer_iron_ajax",
         "@org_polymer_iron_collapse",
         "@org_polymer_iron_icons",
@@ -56,7 +56,7 @@ web_library(
     ],
 )
 
-web_library(
+ts_web_library(
     name = "demo",
     srcs = [
         "tf-categorizer-demo.html",
@@ -73,91 +73,9 @@ web_library(
     ],
 )
 
-tensorboard_typescript_bundle(
-    name = "tf_categorizer_bundle",
-    out = "tf-categorizer-bundle.ts",
-    namespace_srcs = {"TF.Dashboard.Categorizer": ["tf-categorizer.ts"]},
-    namespace_symbol_aliases = {"TF.Dashboard.Categorizer": {"compareTagNames": "VZ.Sorting.compareTagNames"}},
-)
-
-tensorboard_typescript_genrule(
-    name = "tf_categorizer_ts",
-    srcs = ["tf-categorizer-bundle.ts"],
-    typings = [
-        "@org_definitelytyped//:lodash.d.ts",
-        "@org_definitelytyped//:polymer.d.ts",
-        "@org_definitelytyped//:webcomponents.js.d.ts",
-        "//tensorflow/tensorboard/components/tf_imports:d3.d.ts",
-        "//tensorflow/tensorboard/components/vz_sorting:bundle.d.ts",
-    ],
-)
-
-tensorboard_typescript_bundle(
-    name = "tf_regex_group_bundle",
-    out = "tf-regex-group-bundle.ts",
-    namespace_srcs = {"TF.Dashboard.RegexGroup": ["tf-regex-group.ts"]},
-    namespace_symbol_aliases = {"TF.Dashboard.RegexGroup": {"storage": "TF.URIStorage"}},
-)
-
-tensorboard_typescript_genrule(
-    name = "tf_regex_group_ts",
-    srcs = ["tf-regex-group-bundle.ts"],
-    typings = [
-        "@org_definitelytyped//:polymer.d.ts",
-        "@org_definitelytyped//:webcomponents.js.d.ts",
-        "//tensorflow/tensorboard/components/tf_storage:bundle.d.ts",
-    ],
-)
-
-tensorboard_typescript_bundle(
-    name = "tf_multi_checkbox_bundle",
-    out = "tf-multi-checkbox-bundle.ts",
-    namespace_srcs = {"TF.Dashboard.MultiCheckbox": ["tf-multi-checkbox.ts"]},
-    namespace_symbol_aliases = {"TF.Dashboard.MultiCheckbox": {"storage": "TF.URIStorage"}},
-)
-
-tensorboard_typescript_genrule(
-    name = "tf_multi_checkbox_ts",
-    srcs = ["tf-multi-checkbox-bundle.ts"],
-    typings = [
-        "@org_definitelytyped//:lodash.d.ts",
-        "@org_definitelytyped//:polymer.d.ts",
-        "@org_definitelytyped//:webcomponents.js.d.ts",
-        "//tensorflow/tensorboard/components/tf_storage:bundle.d.ts",
-    ],
-)
-
-tensorboard_typescript_bundle(
-    name = "tf_dashboard_bundle",
-    out = "tf-dashboard.ts",
-    namespace_srcs = {
-        "TF.Dashboard": [
-            "dashboard-behavior.ts",
-            "reload-behavior.ts",
-        ],
-    },
-)
-
-tensorboard_typescript_genrule(
-    name = "tf_dashboard_ts",
-    srcs = ["tf-dashboard.ts"],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**"]),
-    tags = ["notsan"],
-)
-
-################################################################################
-# MARKED FOR DELETION
-
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_ts_library")
-load("//tensorflow/tensorboard:defs.bzl", "tensorboard_webcomponent_library")
-
 tensorboard_webcomponent_library(
     name = "legacy",
-    srcs = glob(["*.html"]) + [":legacy_ts"],
+    srcs = [":tf_dashboard_common"],
     destdir = "tf-dashboard-common",
     deps = [
         "//tensorflow/tensorboard/components/tf_imports_google:lib",
@@ -182,19 +100,8 @@ tensorboard_webcomponent_library(
     ],
 )
 
-tensorboard_ts_library(
-    name = "legacy_ts",
-    srcs = [
-        "dashboard-behavior.ts",
-        "reload-behavior.ts",
-        "tf-categorizer.ts",
-    ],
-    deps_mgmt = "off",
-    runtime = "nodejs",
-    deps = [
-        "//tensorflow/tensorboard/components/vz_sorting:legacy_ts",
-        "//third_party/javascript/typings/d3_v4:bundle",
-        "//third_party/javascript/typings/lodash",
-        "//third_party/javascript/typings/polymer:polymer_without_externs",
-    ],
+filegroup(
+    name = "all_files",
+    srcs = glob(["**"]),
+    tags = ["notsan"],
 )