Skip to content

Commit f5b8a06

Browse files
committed
[bazel] Expand usage of implementation_deps
This helps us reduce package interdependencies and results in simpler, more readable compile commands. Also do some linting and clean up BUILD.ada-url
1 parent 52c645c commit f5b8a06

File tree

5 files changed

+29
-25
lines changed

5 files changed

+29
-25
lines changed

build/BUILD.ada-url

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
21
cc_library(
32
name = "ada-url",
4-
hdrs = ["ada.h", "ada_c.h"],
53
srcs = ["ada.cpp"],
4+
hdrs = [
5+
"ada.h",
6+
"ada_c.h",
7+
],
68
visibility = ["//visibility:public"],
7-
include_prefix = ".",
8-
copts = ["-w"],
9-
defines = [
10-
"ADA_SSE2=1"
11-
]
129
)

src/workerd/api/BUILD.bazel

+14-10
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,16 @@ wd_cc_library(
6161
name = "rtti",
6262
srcs = ["rtti.c++"],
6363
hdrs = [
64-
"rtti.h",
6564
"modules.h",
66-
"//src/pyodide:generated/pyodide_packages.capnp.h"
65+
"rtti.h",
66+
"//src/pyodide:generated/pyodide_packages.capnp.h",
6767
],
6868
visibility = ["//visibility:public"],
6969
deps = [
7070
":html-rewriter",
71-
"//src/workerd/io",
7271
"//src/pyodide:pyodide_packages_capnp",
72+
"//src/workerd/io",
73+
"//src/workerd/jsg:rtti",
7374
],
7475
)
7576

@@ -79,22 +80,27 @@ wd_cc_library(
7980
name = "html-rewriter",
8081
srcs = ["html-rewriter.c++"],
8182
hdrs = ["html-rewriter.h"],
83+
implementation_deps = [
84+
"@com_cloudflare_lol_html//:lolhtml",
85+
],
8286
visibility = ["//visibility:public"],
8387
deps = [
8488
"//src/workerd/io",
85-
"@com_cloudflare_lol_html//:lolhtml",
8689
],
8790
)
8891

8992
wd_cc_library(
9093
name = "pyodide",
9194
srcs = ["pyodide.c++"],
92-
hdrs = ["pyodide.h", "//src/pyodide:generated/pyodide_packages.capnp.h"],
95+
hdrs = [
96+
"pyodide.h",
97+
"//src/pyodide:generated/pyodide_packages.capnp.h",
98+
],
9399
visibility = ["//visibility:public"],
94100
deps = [
95-
"//src/workerd/server:workerd_capnp",
96-
"//src/pyodide:pyodide",
101+
"//src/pyodide",
97102
"//src/pyodide:pyodide_packages_capnp",
103+
"//src/workerd/server:workerd_capnp",
98104
],
99105
)
100106

@@ -130,7 +136,7 @@ kj_test(
130136
deps = [
131137
"//src/workerd/io",
132138
"//src/workerd/tests:test-fixture",
133-
]
139+
],
134140
)
135141

136142
kj_test(
@@ -159,5 +165,3 @@ kj_test(
159165
) for f in glob(
160166
["**/*.wd-test"],
161167
)]
162-
163-

src/workerd/io/BUILD.bazel

+6-5
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ wd_cc_library(
5555
":set_enable_experimental_webgpu": ["WORKERD_EXPERIMENTAL_ENABLE_WEBGPU"],
5656
"//conditions:default": [],
5757
}),
58+
implementation_deps = [
59+
"@capnp-cpp//src/kj/compat:kj-brotli",
60+
"@capnp-cpp//src/kj/compat:kj-gzip",
61+
],
5862
visibility = ["//visibility:public"],
5963
deps = [
6064
":capnp",
@@ -68,13 +72,10 @@ wd_cc_library(
6872
"//src/workerd/api:analytics-engine_capnp",
6973
"//src/workerd/api:r2-api_capnp",
7074
"//src/workerd/jsg",
71-
"//src/workerd/jsg:rtti",
7275
"//src/workerd/util:sqlite",
7376
"@capnp-cpp//src/capnp:capnp-rpc",
7477
"@capnp-cpp//src/capnp/compat:http-over-capnp",
7578
"@capnp-cpp//src/kj:kj-async",
76-
"@capnp-cpp//src/kj/compat:kj-brotli",
77-
"@capnp-cpp//src/kj/compat:kj-gzip",
7879
] + select({
7980
":set_enable_experimental_webgpu": ["@dawn"],
8081
"//conditions:default": [],
@@ -88,8 +89,8 @@ wd_cc_library(
8889
visibility = ["//visibility:public"],
8990
deps = [
9091
":capnp",
91-
"//src/workerd/util:perfetto",
9292
"//src/workerd/util:own-util",
93+
"//src/workerd/util:perfetto",
9394
"//src/workerd/util:thread-scopes",
9495
"@capnp-cpp//src/kj:kj-async",
9596
"@capnp-cpp//src/kj/compat:kj-http",
@@ -109,7 +110,7 @@ wd_cc_library(
109110
wd_cc_library(
110111
name = "limit-enforcer",
111112
hdrs = ["limit-enforcer.h"],
112-
visibility = ["//visibility:public"]
113+
visibility = ["//visibility:public"],
113114
)
114115

115116
wd_cc_library(

src/workerd/jsg/url.c++

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <kj/hash.h>
33

44
extern "C" {
5-
#include <ada_c.h>
5+
#include "ada_c.h"
66
}
77

88
#include <kj/debug.h>

src/workerd/util/BUILD.bazel

+4-2
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@ wd_cc_library(
6161
"sqlite.h",
6262
"sqlite-kv.h",
6363
],
64+
implementation_deps = [
65+
"@sqlite3",
66+
],
6467
visibility = ["//visibility:public"],
6568
deps = [
66-
"@capnp-cpp//src/kj:kj-async",
67-
"@sqlite3",
6869
"//src/workerd/util:sentry",
70+
"@capnp-cpp//src/kj:kj-async",
6971
],
7072
)
7173

0 commit comments

Comments
 (0)