Added support for fetching firefox for wasm_bindgen tests on MacOS (#3597)

Thanks to bazelbuild/apple_support#421 `.dmg`
files can now be used to fetch tools on platforms other than MacOS!

Author: UebelAndre

MODULE.bazel

@@ -15,7 +15,7 @@ bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_cc", version = "0.2.4")
 bazel_dep(name = "rules_license", version = "1.0.0")
 bazel_dep(name = "rules_shell", version = "0.4.0")
-bazel_dep(name = "apple_support", version = "1.22.1", repo_name = "build_bazel_apple_support")
+bazel_dep(name = "apple_support", version = "1.23.0", repo_name = "build_bazel_apple_support")
 
 internal_deps = use_extension("//rust/private:internal_extensions.bzl", "i")
 use_repo(

extensions/wasm_bindgen/3rdparty/patches/wasm-bindgen-cli.webdriver_json.patch

@@ -7,7 +7,7 @@ index d392293..7e5a77d 100644
      };
      println!("Try find `webdriver.json` for configure browser's capabilities:");
 -    let capabilities: Capabilities = match File::open("webdriver.json") {
-+    let capabilities: Capabilities = match File::open(std::env::var("WASM_BINDGEN_WEBDRIVER_JSON").unwrap_or("webdriver.json".to_string())) {
++    let capabilities: Capabilities = match File::open(std::env::var("WASM_BINDGEN_TEST_WEBDRIVER_JSON").unwrap_or("webdriver.json".to_string())) {
          Ok(file) => {
              println!("Ok");
              serde_json::from_reader(file)

extensions/wasm_bindgen/MODULE.bazel

@@ -11,6 +11,7 @@ bazel_dep(name = "bazel_skylib", version = "1.8.1")
 bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_cc", version = "0.2.4")
 bazel_dep(name = "aspect_rules_js", version = "2.1.2")
+bazel_dep(name = "apple_support", version = "1.23.0")
 
 rust_ext = use_extension("//:extensions.bzl", "rust_ext")
 use_repo(
@@ -37,6 +38,7 @@ use_repo(
     "firefox_linux_aarch64",
     "firefox_linux_x86_64",
     "firefox_local",
+    "firefox_mac",
     "geckodriver",
     "geckodriver_linux64",
     "geckodriver_linux_aarch64",

extensions/wasm_bindgen/private/wasm_bindgen_test_wrapper.rs

@@ -135,7 +135,7 @@ fn main() {
 
     let updated_webdriver_json = undeclared_test_outputs.join("webdriver.json");
     env.insert(
-        "WASM_BINDGEN_WEBDRIVER_JSON".to_string(),
+        "WASM_BINDGEN_TEST_WEBDRIVER_JSON".to_string(),
         updated_webdriver_json.to_string_lossy().to_string(),
     );
 

extensions/wasm_bindgen/private/webdrivers/chrome/webdriver_chrome.bzl

@@ -111,7 +111,6 @@ def chrome_deps():
         maybe(
             webdriver_repository,
             name = name,
-            original_name = name,
             urls = [data["url"]],
             strip_prefix = "chromedriver-{}".format(platform),
             integrity = data.get("integrity", ""),
@@ -128,7 +127,6 @@ def chrome_deps():
         maybe(
             webdriver_repository,
             name = name,
-            original_name = name,
             urls = [data["url"]],
             strip_prefix = "chrome-headless-shell-{}".format(platform),
             integrity = data.get("integrity", ""),
@@ -149,7 +147,6 @@ def chrome_deps():
         maybe(
             webdriver_repository,
             name = name,
-            original_name = name,
             urls = [data["url"]],
             strip_prefix = "chrome-{}".format(platform),
             integrity = data.get("integrity", ""),

extensions/wasm_bindgen/private/webdrivers/firefox/BUILD.firefox.bazel

@@ -1,6 +1,9 @@
 alias(
     name = "firefox_macos",
-    actual = "@firefox_local//:firefox",
+    actual = select({
+        "@platforms//cpu:aarch64": "@firefox_mac",
+        "//conditions:default": "@firefox_local//:firefox",
+    }),
     target_compatible_with = ["@platforms//os:macos"],
 )
 

extensions/wasm_bindgen/private/webdrivers/firefox/webdriver_firefox.bzl

@@ -123,7 +123,6 @@ def firefox_deps():
         maybe(
             webdriver_repository,
             name = name,
-            original_name = name,
             urls = ["https://github.com/mozilla/geckodriver/releases/download/v{version}/geckodriver-v{version}-{platform}.{archive}".format(
                 version = geckodriver_version,
                 platform = platform,
@@ -145,21 +144,32 @@ def firefox_deps():
     for platform, integrity in {
         "linux-aarch64": "sha256-vveh8MLGr9pl8cHtvj4T/dk1wzaxYkMMfTUTkidAgAo=",
         "linux-x86_64": "sha256-UiL1HKrPzK8PDPeVEX8K03Qi/p1BPvGPLBceFiK5RVo=",
+        "mac": "sha256-B4VZozSRt8XvXc3mL+PIEoNarpi2On4ys79+M8sz/Mg=",
     }.items():
         archive = "tar.xz"
+        firefox_name = "firefox"
+        dash = "-"
+        strip_prefix = "firefox"
         tool = "firefox"
+        if "mac" in platform:
+            archive = "dmg"
+            firefox_name = "Firefox"
+            dash = "%20"
+            strip_prefix = ""
+            tool = "Firefox.app/Contents/MacOS/firefox"
         name = "firefox_{}".format(platform.replace("-", "_"))
         direct_deps.append(struct(repo = name))
         maybe(
             webdriver_repository,
             name = name,
-            original_name = name,
-            urls = ["https://ftp.mozilla.org/pub/firefox/releases/{version}/{platform}/en-US/firefox-{version}.{archive}".format(
+            urls = ["https://ftp.mozilla.org/pub/firefox/releases/{version}/{platform}/en-US/{name}{dash}{version}.{archive}".format(
+                name = firefox_name,
+                dash = dash,
                 version = firefox_version,
                 platform = platform,
                 archive = archive,
             )],
-            strip_prefix = "firefox",
+            strip_prefix = strip_prefix,
             integrity = integrity,
             tool = tool,
         )

extensions/wasm_bindgen/private/webdrivers/webdriver_utils.bzl

@@ -1,5 +1,8 @@
 """Utilities for webdriver repositories"""
 
+load("@apple_support//tools/http_dmg:http_dmg.bzl", "http_dmg")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 def _build_file_repository_impl(repository_ctx):
     repository_ctx.file("WORKSPACE.bazel", """workspace(name = "{}")""".format(
         repository_ctx.name,
@@ -37,52 +40,35 @@ filegroup(
 )
 """
 
-def _webdriver_repository_impl(repository_ctx):
-    result = repository_ctx.download_and_extract(
-        repository_ctx.attr.urls,
-        stripPrefix = repository_ctx.attr.strip_prefix,
-        integrity = repository_ctx.attr.integrity,
-    )
+def webdriver_repository(
+        *,
+        name,
+        tool,
+        urls,
+        integrity = "",
+        **kwargs):
+    """A repository rule for downloading webdriver tools.
 
-    repository_ctx.file("WORKSPACE.bazel", """workspace(name = "{}")""".format(
-        repository_ctx.attr.original_name,
-    ))
+    Args:
+        name (str): The name of the repository
+        tool (str): The name of the webdriver tool being downloaded.
+        urls (list[str]): A list of URLs to a file that will be made available to Bazel.
+        integrity (str): Expected checksum in Subresource Integrity format of the file downloaded.
+        **kwargs (dict): Additional keyword arguments.
+    """
+    impl_rule = http_archive
+    for url in urls:
+        if url.endswith(".dmg"):
+            impl_rule = http_dmg
+            break
 
-    repository_ctx.file("BUILD.bazel", _WEBDRIVER_BUILD_CONTENT.format(
-        name = repository_ctx.attr.original_name,
-        tool = repository_ctx.attr.tool,
-    ))
-
-    return {
-        "integrity": result.integrity,
-        "name": repository_ctx.name,
-        "original_name": repository_ctx.attr.original_name,
-        "strip_prefix": repository_ctx.attr.strip_prefix,
-        "tool": repository_ctx.attr.tool,
-        "urls": repository_ctx.attr.urls,
-    }
-
-webdriver_repository = repository_rule(
-    doc = "A repository rule for downloading webdriver tools.",
-    implementation = _webdriver_repository_impl,
-    attrs = {
-        "integrity": attr.string(
-            doc = """Expected checksum in Subresource Integrity format of the file downloaded.""",
-        ),
-        # TODO: This can be removed in Bazel 8 and it's use moved to `repository_ctx.original_name`.
-        "original_name": attr.string(
-            doc = "The original name of the repository.",
+    impl_rule(
+        name = name,
+        urls = urls,
+        integrity = integrity,
+        build_file_content = _WEBDRIVER_BUILD_CONTENT.format(
+            name = name,
+            tool = tool,
         ),
-        "strip_prefix": attr.string(
-            doc = """A directory prefix to strip from the extracted files.""",
-        ),
-        "tool": attr.string(
-            doc = "The name of the webdriver tool being downloaded.",
-            mandatory = True,
-        ),
-        "urls": attr.string_list(
-            doc = "A list of URLs to a file that will be made available to Bazel.",
-            mandatory = True,
-        ),
-    },
-)
+        **kwargs
+    )