Merge pull request #5355 from cloudflare/rm_deps_gen_wksp

chore(deps): move ada-url and brotli to bzlmod

Author: fhanau

build/BUILD.ada-url

@@ -1,38 +1,15 @@
 """Bazel dependencies that were previously in WORKSPACE
 This file is included from the root MODULE.bazel"""
 
-bazel_dep(name = "fast_float", version = "8.0.2")
-bazel_dep(name = "fp16", version = "0.0.0-20210320-0a92994")
-bazel_dep(name = "highway", version = "1.3.0")
-bazel_dep(name = "sqlite3", version = "3.47.0")
-bazel_dep(name = "tcmalloc", version = "0.0.0-20250331-43fcf6e", repo_name = "com_google_tcmalloc")
-
-# We have some patches that aren't included in BCR:
-# https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/sqlite3/3.47.0/patches
-archive_override(
-    module_name = "sqlite3",
-    build_file = "//:build/BUILD.sqlite3",
-    patch_args = ["-p1"],
-    patches = [
-        "//:patches/sqlite/0001-row-counts-plain.patch",
-        "//:patches/sqlite/0002-macOS-missing-PATH-fix.patch",
-        "//:patches/sqlite/0003-sqlite-complete-early-exit.patch",
-        "//:patches/sqlite/0004-invalid-wal-on-rollback-fix.patch",
-    ],
-    remote_file_integrity = {
-        "MODULE.bazel": "sha256-TtpmqyHyks3o0WcSJO0XFyKkHfAIF98wq06+urs3oKI=",
-    },
-    remote_file_urls = {
-        "MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/sqlite3/3.47.0/MODULE.bazel"],
-    },
-    sha256 = "f59c349bedb470203586a6b6d10adb35f2afefa49f91e55a672a36a09a8fedf7",
-    strip_prefix = "sqlite-src-3470000",
-    url = "https://sqlite.org/2024/sqlite-src-3470000.zip",
-)
+bazel_dep(name = "ada-url", version = "3.3.0")
+bazel_dep(name = "brotli", version = "1.1.0")
 
 ########################################################
 # Override BCR versions.
 # We want to avoid version skew with v8, so we use identical versions.
+
+bazel_dep(name = "fast_float")
+
 archive_override(
     module_name = "fast_float",
     build_file_content = """cc_library(
@@ -52,6 +29,8 @@ archive_override(
     url = "https://github.com/fastfloat/fast_float/archive/cb1d42aaa1e14b09e1452cfdef373d051b8c02a4.tar.gz",
 )
 
+bazel_dep(name = "fp16")
+
 archive_override(
     module_name = "fp16",
     build_file_content = "exports_files(glob([\"**\"]))",
@@ -66,19 +45,7 @@ archive_override(
     url = "https://github.com/Maratyszcza/FP16/archive/b3720617faf1a4581ed7e6787cc51722ec7751f0.tar.gz",
 )
 
-archive_override(
-    module_name = "tcmalloc",
-    integrity = "sha256-29cSZUwbEyiW8Y7FneaAzNNYLHeBmAPqBuIciHeE/u0=",
-    remote_file_integrity = {
-        "MODULE.bazel": "sha384-yOIZPSA2AN4Fnlo43D677Up7bTjiB+y1xFzwvLgQH6QIS3eGncWqjo6dTda+Vad2",
-    },
-    remote_file_urls = {
-        "MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/tcmalloc/0.0.0-20250331-43fcf6e/MODULE.bazel"],
-    },
-    strip_prefix = "google-tcmalloc-cf3dc2d",
-    type = "tgz",
-    url = "https://github.com/google/tcmalloc/tarball/cf3dc2d98bd64cb43f4f98db0acaf5028a7b81eb",
-)
+bazel_dep(name = "highway")
 
 archive_override(
     module_name = "highway",
@@ -93,6 +60,47 @@ archive_override(
     url = "https://github.com/google/highway/archive/00fe003dac355b979f36157f9407c7c46448958e.tar.gz",
 )
 
+bazel_dep(name = "sqlite3")
+
+# We have some patches that aren't included in BCR:
+# https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/sqlite3/3.47.0/patches
+archive_override(
+    module_name = "sqlite3",
+    build_file = "//:build/BUILD.sqlite3",
+    patch_args = ["-p1"],
+    patches = [
+        "//:patches/sqlite/0001-row-counts-plain.patch",
+        "//:patches/sqlite/0002-macOS-missing-PATH-fix.patch",
+        "//:patches/sqlite/0003-sqlite-complete-early-exit.patch",
+        "//:patches/sqlite/0004-invalid-wal-on-rollback-fix.patch",
+    ],
+    remote_file_integrity = {
+        "MODULE.bazel": "sha256-TtpmqyHyks3o0WcSJO0XFyKkHfAIF98wq06+urs3oKI=",
+    },
+    remote_file_urls = {
+        "MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/sqlite3/3.47.0/MODULE.bazel"],
+    },
+    sha256 = "f59c349bedb470203586a6b6d10adb35f2afefa49f91e55a672a36a09a8fedf7",
+    strip_prefix = "sqlite-src-3470000",
+    url = "https://sqlite.org/2024/sqlite-src-3470000.zip",
+)
+
+bazel_dep(name = "tcmalloc", repo_name = "com_google_tcmalloc")
+
+archive_override(
+    module_name = "tcmalloc",
+    integrity = "sha256-29cSZUwbEyiW8Y7FneaAzNNYLHeBmAPqBuIciHeE/u0=",
+    remote_file_integrity = {
+        "MODULE.bazel": "sha384-yOIZPSA2AN4Fnlo43D677Up7bTjiB+y1xFzwvLgQH6QIS3eGncWqjo6dTda+Vad2",
+    },
+    remote_file_urls = {
+        "MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/tcmalloc/0.0.0-20250331-43fcf6e/MODULE.bazel"],
+    },
+    strip_prefix = "google-tcmalloc-cf3dc2d",
+    type = "tgz",
+    url = "https://github.com/google/tcmalloc/tarball/cf3dc2d98bd64cb43f4f98db0acaf5028a7b81eb",
+)
+
 ########################################################
 # Libraries which are not on the BCR
 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

build/deps/deps.MODULE.bazel

@@ -8,21 +8,6 @@
       "repo": "capnproto",
       "branch": "v2",
       "extra_strip_prefix": "/c++"
-    },
-    {
-      "name": "ada-url",
-      "type": "github_release",
-      "owner": "ada-url",
-      "repo": "ada",
-      "file_regex": "singleheader.zip",
-      "strip_prefix": "",
-      "build_file": "//:build/BUILD.ada-url"
-    },
-    {
-      "type": "github_release",
-      "name": "brotli",
-      "owner": "google",
-      "repo": "brotli"
     }
   ]
 }

build/deps/deps.jsonc

@@ -1,10 +1,6 @@
 # WARNING: THIS FILE IS AUTOGENERATED BY update-deps.py DO NOT EDIT
 
-load("@//build/deps:gen/dep_ada_url.bzl", "dep_ada_url")
-load("@//build/deps:gen/dep_brotli.bzl", "dep_brotli")
 load("@//build/deps:gen/dep_capnp_cpp.bzl", "dep_capnp_cpp")
 
 def deps_gen():
     dep_capnp_cpp()
-    dep_ada_url()
-    dep_brotli()