Skip to content

Commit

Permalink
[build] Roll Rust and TS versions, assorted dependencies
Browse files Browse the repository at this point in the history
- Minor WORKSPACE and .bazelrc cleanup
- Adjust generated types comment following TS update
  • Loading branch information
fhanau committed Jul 14, 2024
1 parent 882c33f commit 90ec597
Show file tree
Hide file tree
Showing 24 changed files with 134 additions and 137 deletions.
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ build:windows --remote_download_all
build --//src/workerd/io:enable_experimental_webgpu=True

# Avoid generating duplicate runfile trees. This will become the default in a future bazel version.
build --legacy_external_runfiles=false
build --nolegacy_external_runfiles

# Flip this early to avoid breaking compatibility once it becomes the default.
build --incompatible_disallow_empty_glob
Expand Down
37 changes: 16 additions & 21 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,14 @@ http_archive(
],
sha256 = "ab9aae38a11b931f35d8d1c6d62826d215579892e6ffbf89f20bdce106a9c8c5",
strip_prefix = "sqlite-src-3440000",
type = "zip",
url = "https://sqlite.org/2023/sqlite-src-3440000.zip",
)

http_archive(
name = "rules_python",
integrity = "sha256-SRLO1w3BoqjkuGzsIzsZLKBT6CvHLYd7mOEmFW6PIo0=",
strip_prefix = "rules_python-0.32.2",
url = "https://github.com/bazelbuild/rules_python/releases/download/0.32.2/rules_python-0.32.2.tar.gz",
integrity = "sha256-d4quqz5s/VbWgcifXBDXrWv40vGnLeneVbIwgbLTFhg=",
strip_prefix = "rules_python-0.34.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/0.34.0/rules_python-0.34.0.tar.gz",
)

load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")
Expand Down Expand Up @@ -102,8 +101,6 @@ http_archive(
http_archive(
name = "ada-url",
build_file = "//:build/BUILD.ada-url",
patch_args = ["-p1"],
patches = [],
sha256 = "20b09948cf58362abe4de20b8e709d5041477fb798350fd1a02cde6aad121e08",
type = "zip",
url = "https://github.com/ada-url/ada/releases/download/v2.9.0/singleheader.zip",
Expand All @@ -112,8 +109,6 @@ http_archive(
http_archive(
name = "simdutf",
build_file = "//:build/BUILD.simdutf",
patch_args = ["-p1"],
patches = [],
sha256 = "7867c118a11bb7ccaea0f999a28684b06040027506b424b706146cc912b80ff6",
type = "zip",
url = "https://github.com/simdutf/simdutf/releases/download/v5.2.8/singleheader.zip",
Expand All @@ -123,15 +118,13 @@ http_archive(
name = "pyodide",
build_file = "//:build/BUILD.pyodide",
sha256 = "fbda450a64093a8d246c872bb901ee172a57fe594c9f35bba61f36807c73300d",
type = "tar.bz2",
urls = ["https://github.com/pyodide/pyodide/releases/download/0.26.0a2/pyodide-core-0.26.0a2.tar.bz2"],
)

http_archive(
name = "pyodide_packages",
build_file = "//:build/BUILD.pyodide_packages",
sha256 = "c4a4e0c1cb658a39abc0435cc07df902e5a2ecffc091e0528b96b0c295e309ea",
type = "zip",
urls = ["https://github.com/dom96/pyodide_packages/releases/download/just-stdlib/pyodide_packages.tar.zip"],
)

Expand Down Expand Up @@ -367,7 +360,9 @@ rules_rust_dependencies()

rust_register_toolchains(
edition = "2021",
versions = ["1.75.0"], # LLVM 17
versions = ["1.77.0"], # LLVM 17
# Rust registers wasm targets by default which we don't need, workerd is only built for its native platform.
extra_target_triples = [],
)

load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies")
Expand All @@ -390,23 +385,23 @@ rust_analyzer_dependencies()
# Fetch rules_nodejs before aspect_rules_js, otherwise we'll get an outdated rules_nodejs version.
http_archive(
name = "rules_nodejs",
integrity = "sha256-PoNpJWrWMZeVnSJTxHOp3MV8KEHRdhkOWbkdJdT+nmc=",
strip_prefix = "rules_nodejs-6.1.1",
url = "https://github.com/bazelbuild/rules_nodejs/releases/download/v6.1.1/rules_nodejs-v6.1.1.tar.gz",
integrity = "sha256-h8YXHFvntpU41Gldne0priYmxe12qa3u3ON7Y8c772c=",
strip_prefix = "rules_nodejs-6.2.0",
url = "https://github.com/bazelbuild/rules_nodejs/releases/download/v6.2.0/rules_nodejs-v6.2.0.tar.gz",
)

http_archive(
name = "aspect_rules_js",
sha256 = "eaa18e412822eacf2a98b62630ba0e8d638c6468917ea35bcd5ffb4b12c59fdf",
strip_prefix = "rules_js-1.42.0",
url = "https://github.com/aspect-build/rules_js/archive/refs/tags/v1.42.0.tar.gz",
integrity = "sha256-/GiHCR7jJDZh+1Mv0yRCMLbhk8IlZqA4yf10jKaPuIA=",
strip_prefix = "rules_js-1.42.3",
url = "https://github.com/aspect-build/rules_js/archive/refs/tags/v1.42.3.tar.gz",
)

http_archive(
name = "aspect_rules_ts",
sha256 = "c77f0dfa78c407893806491223c1264c289074feefbf706721743a3556fa7cea",
strip_prefix = "rules_ts-2.2.0",
url = "https://github.com/aspect-build/rules_ts/archive/refs/tags/v2.2.0.tar.gz",
integrity = "sha256-9ppkUrEp052bBfPf+LEFcYW7GVtNrwz/QZmI3nV8bDE=",
strip_prefix = "rules_ts-2.4.2",
url = "https://github.com/aspect-build/rules_ts/archive/refs/tags/v2.4.2.tar.gz",
)

load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
Expand All @@ -422,7 +417,7 @@ nodejs_register_toolchains(
# "WORKERS_MIRROR_URL/https://nodejs.org/dist/v{version}/{filename}",
"https://nodejs.org/dist/v{version}/{filename}",
],
node_version = "20.13.1",
node_version = "20.14.0",
)

load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies", TS_LATEST_VERSION = "LATEST_TYPESCRIPT_VERSION")
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"capnp-ts": "^0.7.0",
"prettier": "^3.2.5",
"typescript": "~5.4.5"
"typescript": "~5.5.3"
},
"devDependencies": {
"@bazel/bazelisk": "~1.19.0",
Expand Down
58 changes: 29 additions & 29 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.ahash-0.8.11.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ rust_library(
deps = [
"@crates_vendor__ahash-0.8.11//:build_script_build",
"@crates_vendor__cfg-if-1.0.0//:cfg_if",
"@crates_vendor__zerocopy-0.7.34//:zerocopy",
"@crates_vendor__zerocopy-0.7.35//:zerocopy",
] + select({
"@rules_rust//rust/platform:aarch64-apple-darwin": [
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
Expand Down
4 changes: 2 additions & 2 deletions rust-deps/crates/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ alias(

alias(
name = "serde",
actual = "@crates_vendor__serde-1.0.203//:serde",
actual = "@crates_vendor__serde-1.0.204//:serde",
tags = ["manual"],
)

alias(
name = "serde_json",
actual = "@crates_vendor__serde_json-1.0.118//:serde_json",
actual = "@crates_vendor__serde_json-1.0.120//:serde_json",
tags = ["manual"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "1.0.100",
version = "1.1.3",
)
2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.clang-ast-0.1.25.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ rust_library(
version = "0.1.25",
deps = [
"@crates_vendor__rustc-hash-2.0.0//:rustc_hash",
"@crates_vendor__serde-1.0.203//:serde",
"@crates_vendor__serde-1.0.204//:serde",
],
)
2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.cssparser-macros-0.6.1.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ rust_proc_macro(
version = "0.6.1",
deps = [
"@crates_vendor__quote-1.0.36//:quote",
"@crates_vendor__syn-2.0.68//:syn",
"@crates_vendor__syn-2.0.71//:syn",
],
)
2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.derive_more-0.99.18.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ rust_proc_macro(
"@crates_vendor__convert_case-0.4.0//:convert_case",
"@crates_vendor__proc-macro2-1.0.86//:proc_macro2",
"@crates_vendor__quote-1.0.36//:quote",
"@crates_vendor__syn-2.0.68//:syn",
"@crates_vendor__syn-2.0.71//:syn",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "0.4.21",
version = "0.4.22",
)
2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.lol_html-1.2.1.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ rust_library(
"@crates_vendor__memchr-2.7.4//:memchr",
"@crates_vendor__mime-0.3.17//:mime",
"@crates_vendor__selectors-0.22.0//:selectors",
"@crates_vendor__thiserror-1.0.61//:thiserror",
"@crates_vendor__thiserror-1.0.62//:thiserror",
],
)
2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.lolhtml-1.1.1.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ rust_library(
"@crates_vendor__encoding_rs-0.8.34//:encoding_rs",
"@crates_vendor__libc-0.2.155//:libc",
"@crates_vendor__lol_html-1.2.1//:lol_html",
"@crates_vendor__thiserror-1.0.61//:thiserror",
"@crates_vendor__thiserror-1.0.62//:thiserror",
],
)
2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.selectors-0.22.0.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ rust_library(
"@crates_vendor__bitflags-1.3.2//:bitflags",
"@crates_vendor__cssparser-0.27.2//:cssparser",
"@crates_vendor__fxhash-0.2.1//:fxhash",
"@crates_vendor__log-0.4.21//:log",
"@crates_vendor__log-0.4.22//:log",
"@crates_vendor__matches-0.1.10//:matches",
"@crates_vendor__phf-0.8.0//:phf",
"@crates_vendor__precomputed-hash-0.1.1//:precomputed_hash",
Expand Down
Loading

0 comments on commit 90ec597

Please sign in to comment.