diff --git a/WORKSPACE b/WORKSPACE index cb02075..d40f2b4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -18,6 +18,16 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies") rules_js_dependencies() +load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies") + +rules_ts_dependencies() + +load("@aspect_bazel_lib//lib:repositories.bzl", "DEFAULT_YQ_VERSION", "register_yq_toolchains") + +register_yq_toolchains( + version = DEFAULT_YQ_VERSION, +) + load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains") nodejs_register_toolchains( @@ -37,6 +47,7 @@ load("@aspect_rules_js//js:npm_import.bzl", "translate_pnpm_lock") translate_pnpm_lock( name = "esbuild_plugins", + node_repository = "node16", pnpm_lock = "//examples/plugins:pnpm-lock.json", ) diff --git a/esbuild/dependencies.bzl b/esbuild/dependencies.bzl index 1a7f895..20f23db 100644 --- a/esbuild/dependencies.bzl +++ b/esbuild/dependencies.bzl @@ -33,9 +33,9 @@ def rules_esbuild_dependencies(): maybe( http_archive, name = "aspect_rules_js", - sha256 = "67fd0f62d701a451e17fb48be7208250c203f1e652085d9ee217ed7877fde91b", - strip_prefix = "rules_js-84c810238db555f5775993b1360d2380d098164c", - url = "https://github.com/aspect-build/rules_js/archive/84c810238db555f5775993b1360d2380d098164c.tar.gz", + sha256 = "b8cb1b3704b64fc9efbb42475a6cecbfa49976432a152cfa405679bc4ec6612a", + strip_prefix = "rules_js-a0ec54d93bf468310ae262991b0da207b1ad3604", + url = "https://github.com/aspect-build/rules_js/archive/a0ec54d93bf468310ae262991b0da207b1ad3604.tar.gz", ) maybe( http_archive, diff --git a/esbuild/repositories.bzl b/esbuild/repositories.bzl index 8825e5a..775c648 100644 --- a/esbuild/repositories.bzl +++ b/esbuild/repositories.bzl @@ -40,7 +40,7 @@ node_package() js_binary( name = "launcher", entry_point = "launcher.js", - data = ["//:npm__esbuild"], + data = ["//:np__esbuild"], ) esbuild_toolchain( @@ -99,6 +99,7 @@ If you need custom versions, please file an issue.""".format(esbuild_version, TO npm_import( name = "npm__esbuild_" + esbuild_version, + enable_lifecycle_hooks = False, integrity = TOOL_VERSIONS[esbuild_version]["npm"], package = "esbuild", version = esbuild_version, diff --git a/examples/css/BUILD.bazel b/examples/css/BUILD.bazel index 0485bfe..22b6301 100644 --- a/examples/css/BUILD.bazel +++ b/examples/css/BUILD.bazel @@ -2,7 +2,7 @@ load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files") load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") -load("@aspect_rules_js//ts:ts_project.bzl", "ts_project") +load("@aspect_rules_ts//ts:defs.bzl", "ts_project") load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") # esbuild only knows how to resolve the css file relative to the location of the .js file it sees. diff --git a/internal_deps.bzl b/internal_deps.bzl index cf96761..e004248 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -66,7 +66,15 @@ def rules_esbuild_internal_deps(): maybe( http_archive, name = "aspect_bazel_lib", - sha256 = "b5bdbfe570f5463607b7eff24f239c2f7ec9b2edc8db45a225e9575c4366b410", - strip_prefix = "bazel-lib-0.9.5", - url = "https://github.com/aspect-build/bazel-lib/archive/refs/tags/v0.9.5.tar.gz", + sha256 = "2f6f04a002a9f988ae79107a91a8498892fb03bee978a8bf841eb1bd9fded2ea", + strip_prefix = "bazel-lib-0.9.8", + url = "https://github.com/aspect-build/bazel-lib/archive/refs/tags/v0.9.8.tar.gz", + ) + + maybe( + http_archive, + name = "aspect_rules_ts", + sha256 = "20eb6e7bc87b6a92874167ef35a0af9407d40d6139cefca8b04aba3f61ed6ed9", + strip_prefix = "rules_ts-180371ffa4351bdd32d3630869a607761b3e5acd", + url = "https://github.com/aspect-build/rules_ts/archive/180371ffa4351bdd32d3630869a607761b3e5acd.zip", )