Moves TypeScript rules into //tools/typescript/....

Refs #67. This is just for better organization and to split the implementation into multiple files.
dgp1130 · Feb 19, 2023 · 8a427ec · 8a427ec
1 parent eb9af65
commit 8a427ec
Show file tree

Hide file tree

Showing 45 changed files with 75 additions and 51 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -6,7 +6,7 @@ load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@rules_prerender_npm//:defs.bzl", "npm_link_all_packages")
 load("//tools/publish:npm_publish.bzl", "npm_publish")
 load("//tools/stamping:stamp_package.bzl", "stamp_package")
-load("//tools:typescript.bzl", "types_only")
+load("//tools/typescript:defs.bzl", "types_only")
 load("//:index.bzl", "link_prerender_component", "prerender_component")
 
 exports_files([".npmrc"], visibility = ["//visibility:public"])

diff --git a/common/BUILD.bazel b/common/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load(":label_test.bzl", "label_test_suite")
 load(":paths_test.bzl", "paths_test_suite")
 

diff --git a/common/models/BUILD.bazel b/common/models/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 
 ts_project(
     name = "prerender_annotation",

diff --git a/common/testing/BUILD.bazel b/common/testing/BUILD.bazel
@@ -1,6 +1,6 @@
 load("//:index.bzl", "web_resources", "web_resources_devserver")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test", "jasmine_web_test_suite")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 
 ts_project(
     name = "binary",

diff --git a/examples/components/BUILD.bazel b/examples/components/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load(
     "//:index.bzl",
     "prerender_component",

diff --git a/examples/custom_bundling/BUILD.bazel b/examples/custom_bundling/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@aspect_rules_rollup//rollup:defs.bzl", "rollup_bundle")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load(
     "//:index.bzl",
     "extract_single_resource",

diff --git a/examples/custom_bundling/component/BUILD.bazel b/examples/custom_bundling/component/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_component")
 
 prerender_component(

diff --git a/examples/custom_bundling/transitive/BUILD.bazel b/examples/custom_bundling/transitive/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_component")
 
 prerender_component(

diff --git a/examples/data/BUILD.bazel b/examples/data/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_pages", "web_resources_devserver")
 load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 

diff --git a/examples/declarative_shadow_dom/BUILD.bazel b/examples/declarative_shadow_dom/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load(
     "//:index.bzl",
     "css_library",

diff --git a/examples/javascript/BUILD.bazel b/examples/javascript/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_pages", "web_resources_devserver")
 load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 

diff --git a/examples/minimal/BUILD.bazel b/examples/minimal/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_pages", "web_resources_devserver")
 load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 

diff --git a/examples/multi_page/BUILD.bazel b/examples/multi_page/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load(
     "//:index.bzl",
     "css_library",

diff --git a/examples/prerender_resources/BUILD.bazel b/examples/prerender_resources/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_resources")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
 

diff --git a/examples/resources/BUILD.bazel b/examples/resources/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load(
     "//:index.bzl",
     "prerender_pages",

diff --git a/examples/scripts/BUILD.bazel b/examples/scripts/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_pages", "web_resources_devserver")
 load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 

diff --git a/examples/scripts/component/BUILD.bazel b/examples/scripts/component/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_component")
 
 prerender_component(

diff --git a/examples/scripts/transitive/BUILD.bazel b/examples/scripts/transitive/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_component")
 
 prerender_component(

diff --git a/examples/site/blog/BUILD.bazel b/examples/site/blog/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_pages")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
 

diff --git a/examples/site/common/BUILD.bazel b/examples/site/common/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "css_library")
 
 ts_project(

diff --git a/examples/site/components/base/BUILD.bazel b/examples/site/components/base/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "css_library", "prerender_component")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
 

diff --git a/examples/site/components/counter/BUILD.bazel b/examples/site/components/counter/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load(
     "//:index.bzl",
     "prerender_component",

diff --git a/examples/site/components/footer/BUILD.bazel b/examples/site/components/footer/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "css_library", "prerender_component")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
 

diff --git a/examples/site/components/header/BUILD.bazel b/examples/site/components/header/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "css_library", "prerender_component")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
 

diff --git a/examples/site/home/BUILD.bazel b/examples/site/home/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_pages", "web_resources_devserver")
 load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 

diff --git a/examples/styles/BUILD.bazel b/examples/styles/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "css_library", "prerender_pages", "web_resources_devserver")
 load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 

diff --git a/examples/testonly/BUILD.bazel b/examples/testonly/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load(
     "//:index.bzl",
     "css_library",

diff --git a/examples/testonly/component/BUILD.bazel b/examples/testonly/component/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "css_library", "prerender_component", "web_resources")
 
 prerender_component(

diff --git a/examples/testonly/transitive/BUILD.bazel b/examples/testonly/transitive/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "css_library", "prerender_component", "web_resources")
 
 prerender_component(

diff --git a/examples/tsjs/BUILD.bazel b/examples/tsjs/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@aspect_rules_js//js:defs.bzl", "js_library")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//:index.bzl", "prerender_pages", "web_resources_devserver")
 load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 

diff --git a/packages/annotation_extractor/BUILD.bazel b/packages/annotation_extractor/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@aspect_rules_js//js:defs.bzl", "js_binary")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 
 js_binary(
     name = "annotation_extractor",

diff --git a/packages/css_bundler/BUILD.bazel b/packages/css_bundler/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@aspect_rules_js//js:defs.bzl", "js_binary")
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
 
 bzl_library(

diff --git a/packages/declarative_shadow_dom/BUILD.bazel b/packages/declarative_shadow_dom/BUILD.bazel
@@ -8,7 +8,7 @@ load(
     "prerender_component_publish_files",
 )
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//tools/publish:npm_publish.bzl", "npm_publish")
 load("//tools/stamping:stamp_package.bzl", "stamp_package")
 

diff --git a/packages/renderer/BUILD.bazel b/packages/renderer/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load(":build_vars.bzl", "RENDERER_RUNTIME_DEPS")
 
 ts_project(

diff --git a/packages/resource_injector/BUILD.bazel b/packages/resource_injector/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@aspect_rules_js//js:defs.bzl", "js_binary")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 
 js_binary(
     name = "resource_injector",

diff --git a/packages/resource_packager/BUILD.bazel b/packages/resource_packager/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@aspect_rules_js//js:defs.bzl", "js_binary")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 
 js_binary(
     name = "resource_packager",

diff --git a/packages/rules_prerender/BUILD.bazel b/packages/rules_prerender/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("//:index.bzl", "prerender_component")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 
 exports_files(
     ["rollup-default.config.js"],

diff --git a/packages/rules_prerender/link_prerender_component.bzl b/packages/rules_prerender/link_prerender_component.bzl
@@ -1,5 +1,5 @@
 load("@aspect_rules_js//js:providers.bzl", "JsInfo")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 load("//packages/rules_prerender:web_resources.bzl", "WebResourceInfo")
 
 def link_prerender_component(name, package, visibility = None, testonly = None):

diff --git a/packages/rules_prerender/prerender_component_publish_files_testdata/BUILD.bazel b/packages/rules_prerender/prerender_component_publish_files_testdata/BUILD.bazel
@@ -9,7 +9,7 @@ load(
 load("//packages/rules_prerender:web_resources.bzl", "web_resources")
 load("//packages/rules_prerender/css:css_library.bzl", "css_library")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 
 prerender_component(
     name = "component",

diff --git a/packages/script_entry_generator/BUILD.bazel b/packages/script_entry_generator/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@aspect_rules_js//js:defs.bzl", "js_binary")
 load("//tools/jasmine:defs.bzl", "jasmine_node_test")
-load("//tools:typescript.bzl", "ts_project")
+load("//tools/typescript:defs.bzl", "ts_project")
 
 js_binary(
     name = "script_entry_generator",

diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
diff --git a/tools/typescript/BUILD.bazel b/tools/typescript/BUILD.bazel
@@ -0,0 +1,20 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+bzl_library(
+    name = "defs",
+    srcs = ["defs.bzl"],
+    deps = [
+        ":ts_project",
+        ":types_only",
+    ],
+)
+
+bzl_library(
+    name = "ts_project",
+    srcs = ["ts_project.bzl"],
+)
+
+bzl_library(
+    name = "types_only",
+    srcs = ["types_only.bzl"],
+)
diff --git a/tools/typescript/defs.bzl b/tools/typescript/defs.bzl
@@ -0,0 +1,5 @@
+load(":ts_project.bzl", _ts_project = "ts_project")
+load(":types_only.bzl", _types_only = "types_only")
+
+ts_project = _ts_project
+types_only = _types_only
diff --git a/tools/typescript/ts_project.bzl b/tools/typescript/ts_project.bzl
@@ -0,0 +1,10 @@
+load("@aspect_rules_ts//ts:defs.bzl", _ts_project = "ts_project")
+
+def ts_project(name, tsconfig = None, **kwargs):
+    _ts_project(
+        name = name,
+        tsconfig = tsconfig or "//:tsconfig",
+        declaration = True,
+        source_map = True,
+        **kwargs
+    )
diff --git a/tools/typescript.bzl → tools/typescript/types_only.bzl b/tools/typescript.bzl → tools/typescript/types_only.bzl
@@ -1,14 +1,4 @@
 load("@aspect_rules_js//js:providers.bzl", "JsInfo", "js_info")
-load("@aspect_rules_ts//ts:defs.bzl", _ts_project = "ts_project")
-
-def ts_project(name, tsconfig = None, **kwargs):
-    _ts_project(
-        name = name,
-        tsconfig = tsconfig or "//:tsconfig",
-        declaration = True,
-        source_map = True,
-        **kwargs
-    )
 
 def _types_only_impl(ctx):
     info = ctx.attr.dep[JsInfo]