Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions e2e/nodejs_host/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"nodejs",
"node16",
"node16_nvmrc",
"node17_custom",
]
]

Expand Down Expand Up @@ -64,5 +65,7 @@
("node16", "npx", []),
("node16_nvmrc", "npm", []),
("node16_nvmrc", "npx", []),
("node17_custom", "npm", []),
("node17_custom", "npx", []),
]
]
21 changes: 21 additions & 0 deletions e2e/nodejs_host/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,20 @@ node.toolchain(
name = "node16_nvmrc",
node_version_from_nvmrc = "//:.nvmrc",
)
node.toolchain(
name = "node17_custom",
node_repositories = {
"17.0.1.custom-darwin_arm64": ("node-v17.0.1-darwin-arm64.tar.gz", "node-v17.0.1-darwin-arm64", "b49c65be9112f7e5de4e39f4f01e541ee73b3d28d3e2bbd3ea85a86952d0dc2d"),
"17.0.1.custom-darwin_amd64": ("node-v17.0.1-darwin-x64.tar.gz", "node-v17.0.1-darwin-x64", "0dfe6f904f3f20652e3d34c60885b790603f120d5d51a53031355827a4eaf6a9"),
"17.0.1.custom-linux_arm64": ("node-v17.0.1-linux-arm64.tar.xz", "node-v17.0.1-linux-arm64", "6cbd83ba5778a1af740a152839026cbd068610ec6e5ebf67739e546eba426171"),
"17.0.1.custom-linux_ppc64le": ("node-v17.0.1-linux-ppc64le.tar.xz", "node-v17.0.1-linux-ppc64le", "3f5665b92bce8c81caf35d1b0e10f59594499c8e5afeb8a12e101dd7dc62e6ed"),
"17.0.1.custom-linux_s390x": ("node-v17.0.1-linux-s390x.tar.xz", "node-v17.0.1-linux-s390x", "df8c44e3f10c14924a2b78530a6dd9e08557bc6694bc6342f18cd4fbdca30dfb"),
"17.0.1.custom-linux_amd64": ("node-v17.0.1-linux-x64.tar.xz", "node-v17.0.1-linux-x64", "30484910d6a25c96902f329c1fdfb753ddff9bf8c65a6e5ec5c818bac8135953"),
"17.0.1.custom-windows_amd64": ("node-v17.0.1-win-x64.zip", "node-v17.0.1-win-x64", "0b644e2499018884027a0fe5e0e159a18acd33e500c63a89898ba687189f7337"),
},
node_urls = ["https://nodejs.org/dist/v17.0.1/{filename}"],
node_version = "17.0.1.custom",
)

# FIXME(6.0): a repo rule with name=foo should create a repo named @foo, not @foo_toolchains
use_repo(
Expand All @@ -38,6 +52,13 @@ use_repo(
"node16_nvmrc_windows_amd64",
"node16_toolchains",
"node16_windows_amd64",
"node17_custom",
"node17_custom_darwin_amd64",
"node17_custom_darwin_arm64",
"node17_custom_linux_amd64",
"node17_custom_linux_arm64",
"node17_custom_toolchains",
"node17_custom_windows_amd64",
"nodejs",
"nodejs_darwin_amd64",
"nodejs_darwin_arm64",
Expand Down
15 changes: 15 additions & 0 deletions e2e/nodejs_host/WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ nodejs_register_toolchains(
node_version_from_nvmrc = "//:.nvmrc",
)

nodejs_register_toolchains(
name = "node17_custom",
node_repositories = {
"17.0.1.custom-darwin_arm64": ("node-v17.0.1-darwin-arm64.tar.gz", "node-v17.0.1-darwin-arm64", "b49c65be9112f7e5de4e39f4f01e541ee73b3d28d3e2bbd3ea85a86952d0dc2d"),
"17.0.1.custom-darwin_amd64": ("node-v17.0.1-darwin-x64.tar.gz", "node-v17.0.1-darwin-x64", "0dfe6f904f3f20652e3d34c60885b790603f120d5d51a53031355827a4eaf6a9"),
"17.0.1.custom-linux_arm64": ("node-v17.0.1-linux-arm64.tar.xz", "node-v17.0.1-linux-arm64", "6cbd83ba5778a1af740a152839026cbd068610ec6e5ebf67739e546eba426171"),
"17.0.1.custom-linux_ppc64le": ("node-v17.0.1-linux-ppc64le.tar.xz", "node-v17.0.1-linux-ppc64le", "3f5665b92bce8c81caf35d1b0e10f59594499c8e5afeb8a12e101dd7dc62e6ed"),
"17.0.1.custom-linux_s390x": ("node-v17.0.1-linux-s390x.tar.xz", "node-v17.0.1-linux-s390x", "df8c44e3f10c14924a2b78530a6dd9e08557bc6694bc6342f18cd4fbdca30dfb"),
"17.0.1.custom-linux_amd64": ("node-v17.0.1-linux-x64.tar.xz", "node-v17.0.1-linux-x64", "30484910d6a25c96902f329c1fdfb753ddff9bf8c65a6e5ec5c818bac8135953"),
"17.0.1.custom-windows_amd64": ("node-v17.0.1-win-x64.zip", "node-v17.0.1-win-x64", "0b644e2499018884027a0fe5e0e159a18acd33e500c63a89898ba687189f7337"),
},
node_urls = ["https://nodejs.org/dist/v17.0.1/{filename}"],
node_version = "17.0.1.custom",
)

http_archive(
name = "bazel_skylib",
sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
Expand Down
10 changes: 10 additions & 0 deletions nodejs/extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def _toolchain_extension(module_ctx):
node_version = v.node_version,
node_version_from_nvmrc = v.node_version_from_nvmrc,
node_urls = v.node_urls,
node_repositories = v.node_repositories,
include_headers = v.include_headers,
register = False,
)
Expand Down Expand Up @@ -84,6 +85,15 @@ This setting creates a dependency on a c++ toolchain.
""",
default = [DEFAULT_NODE_URL],
),
"node_repositories": attr.string_list_dict(
doc = """Custom list of node repositories to use

A dictionary mapping Node.js versions to sets of hosts and their corresponding (filename, strip_prefix, sha256) tuples.
You should list a node binary for every platform users have, likely Mac, Windows, and Linux.

By default, if this attribute has no items, we'll use a list of all public Node.js releases.
""",
),
}

node = module_extension(
Expand Down