Skip to content

Commit

Permalink
[bazel] Expand usage of implementation_deps
Browse files Browse the repository at this point in the history
This helps us reduce package interdependencies and results in simpler,
more readable compile commands.
Move pyodide dependency out of io – it is relatively large and not
needed there.
Also do some linting and clean up BUILD.ada-url
  • Loading branch information
fhanau committed Feb 2, 2024
1 parent 4202b1e commit 510143b
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 26 deletions.
11 changes: 4 additions & 7 deletions build/BUILD.ada-url
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@

cc_library(
name = "ada-url",
hdrs = ["ada.h", "ada_c.h"],
srcs = ["ada.cpp"],
hdrs = [
"ada.h",
"ada_c.h",
],
visibility = ["//visibility:public"],
include_prefix = ".",
copts = ["-w"],
defines = [
"ADA_SSE2=1"
]
)
23 changes: 14 additions & 9 deletions src/workerd/api/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,17 @@ wd_cc_library(
name = "rtti",
srcs = ["rtti.c++"],
hdrs = [
"rtti.h",
"modules.h",
"rtti.h",
"//src/pyodide:generated/pyodide_extra.capnp.h"
],
visibility = ["//visibility:public"],
deps = [
":html-rewriter",
"//src/workerd/io",
"//src/pyodide",
"//src/pyodide:pyodide_extra_capnp",
"//src/workerd/io",
"//src/workerd/jsg:rtti",
],
)

Expand All @@ -79,22 +81,27 @@ wd_cc_library(
name = "html-rewriter",
srcs = ["html-rewriter.c++"],
hdrs = ["html-rewriter.h"],
implementation_deps = [
"@com_cloudflare_lol_html//:lolhtml",
],
visibility = ["//visibility:public"],
deps = [
"//src/workerd/io",
"@com_cloudflare_lol_html//:lolhtml",
],
)

wd_cc_library(
name = "pyodide",
srcs = ["pyodide.c++"],
hdrs = ["pyodide.h", "//src/pyodide:generated/pyodide_extra.capnp.h"],
hdrs = [
"pyodide.h",
"//src/pyodide:generated/pyodide_extra.capnp.h",
],
visibility = ["//visibility:public"],
deps = [
"//src/workerd/server:workerd_capnp",
"//src/pyodide:pyodide",
"//src/pyodide",
"//src/pyodide:pyodide_extra_capnp",
"//src/workerd/server:workerd_capnp",
],
)

Expand Down Expand Up @@ -130,7 +137,7 @@ kj_test(
deps = [
"//src/workerd/io",
"//src/workerd/tests:test-fixture",
]
],
)

kj_test(
Expand Down Expand Up @@ -159,5 +166,3 @@ kj_test(
) for f in glob(
["**/*.wd-test"],
)]


13 changes: 6 additions & 7 deletions src/workerd/io/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ wd_cc_library(
":set_enable_experimental_webgpu": ["WORKERD_EXPERIMENTAL_ENABLE_WEBGPU"],
"//conditions:default": [],
}),
implementation_deps = [
"@capnp-cpp//src/kj/compat:kj-brotli",
"@capnp-cpp//src/kj/compat:kj-gzip",
],
visibility = ["//visibility:public"],
deps = [
":capnp",
Expand All @@ -63,18 +67,13 @@ wd_cc_library(
":worker-interface",
"//src/cloudflare",
"//src/node",
"//src/pyodide",
"//src/pyodide:pyodide_extra_capnp",
"//src/workerd/api:analytics-engine_capnp",
"//src/workerd/api:r2-api_capnp",
"//src/workerd/jsg",
"//src/workerd/jsg:rtti",
"//src/workerd/util:sqlite",
"@capnp-cpp//src/capnp:capnp-rpc",
"@capnp-cpp//src/capnp/compat:http-over-capnp",
"@capnp-cpp//src/kj:kj-async",
"@capnp-cpp//src/kj/compat:kj-brotli",
"@capnp-cpp//src/kj/compat:kj-gzip",
] + select({
":set_enable_experimental_webgpu": ["@dawn"],
"//conditions:default": [],
Expand All @@ -88,8 +87,8 @@ wd_cc_library(
visibility = ["//visibility:public"],
deps = [
":capnp",
"//src/workerd/util:perfetto",
"//src/workerd/util:own-util",
"//src/workerd/util:perfetto",
"//src/workerd/util:thread-scopes",
"@capnp-cpp//src/kj:kj-async",
"@capnp-cpp//src/kj/compat:kj-http",
Expand All @@ -109,7 +108,7 @@ wd_cc_library(
wd_cc_library(
name = "limit-enforcer",
hdrs = ["limit-enforcer.h"],
visibility = ["//visibility:public"]
visibility = ["//visibility:public"],
)

wd_cc_library(
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/jsg/url.c++
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <kj/hash.h>

extern "C" {
#include <ada_c.h>
#include "ada_c.h"
}

#include <kj/debug.h>
Expand Down
6 changes: 4 additions & 2 deletions src/workerd/util/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,13 @@ wd_cc_library(
"sqlite.h",
"sqlite-kv.h",
],
implementation_deps = [
"@sqlite3",
],
visibility = ["//visibility:public"],
deps = [
"@capnp-cpp//src/kj:kj-async",
"@sqlite3",
"//src/workerd/util:sentry",
"@capnp-cpp//src/kj:kj-async",
],
)

Expand Down

0 comments on commit 510143b

Please sign in to comment.