concatjs_web back to karma_web

Author: Alex Eagle

examples/angular/WORKSPACE

@@ -59,7 +59,7 @@ load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
 
 npm_bazel_protractor_dependencies()
 
-# Load concatjs_web_test dependencies
+# Load karma_web_test dependencies
 http_archive(
     name = "io_bazel_rules_webtesting",
     sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3",

examples/angular/src/app/hello-world/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@io_bazel_rules_sass//:defs.bzl", "multi_sass_binary")
-load("@npm//@bazel/concatjs:index.bzl", "concatjs_web_test_suite")
+load("@npm//@bazel/concatjs:index.bzl", "karma_web_test_suite")
 load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("//tools:angular_ts_library.bzl", "ng_ts_library")
 
@@ -49,7 +49,7 @@ ts_library(
     ],
 )
 
-concatjs_web_test_suite(
+karma_web_test_suite(
     name = "test",
     srcs = [
         # We are manaully adding the bazel generated named-UMD date-fns bundle here as

examples/angular_view_engine/src/app/hello-world/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
-load("@npm//@bazel/concatjs:index.bzl", "concatjs_web_test_suite")
+load("@npm//@bazel/concatjs:index.bzl", "karma_web_test_suite")
 load("@npm//@bazel/typescript:index.bzl", "ts_library")
 load("@npm_angular_bazel//:index.bzl", "ng_module")
 
@@ -59,7 +59,7 @@ ts_library(
     ],
 )
 
-concatjs_web_test_suite(
+karma_web_test_suite(
     name = "test",
     srcs = [
         # We are manaully adding the bazel generated named-UMD date-fns bundle here as

examples/protocol_buffers/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@bazel/concatjs:index.bzl", "concatjs_devserver", "concatjs_web_test_suite")
+load("@npm//@bazel/concatjs:index.bzl", "concatjs_devserver", "karma_web_test_suite")
 load("@npm//@bazel/labs:index.bzl", "ts_proto_library")
 load("@npm//@bazel/protractor:index.bzl", "protractor_web_test_suite")
 load("@npm//@bazel/rollup:index.bzl", "rollup_bundle")
@@ -53,7 +53,7 @@ ts_library(
     ],
 )
 
-concatjs_web_test_suite(
+karma_web_test_suite(
     name = "test",
     srcs = [
         "@npm//@bazel/labs/grpc_web:bootstrap_scripts",

examples/web_testing/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@bazel/concatjs:index.bzl", "concatjs_web_test_suite")
+load("@npm//@bazel/concatjs:index.bzl", "karma_web_test_suite")
 load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_library")
 
 ts_library(
@@ -35,7 +35,7 @@ ts_library(
     ],
 )
 
-concatjs_web_test_suite(
+karma_web_test_suite(
     name = "config_test",
     browsers = [
         "@io_bazel_rules_webtesting//browsers:chromium-local",
@@ -55,7 +55,7 @@ concatjs_web_test_suite(
     ],
 )
 
-concatjs_web_test_suite(
+karma_web_test_suite(
     name = "no_config_test",
     browsers = [
         "@io_bazel_rules_webtesting//browsers:chromium-local",

packages/concatjs/_README.md

@@ -19,7 +19,7 @@ Most packages do not ship with this format, so in order to use concatjs tooling,
 This is at the core of how Google does JavaScript development.
 So Bazel rules that originated in Google's codebase have affordances for concatjs.
 For example `ts_library` produces named AMD modules in its "devmode" output, and
-`concatjs_web_test` expects to bundle inputs using concatjs.
+`karma_web_test` expects to bundle inputs using concatjs.
 
 ## Serving JS in development mode under Bazel
 
@@ -78,13 +78,13 @@ finishes.
 
 ## Testing with Karma
 
-The `concatjs_web_test` rule runs karma tests with Bazel.
+The `karma_web_test` rule runs karma tests with Bazel.
 
 It depends on rules_webtesting, so you need to add this to your `WORKSPACE`
 if you use the web testing rules in `@bazel/concatjs`:
 
 ```python
-# Fetch transitive Bazel dependencies of concatjs_web_test
+# Fetch transitive Bazel dependencies of karma_web_test
 http_archive(
     name = "io_bazel_rules_webtesting",
     sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3",
@@ -109,7 +109,7 @@ browser_repositories(
 If you didn't use the `yarn_install` or `npm_install` rule to create an `npm` workspace, you'll have to declare a rule in your root `BUILD.bazel` file to execute karma:
 
 ```python
-# Create a karma rule to use in concatjs_web_test_suite karma
+# Create a karma rule to use in karma_web_test_suite karma
 # attribute when using self-managed dependencies
 nodejs_binary(
     name = "karma/karma",

packages/concatjs/index.bzl

@@ -19,11 +19,11 @@ Users should not load files under "/internal"
 
 load("//packages/concatjs/devserver:concatjs_devserver.bzl", _concatjs_devserver = "concatjs_devserver_macro")
 load(
-    "//packages/concatjs/web_test:concatjs_web_test.bzl",
-    _concatjs_web_test = "concatjs_web_test",
-    _concatjs_web_test_suite = "concatjs_web_test_suite",
+    "//packages/concatjs/web_test:karma_web_test.bzl",
+    _karma_web_test = "karma_web_test",
+    _karma_web_test_suite = "karma_web_test_suite",
 )
 
-concatjs_web_test = _concatjs_web_test
-concatjs_web_test_suite = _concatjs_web_test_suite
+karma_web_test = _karma_web_test
+karma_web_test_suite = _karma_web_test_suite
 concatjs_devserver = _concatjs_devserver

packages/concatjs/web_test/BUILD.bazel

@@ -50,7 +50,7 @@ filegroup(
     name = "package_contents",
     srcs = [
         "BUILD.bazel",
-        "concatjs_web_test.bzl",
         "karma.conf.js",
+        "karma_web_test.bzl",
     ],
 )

packages/concatjs/web_test/concatjs_web_test.bzl

@@ -31,7 +31,7 @@ KARMA_PEER_DEPS = [
     "@npm//requirejs",
 ]
 
-CONCATJS_WEB_TEST_ATTRS = {
+karma_web_TEST_ATTRS = {
     "bootstrap": attr.label_list(
         doc = """JavaScript files to include *before* the module loader (require.js).
         For example, you can include Reflect,js for TypeScript decorator metadata reflection,
@@ -207,7 +207,7 @@ def _write_karma_config(ctx, files, amd_names_shim):
 
     return configuration
 
-def _concatjs_web_test_impl(ctx):
+def _karma_web_test_impl(ctx):
     files_depsets = [depset(ctx.files.srcs)]
     for dep in ctx.attr.deps + ctx.attr.runtime_deps:
         if JSNamedModuleInfo in dep:
@@ -316,17 +316,17 @@ ${{COMMAND}}
         executable = ctx.outputs.executable,
     )]
 
-_concatjs_web_test = rule(
-    implementation = _concatjs_web_test_impl,
+_karma_web_test = rule(
+    implementation = _karma_web_test_impl,
     test = True,
     executable = True,
-    attrs = CONCATJS_WEB_TEST_ATTRS,
+    attrs = karma_web_TEST_ATTRS,
     outputs = {
         "configuration": "%{name}.conf.js",
     },
 )
 
-def concatjs_web_test(
+def karma_web_test(
         srcs = [],
         deps = [],
         data = [],
@@ -361,7 +361,7 @@ def concatjs_web_test(
 
     By default we open a headless Chrome. To use a real Chrome browser window, you can pass
     `--define DISPLAY=true` to Bazel, along with `configuration_env_vars = ["DISPLAY"]` on
-    `concatjs_web_test`.
+    `karma_web_test`.
 
     Args:
       srcs: A list of JavaScript test files
@@ -385,11 +385,11 @@ def concatjs_web_test(
           certain attributes of this configuration file. Attributes that are
           overridden will be outputted to the test log.
       tags: Standard Bazel tags, this macro adds tags for ibazel support
-      peer_deps: list of peer npm deps required by concatjs_web_test
-      **kwargs: Passed through to `concatjs_web_test`
+      peer_deps: list of peer npm deps required by karma_web_test
+      **kwargs: Passed through to `karma_web_test`
     """
 
-    _concatjs_web_test(
+    _karma_web_test(
         srcs = srcs,
         deps = deps + peer_deps,
         data = data,
@@ -405,16 +405,16 @@ def concatjs_web_test(
         **kwargs
     )
 
-def concatjs_web_test_suite(
+def karma_web_test_suite(
         name,
         browsers = None,
         web_test_data = [],
         wrapped_test_tags = list(DEFAULT_WRAPPED_TEST_TAGS),
         **kwargs):
-    """Defines a test_suite of web_test targets that wrap a concatjs_web_test target.
+    """Defines a test_suite of web_test targets that wrap a karma_web_test target.
 
-    This macro accepts all parameters in concatjs_web_test and adds additional parameters
-    for the suite. See concatjs_web_test docs for all concatjs_web_test.
+    This macro accepts all parameters in karma_web_test and adds additional parameters
+    for the suite. See karma_web_test docs for all karma_web_test.
 
     The wrapping macro is `web_test_suite` which comes from rules_websting:
     https://github.com/bazelbuild/rules_webtesting/blob/master/web/web.bzl.
@@ -424,8 +424,8 @@ def concatjs_web_test_suite(
       browsers: A sequence of labels specifying the browsers to use.
       web_test_data: Data dependencies for the wrapper web_test targets.
       wrapped_test_tags: A list of test tag strings to use for the wrapped
-        concatjs_web_test target.
-      **kwargs: Arguments for the wrapped concatjs_web_test target.
+        karma_web_test target.
+      **kwargs: Arguments for the wrapped karma_web_test target.
     """
 
     # Common attributes
@@ -452,9 +452,9 @@ def concatjs_web_test_suite(
         if not "native" in tags:
             tags = tags + ["native"]
 
-    # The wrapped `concatjs_web_test` target
+    # The wrapped `karma_web_test` target
     wrapped_test_name = name + "_wrapped_test"
-    concatjs_web_test(
+    karma_web_test(
         name = wrapped_test_name,
         args = args,
         flaky = flaky,

packages/concatjs/web_test/karma.conf.js

@@ -137,8 +137,8 @@ try {
   }
 
   /**
-   * Configuration settings for karma under Bazel common to concatjs_web_test
-   * and concatjs_web_test_suite.
+   * Configuration settings for karma under Bazel common to karma_web_test
+   * and karma_web_test_suite.
    */
   function configureBazelConfig(config, conf) {
     // list of karma plugins
@@ -279,15 +279,15 @@ try {
   }
 
   /**
-   * Configure karma under concatjs_web_test_suite.
+   * Configure karma under karma_web_test_suite.
    * `browsers` and `customLaunchers` are setup by Bazel.
    */
   function configureTsWebTestSuiteConfig(conf) {
     // WEB_TEST_METADATA is configured in rules_webtesting based on value
     // of the browsers attribute passed to karms_web_test_suite
     // We setup the karma configuration based on the values in this object
     if (!process.env['WEB_TEST_METADATA']) {
-      // This is a concatjs_web_test rule since there is no WEB_TEST_METADATA
+      // This is a karma_web_test rule since there is no WEB_TEST_METADATA
       return;
     }
 
@@ -369,7 +369,7 @@ try {
 
   function configureTsWebTestConfig(conf) {
     if (process.env['WEB_TEST_METADATA']) {
-      // This is a concatjs_web_test_suite rule since there is a WEB_TEST_METADATA
+      // This is a karma_web_test_suite rule since there is a WEB_TEST_METADATA
       return;
     }