Skip to content

Commit 5b80c10

Browse files
authored
Upgrade to rules_nodejs 5.8.0 (#1150)
Fixes #1020
1 parent 63a63e1 commit 5b80c10

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

bazel/deps.bzl

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2+
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
23

34
def deps():
4-
excludes = native.existing_rules().keys()
5-
6-
if "build_bazel_rules_nodejs" not in excludes:
7-
http_archive(
8-
name = "build_bazel_rules_nodejs",
9-
sha256 = "4501158976b9da216295ac65d872b1be51e3eeb805273e68c516d2eb36ae1fbb",
10-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.4.1/rules_nodejs-4.4.1.tar.gz"],
11-
)
5+
maybe(
6+
http_archive,
7+
name = "bazel_skylib",
8+
sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d",
9+
urls = [
10+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
11+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
12+
],
13+
)
14+
maybe(
15+
http_archive,
16+
name = "rules_nodejs",
17+
sha256 = "08337d4fffc78f7fe648a93be12ea2fc4e8eb9795a4e6aa48595b66b34555626",
18+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.0/rules_nodejs-core-5.8.0.tar.gz"],
19+
)
20+
maybe(
21+
http_archive,
22+
name = "build_bazel_rules_nodejs",
23+
sha256 = "dcc55f810142b6cf46a44d0180a5a7fb923c04a5061e2e8d8eb05ccccc60864b",
24+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.0/rules_nodejs-5.8.0.tar.gz"],
25+
)

bazel/emscripten_toolchain/BUILD.bazel

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@ load(":toolchain.bzl", "emscripten_cc_toolchain_config_rule")
22

33
package(default_visibility = ["//visibility:public"])
44

5-
# Name depends on rules_nodejs version being used.
6-
# https://github.com/emscripten-core/emsdk/issues/1020
7-
# https://github.com/bazelbuild/rules_nodejs/issues/3375
8-
node_files = "@nodejs_host//:node_files" if existing_rule("@nodejs_host//:node_files") else "@nodejs//:node_files"
9-
105
filegroup(
116
name = "common_files",
127
srcs = [
138
"emscripten_config",
149
"env.sh",
1510
"env.bat",
16-
node_files,
11+
"@nodejs//:node_files",
1712
],
1813
)
1914

0 commit comments

Comments
 (0)