build: use MODULE.bazel instead of WORKSPACE

Author: josephperrott

MODULE.bazel

@@ -1,5 +1,21 @@
-# TODO: Investigate bzlmod and use it where possible.
-
+"""Rules/toolchains for devinfra with Bazel."""
 module(
     name = "devinfra",
-)
+)
+
+register_toolchains(
+    "//bazel/git-toolchain:git_linux_toolchain",
+    "//bazel/git-toolchain:git_macos_x86_toolchain",
+    "//bazel/git-toolchain:git_macos_arm64_toolchain",
+)
+
+bazel_dep(name = "rules_pkg", version = "1.1.0")
+bazel_dep(name = "aspect_rules_jasmine", version = "2.0.0")
+bazel_dep(name = "rules_browsers", version = "1.0.0")
+
+git_override(
+    module_name = "rules_browsers",
+    commit = "c3f7358828a6e9c2b08c23bc33b8982f8daea9e5",
+    remote = "https://github.com/devversion/rules_browsers.git",
+)
+

MODULE.bazel.lock

@@ -5,21 +5,6 @@ workspace(
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-# The PKG rules are needed to build tar packages for integration tests. The builtin
-# rule in `@bazel_tools` is not Windows compatible and outdated.
-http_archive(
-    name = "rules_pkg",
-    sha256 = "8c20f74bca25d2d442b327ae26768c02cf3c99e93fad0381f32be9aab1967675",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.8.1/rules_pkg-0.8.1.tar.gz",
-        "https://github.com/bazelbuild/rules_pkg/releases/download/0.8.1/rules_pkg-0.8.1.tar.gz",
-    ],
-)
-
-load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-
-rules_pkg_dependencies()
-
 http_archive(
     name = "aspect_rules_js",
     sha256 = "b71565da7a811964e30cccb405544d551561e4b56c65f0c0aeabe85638920bd6",
@@ -96,31 +81,6 @@ esbuild_register_toolchains(
     esbuild_version = LATEST_ESBUILD_VERSION,
 )
 
-git_repository(
-    name = "rules_browsers",
-    commit = "56ef8007ea07cd1916429bca8bb523433b0e9cdc",
-    remote = "https://github.com/devversion/rules_browsers.git",
-)
-
-load("@rules_browsers//setup:step_1.bzl", "rules_browsers_setup_1")
-
-rules_browsers_setup_1()
-
-load("@rules_browsers//setup:step_2.bzl", "rules_browsers_setup_2")
-
-rules_browsers_setup_2()
-
-http_archive(
-    name = "aspect_rules_jasmine",
-    sha256 = "0d2f9c977842685895020cac721d8cc4f1b37aae15af46128cf619741dc61529",
-    strip_prefix = "rules_jasmine-2.0.0",
-    url = "https://github.com/aspect-build/rules_jasmine/releases/download/v2.0.0/rules_jasmine-v2.0.0.tar.gz",
-)
-
-load("@aspect_rules_jasmine//jasmine:dependencies.bzl", "rules_jasmine_dependencies")
-
-rules_jasmine_dependencies()
-
 git_repository(
     name = "rules_angular",
     commit = "c8af5c0d27c66387e9e7df3c4dd3155ce7582609",

WORKSPACE

@@ -43,8 +43,8 @@ js_test(
     data = [
         ":server",
         ":test_lib",
-        "@rules_browsers//src/browsers/chromium",
+        "@rules_browsers//browsers/chromium",
     ],
     entry_point = ":server-test.js",
-    toolchains = ["@rules_browsers//src/browsers/chromium:toolchain_alias"],
+    toolchains = ["@rules_browsers//browsers/chromium:toolchain_alias"],
 )

bazel/http-server/test/BUILD.bazel

@@ -11,7 +11,7 @@ integration_test(
     ],
     data = [
         # Makes the chromium binaries available for the `ng test` command.
-        "@rules_browsers//src/browsers/chromium",
+        "@rules_browsers//browsers/chromium",
     ],
     environment = {
         "CHROMEDRIVER_SKIP_DOWNLOAD": "true",
@@ -26,5 +26,5 @@ integration_test(
         "//:yarn_classic_vendored": "yarn",
         "@nodejs_toolchains//:resolved_toolchain": "node",
     },
-    toolchains = ["@rules_browsers//src/browsers/chromium:toolchain_alias"],
+    toolchains = ["@rules_browsers//browsers/chromium:toolchain_alias"],
 )

bazel/integration/tests/angular-cli/BUILD.bazel

@@ -13,6 +13,7 @@ pkg_tar(
     name = "archive",
     srcs = [":npm_package"],
     extension = "tar.gz",
+    package_dir = "package/",
     strip_prefix = "./npm_package",
     visibility = ["//bazel/integration/tests/package_mappings:__pkg__"],
 )

bazel/integration/tests/package_mappings/fake_pkg_srcs/BUILD.bazel

@@ -9,7 +9,7 @@ integration_test(
     ],
     data = [
         # Makes the chromium binaries available for the `ng test` command.
-        "@rules_browsers//src/browsers/chromium",
+        "@rules_browsers//browsers/chromium",
     ],
     environment = {
         "CHROME_BIN": "$(CHROME-HEADLESS-SHELL)",
@@ -22,5 +22,5 @@ integration_test(
         "//:yarn_classic_vendored": "yarn",
         "@nodejs_toolchains//:resolved_toolchain": "node",
     },
-    toolchains = ["@rules_browsers//src/browsers/chromium:toolchain_alias"],
+    toolchains = ["@rules_browsers//browsers/chromium:toolchain_alias"],
 )