build: update to rules_nodejs v4.0.0-beta.0 (#42760)

Updates the Bazel NodeJS rules to v4.0.0-beta.0. This is necessary
so that the Angular components repo can update, and it's generally
good to stay as up-to-date as possible with the Bazel rules as it's
easy to fall behind, and updating early allows us to discover issues
affecting our tooling earlier (where they are easier to address due to
e.g. potential breaking change policy).

PR Close #42760

Author: devversion

benchmark/driver-utilities/BUILD.bazel

@@ -1,11 +1,10 @@
-package(default_visibility = ["//visibility:public"])
+load("//dev-infra:defaults.bzl", "ts_library")
 
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+package(default_visibility = ["//visibility:public"])
 
 ts_library(
     name = "driver-utilities",
     srcs = glob(["*.ts"]),
-    module_name = "@angular/dev-infra-private/benchmark/driver-utilities",
     tsconfig = "//dev-infra/benchmark/component_benchmark:tsconfig-e2e.json",
     deps = [
         "//packages/benchpress",

caretaker/BUILD.bazel

@@ -1,13 +1,11 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
-load("//tools:defaults.bzl", "jasmine_node_test")
+load("//dev-infra:defaults.bzl", "jasmine_node_test", "ts_library")
 
 ts_library(
     name = "caretaker",
     srcs = glob(
         ["**/*.ts"],
         exclude = ["**/*.spec.ts"],
     ),
-    module_name = "@angular/dev-infra-private/caretaker",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/release/versioning",
@@ -41,7 +39,6 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["//tools/testing:node_no_angular_es5"],
     deps = [
         ":test_lib",
     ],

commit-message/BUILD.bazel

@@ -1,13 +1,11 @@
-load("//tools:defaults.bzl", "jasmine_node_test")
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "jasmine_node_test", "ts_library")
 
 ts_library(
     name = "commit-message",
     srcs = glob(
         ["**/*.ts"],
         exclude = ["**/*.spec.ts"],
     ),
-    module_name = "@angular/dev-infra-private/commit-message",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/utils",
@@ -41,7 +39,6 @@ ts_library(
 
 jasmine_node_test(
     name = "test",
-    bootstrap = ["//tools/testing:node_no_angular_es5"],
     deps = [
         ":test_lib",
     ],

defaults.bzl

@@ -0,0 +1,67 @@
+"""
+  Defaults for the `//dev-infra` Bazel package. These are different than
+  the defaults in `//tools:defaults.bzl` which are specific to the package
+  structure as seen within `/packages/`.
+"""
+
+load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
+load("@npm//@bazel/jasmine:index.bzl", _jasmine_node_test = "jasmine_node_test")
+load("@npm//@bazel/typescript:index.bzl", _ts_library = "ts_library")
+load("@npm//@bazel/rollup:index.bzl", "rollup_bundle")
+
+NPM_PACKAGE_NAME = "@angular/dev-infra-private"
+
+def _compute_module_name():
+    current_pkg = native.package_name()
+
+    if current_pkg == "dev-infra":
+        return NPM_PACKAGE_NAME
+
+    # For deep targets within `//dev-infra` construct the module name in a way that matches
+    # the structure within the NPM package (i.e. simply appending the actual package path)
+    return "%s/%s" % (NPM_PACKAGE_NAME, current_pkg[len("dev-infra/"):])
+
+def ts_library(name, **kwargs):
+    _ts_library(
+        name = name,
+        # If no `module_name` is set, compute a module name based on the current Bazel
+        # package. The module names should match the NPM package structure so that the NPM
+        # package can be used properly. Note that we disallow any custom `module_name` for
+        # `//dev-infra` as this usually signifies a mistake we want to raise awareness for.
+        module_name = _compute_module_name(),
+        # We use the module name as package name, so that the target can be resolved within
+        # NodeJS executions, by activating the Bazel NodeJS linker.
+        # See: https://github.com/bazelbuild/rules_nodejs/pull/2799.
+        package_name = _compute_module_name(),
+        **kwargs
+    )
+
+def jasmine_node_test(**kwargs):
+    _jasmine_node_test(**kwargs)
+
+# This file continues to serve as indicator for `rules_nodejs` and instructs it to preserve the
+# content output in the NPM install workspace. This allows consumers to use rules and targets from
+# within Bazel. e.g. by using `@npm//@angular/dev-infra-private/<..>`.
+# See: https://github.com/bazelbuild/rules_nodejs/commit/4f508b1a0be1f5444e9c13b0439e649449792fef.
+
+def ng_dev_rolled_up_generated_file(name, entry_point, deps = [], rollup_args = []):
+    """Rollup and generated file test macro.
+
+    This provides a single macro to create a rollup bundled script and a generated file
+    test for the created script to ensure it stays up to date in the repository.
+    """
+    rollup_bundle(
+        name = "%s_bundle" % name,
+        args = rollup_args,
+        entry_point = entry_point,
+        format = "cjs",
+        silent = True,
+        sourcemap = "false",
+        deps = deps,
+    )
+
+    generated_file_test(
+        name = name,
+        src = "%s.js" % name,
+        generated = "%s_bundle" % name,
+    )

format/BUILD.bazel

@@ -1,11 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "format",
     srcs = glob([
         "**/*.ts",
     ]),
-    module_name = "@angular/dev-infra-private/format",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/utils",

index.bzl

@@ -3,32 +3,7 @@
 # Use of this source code is governed by an MIT-style license that can be
 # found in the LICENSE file at https://angular.io/license
 
-load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
-load("@npm//@bazel/rollup:index.bzl", "rollup_bundle")
-
-# This file continues to serve as indicator for `rules_nodejs` and instructs it  preserve the
-# content output in the NPM install workspace. This allows consumers to use rules and targets from
-# within Bazel. e.g. by using `@npm//@angular/dev-infra-private/<..>`.
+# File is currently empty but serves as indicator for `rules_nodejs` and instructs it to
+# preserve the content output in the NPM install workspace. This allows consumers to use
+# rules and targets from within Bazel. e.g. by using `@npm//@angular/dev-infra-private/<..>`.
 # See: https://github.com/bazelbuild/rules_nodejs/commit/4f508b1a0be1f5444e9c13b0439e649449792fef.
-
-def ng_dev_rolled_up_generated_file(name, entry_point, deps = [], rollup_args = []):
-    """Rollup and generated file test macro.
-
-    This provides a single macro to create a rollup bundled script and a generated file test for the
-    created script to ensure it stays up to date in the repository.
-    """
-    rollup_bundle(
-        name = "%s_bundle" % name,
-        args = rollup_args,
-        entry_point = entry_point,
-        format = "cjs",
-        silent = True,
-        sourcemap = "false",
-        deps = deps,
-    )
-
-    generated_file_test(
-        name = name,
-        src = "%s.js" % name,
-        generated = "%s_bundle" % name,
-    )

misc/BUILD.bazel

@@ -1,9 +1,8 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "misc",
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/dev-infra-private/misc/",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/release/build",

ngbot/BUILD.bazel

@@ -1,12 +1,11 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "ngbot",
     srcs = [
         "cli.ts",
         "verify.ts",
     ],
-    module_name = "@angular/dev-infra-private/ngbot",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/utils",

pr/BUILD.bazel

@@ -1,9 +1,8 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "pr",
     srcs = ["cli.ts"],
-    module_name = "@angular/dev-infra-private/pr",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/pr/check-target-branches",

pr/check-target-branches/BUILD.bazel

@@ -1,9 +1,8 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "check-target-branches",
     srcs = glob(["*.ts"]),
-    module_name = "@angular/dev-infra-private/pr/check-target-branches",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/pr/merge",

pr/checkout/BUILD.bazel

@@ -1,9 +1,8 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "checkout",
     srcs = glob(["*.ts"]),
-    module_name = "@angular/dev-infra-private/pr/checkout",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/pr/common",

pr/common/BUILD.bazel

@@ -1,9 +1,8 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "common",
     srcs = glob(["*.ts"]),
-    module_name = "@angular/dev-infra-private/pr/common",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/utils",

pr/discover-new-conflicts/BUILD.bazel

@@ -1,12 +1,11 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "discover-new-conflicts",
     srcs = [
         "cli.ts",
         "index.ts",
     ],
-    module_name = "@angular/dev-infra-private/pr/discover-new-conflicts",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/utils",

pr/merge/BUILD.bazel

@@ -1,13 +1,12 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
-load("//tools:defaults.bzl", "jasmine_node_test")
+load("//dev-infra:defaults.bzl", "jasmine_node_test", "ts_library")
 
 ts_library(
     name = "merge",
     srcs = glob(
         ["**/*.ts"],
         exclude = ["**/*.spec.ts"],
     ),
-    module_name = "@angular/dev-infra-private/pr/merge",
+
     # prodmode target must be set to es5 as the Ora class, which is extended is not a proper
     # prototyped object.
     prodmode_target = "es5",

pr/rebase/BUILD.bazel

@@ -1,12 +1,11 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "rebase",
     srcs = [
         "cli.ts",
         "index.ts",
     ],
-    module_name = "@angular/dev-infra-private/pr/rebase",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/commit-message",

pullapprove/BUILD.bazel

@@ -1,5 +1,4 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
-load("//tools:defaults.bzl", "jasmine_node_test")
+load("//dev-infra:defaults.bzl", "jasmine_node_test", "ts_library")
 
 ts_library(
     name = "pullapprove",
@@ -13,7 +12,6 @@ ts_library(
         "utils.ts",
         "verify.ts",
     ],
-    module_name = "@angular/dev-infra-private/pullapprove",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/utils",

release/BUILD.bazel

@@ -1,11 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "release",
     srcs = glob([
         "**/*.ts",
     ]),
-    module_name = "@angular/dev-infra-private/release",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/release/build",

release/build/BUILD.bazel

@@ -1,5 +1,4 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
-load("//tools:defaults.bzl", "jasmine_node_test")
+load("//dev-infra:defaults.bzl", "jasmine_node_test", "ts_library")
 
 exports_files([
     "build-worker.ts",
@@ -13,7 +12,6 @@ ts_library(
         ],
         exclude = ["*.spec.ts"],
     ),
-    module_name = "@angular/dev-infra-private/release/build",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/release/config",

release/config/BUILD.bazel

@@ -1,11 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "config",
     srcs = glob([
         "**/*.ts",
     ]),
-    module_name = "@angular/dev-infra-private/release/config",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/utils",

release/info/BUILD.bazel

@@ -1,9 +1,8 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "info",
     srcs = ["cli.ts"],
-    module_name = "@angular/dev-infra-private/release/info",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/release/config",

release/notes/BUILD.bazel

@@ -1,11 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "notes",
     srcs = glob([
         "**/*.ts",
     ]),
-    module_name = "@angular/dev-infra-private/release/notes",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/commit-message",

release/publish/BUILD.bazel

@@ -1,11 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
+load("//dev-infra:defaults.bzl", "ts_library")
 
 ts_library(
     name = "publish",
     srcs = glob([
         "**/*.ts",
     ]),
-    module_name = "@angular/dev-infra-private/release/publish",
     visibility = ["//dev-infra:__subpackages__"],
     deps = [
         "//dev-infra/commit-message",

release/publish/test/BUILD.bazel

@@ -1,12 +1,10 @@
-load("@npm//@bazel/typescript:index.bzl", "ts_library")
-load("//tools:defaults.bzl", "jasmine_node_test")
+load("//dev-infra:defaults.bzl", "jasmine_node_test", "ts_library")
 
 ts_library(
     name = "test_lib",
     srcs = glob([
         "**/*.ts",
     ]),
-    module_name = "@angular/dev-infra-private/release/test",
     deps = [
         "//dev-infra/commit-message",
         "//dev-infra/release/config",