From ad46849c943080322bcf9786a9f743d812c2b725 Mon Sep 17 00:00:00 2001 From: Qi Linzhi Date: Sun, 26 May 2024 19:21:56 -0700 Subject: [PATCH 1/3] feat: update deps.bzl --- bazel/deps.bzl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index a83cfaf847..f6f0fd129c 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -23,12 +23,12 @@ def deps(): maybe( http_archive, name = "rules_nodejs", - sha256 = "08337d4fffc78f7fe648a93be12ea2fc4e8eb9795a4e6aa48595b66b34555626", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.0/rules_nodejs-core-5.8.0.tar.gz"], + sha256 = "3e8369256ad63197959d2253c473a9dcc57c2841d176190e59b91d25d4fe9e67", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/v6.1.1/rules_nodejs-v6.1.1.tar.gz"], ) maybe( http_archive, - name = "build_bazel_rules_nodejs", - sha256 = "dcc55f810142b6cf46a44d0180a5a7fb923c04a5061e2e8d8eb05ccccc60864b", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.0/rules_nodejs-5.8.0.tar.gz"], + name = "aspect_rules_js", + sha256 = "7085e915cdba6f2dc0ce93bef59f5d040a539b510b840456b6ac7ccc2bee7886", + urls = ["https://github.com/aspect-build/rules_js/releases/download/v2.0.0-rc1/rules_js-v2.0.0-rc1.tar.gz"], ) From 1a1f2bb15dd6a548c614cb75799e8811f43f4613 Mon Sep 17 00:00:00 2001 From: Qi Linzhi Date: Sun, 26 May 2024 19:24:14 -0700 Subject: [PATCH 2/3] feat: update emscripten_deps.bzl --- bazel/emscripten_deps.bzl | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl index 6d369453ca..44b0f2bf59 100644 --- a/bazel/emscripten_deps.bzl +++ b/bazel/emscripten_deps.bzl @@ -1,5 +1,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "npm_install") +load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains") +load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock") load(":revisions.bzl", "EMSCRIPTEN_TAGS") def _parse_version(v): @@ -173,36 +174,36 @@ def emscripten_deps(emscripten_version = "latest"): ) if "emscripten_npm_linux" not in excludes: - npm_install( + npm_translate_lock( name = "emscripten_npm_linux", - package_json = "@emscripten_bin_linux//:emscripten/package.json", - package_lock_json = "@emscripten_bin_linux//:emscripten/package-lock.json", + data = ["@emscripten_bin_linux//:emscripten/package.json"], + npm_package_lock = "@emscripten_bin_linux//:emscripten/package-lock.json", ) if "emscripten_npm_linux_arm64" not in excludes: - npm_install( + npm_translate_lock( name = "emscripten_npm_linux_arm64", - package_json = "@emscripten_bin_linux_arm64//:emscripten/package.json", - package_lock_json = "@emscripten_bin_linux_arm64//:emscripten/package-lock.json", + data = ["@emscripten_bin_linux_arm64//:emscripten/package.json"], + npm_package_lock = "@emscripten_bin_linux_arm64//:emscripten/package-lock.json", ) if "emscripten_npm_mac" not in excludes: - npm_install( + npm_translate_lock( name = "emscripten_npm_mac", - package_json = "@emscripten_bin_mac//:emscripten/package.json", - package_lock_json = "@emscripten_bin_mac//:emscripten/package-lock.json", + data = ["@emscripten_bin_mac//:emscripten/package.json"], + npm_package_lock = "@emscripten_bin_mac//:emscripten/package-lock.json", ) if "emscripten_npm_mac_arm64" not in excludes: - npm_install( + npm_translate_lock( name = "emscripten_npm_mac", - package_json = "@emscripten_bin_mac_arm64//:emscripten/package.json", - package_lock_json = "@emscripten_bin_mac_arm64//:emscripten/package-lock.json", + data = ["@emscripten_bin_mac_arm64//:emscripten/package.json"], + npm_package_lock = "@emscripten_bin_mac_arm64//:emscripten/package-lock.json", ) if "emscripten_npm_win" not in excludes: - npm_install( + npm_translate_lock( name = "emscripten_npm_win", - package_json = "@emscripten_bin_win//:emscripten/package.json", - package_lock_json = "@emscripten_bin_win//:emscripten/package-lock.json", + data = ["@emscripten_bin_win//:emscripten/package.json"], + npm_package_lock = "@emscripten_bin_win//:emscripten/package-lock.json", ) From f042de6525576329ea198f688f1c58d923ac3010 Mon Sep 17 00:00:00 2001 From: Qi Linzhi Date: Sun, 26 May 2024 23:50:34 -0700 Subject: [PATCH 3/3] fix: nodejs_register_toolchains --- bazel/emscripten_deps.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl index 44b0f2bf59..95ec0748d5 100644 --- a/bazel/emscripten_deps.bzl +++ b/bazel/emscripten_deps.bzl @@ -118,7 +118,7 @@ def emscripten_deps(emscripten_version = "latest"): excludes = native.existing_rules().keys() if "nodejs_toolchains" not in excludes: # Node 16 is the first version that supports darwin_arm64 - node_repositories( + nodejs_register_toolchains( node_version = "16.6.2", )