Moves Jasmine into //tools/jasmine/....

Refs #67. This just better organizes the code a bit, given that there's three Starlark files here related to Jasmine.
dgp1130 · Feb 19, 2023 · eb9af65 · eb9af65
1 parent 1ad5e62
commit eb9af65
Show file tree

Hide file tree

Showing 35 changed files with 52 additions and 51 deletions.
diff --git a/common/BUILD.bazel b/common/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-load("//tools:jasmine.bzl", "jasmine_node_test")
+load("//tools/jasmine:defs.bzl", "jasmine_node_test")
 load("//tools:typescript.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,4 +1,4 @@
-load("//tools:jasmine.bzl", "jasmine_node_test")
+load("//tools/jasmine:defs.bzl", "jasmine_node_test")
 load("//tools:typescript.bzl", "ts_project")
 
 ts_project(

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

diff --git a/examples/components/BUILD.bazel b/examples/components/BUILD.bazel
@@ -5,7 +5,7 @@ load(
     "prerender_pages",
     "web_resources_devserver",
 )
-load("//tools:jasmine.bzl", "jasmine_web_test_suite")
+load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 
 prerender_pages(
     name = "page",

diff --git a/examples/custom_bundling/BUILD.bazel b/examples/custom_bundling/BUILD.bazel
@@ -8,7 +8,7 @@ load(
     "web_resources",
     "web_resources_devserver",
 )
-load("//tools:jasmine.bzl", "jasmine_web_test_suite")
+load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 
 # Prerender a single HTML file.
 prerender_pages_unbundled(

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

diff --git a/examples/declarative_shadow_dom/BUILD.bazel b/examples/declarative_shadow_dom/BUILD.bazel
@@ -6,7 +6,7 @@ load(
     "prerender_pages",
     "web_resources_devserver",
 )
-load("//tools:jasmine.bzl", "jasmine_web_test_suite")
+load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 
 prerender_pages(
     name = "site",

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

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

diff --git a/examples/multi_page/BUILD.bazel b/examples/multi_page/BUILD.bazel
@@ -6,7 +6,7 @@ load(
     "web_resources",
     "web_resources_devserver",
 )
-load("//tools:jasmine.bzl", "jasmine_web_test_suite")
+load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 
 prerender_pages(
     name = "pages",

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

diff --git a/examples/resources/BUILD.bazel b/examples/resources/BUILD.bazel
@@ -5,7 +5,7 @@ load(
     "web_resources",
     "web_resources_devserver",
 )
-load("//tools:jasmine.bzl", "jasmine_web_test_suite")
+load("//tools/jasmine:defs.bzl", "jasmine_web_test_suite")
 
 prerender_pages(
     name = "page",

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

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

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

diff --git a/examples/site/components/counter/BUILD.bazel b/examples/site/components/counter/BUILD.bazel
@@ -5,7 +5,7 @@ load(
     "prerender_pages",
     "web_resources_devserver",
 )
-load("//tools:jasmine.bzl", "jasmine_node_test", "jasmine_web_test_suite")
+load("//tools/jasmine:defs.bzl", "jasmine_node_test", "jasmine_web_test_suite")
 
 prerender_component(
     name = "counter",

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

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

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

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

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

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

diff --git a/packages/css_bundler/BUILD.bazel b/packages/css_bundler/BUILD.bazel
@@ -1,7 +1,7 @@
 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:jasmine.bzl", "jasmine_node_test")
+load("//tools/jasmine:defs.bzl", "jasmine_node_test")
 
 bzl_library(
     name = "css_bundle",

diff --git a/packages/declarative_shadow_dom/BUILD.bazel b/packages/declarative_shadow_dom/BUILD.bazel
@@ -7,7 +7,7 @@ load(
     "//packages/rules_prerender:prerender_component_publish_files.bzl",
     "prerender_component_publish_files",
 )
-load("//tools:jasmine.bzl", "jasmine_node_test")
+load("//tools/jasmine:defs.bzl", "jasmine_node_test")
 load("//tools:typescript.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,5 +1,5 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-load("//tools:jasmine.bzl", "jasmine_node_test")
+load("//tools/jasmine:defs.bzl", "jasmine_node_test")
 load("//tools:typescript.bzl", "ts_project")
 load(":build_vars.bzl", "RENDERER_RUNTIME_DEPS")
 

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

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

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

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

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

diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
@@ -1,22 +1 @@
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
-bzl_library(
-    name = "jasmine",
-    srcs = ["jasmine.bzl"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":jasmine_node_test",
-        ":jasmine_web_test_suite",
-    ],
-)
-
-bzl_library(
-    name = "jasmine_node_test",
-    srcs = ["jasmine_web_test_suite.bzl"],
-)
-
-bzl_library(
-    name = "jasmine_web_test_suite",
-    srcs = ["jasmine_web_test_suite.bzl"],
-    deps = [":jasmine_node_test"],
-)
diff --git a/tools/jasmine/BUILD.bazel b/tools/jasmine/BUILD.bazel
@@ -0,0 +1,22 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+bzl_library(
+    name = "defs",
+    srcs = ["defs.bzl"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":jasmine_node_test",
+        ":jasmine_web_test_suite",
+    ],
+)
+
+bzl_library(
+    name = "jasmine_node_test",
+    srcs = ["jasmine_web_test_suite.bzl"],
+)
+
+bzl_library(
+    name = "jasmine_web_test_suite",
+    srcs = ["jasmine_web_test_suite.bzl"],
+    deps = [":jasmine_node_test"],
+)
diff --git a/tools/jasmine.bzl → tools/jasmine/defs.bzl b/tools/jasmine.bzl → tools/jasmine/defs.bzl
diff --git a/tools/jasmine_node_test.bzl → tools/jasmine/jasmine_node_test.bzl b/tools/jasmine_node_test.bzl → tools/jasmine/jasmine_node_test.bzl
diff --git a/tools/jasmine_web_test_suite.bzl → tools/jasmine/jasmine_web_test_suite.bzl b/tools/jasmine_web_test_suite.bzl → tools/jasmine/jasmine_web_test_suite.bzl