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
28 changes: 5 additions & 23 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,6 @@ node_dev = use_extension(
"node",
dev_dependency = True,
)
use_repo(node_dev, "node16_linux_amd64")
use_repo(node_dev, "node16_darwin_arm64")
use_repo(node_dev, "node16_darwin_amd64")
use_repo(node_dev, "node16_linux_arm64")
use_repo(node_dev, "node16_linux_s390x")
use_repo(node_dev, "node16_linux_ppc64le")
use_repo(node_dev, "node16_windows_amd64")
use_repo(node_dev, "node18_linux_amd64")
use_repo(node_dev, "node18_darwin_arm64")
use_repo(node_dev, "node18_darwin_amd64")
use_repo(node_dev, "node18_linux_arm64")
use_repo(node_dev, "node18_linux_s390x")
use_repo(node_dev, "node18_linux_ppc64le")
use_repo(node_dev, "node18_windows_amd64")
use_repo(node_dev, "node20_linux_amd64")
use_repo(node_dev, "node20_darwin_arm64")
use_repo(node_dev, "node20_darwin_amd64")
Expand All @@ -131,15 +117,11 @@ use_repo(node_dev, "node24_linux_arm64")
use_repo(node_dev, "node24_linux_s390x")
use_repo(node_dev, "node24_linux_ppc64le")
use_repo(node_dev, "node24_windows_amd64")
node_dev.toolchain(node_version = "18.20.4")
node_dev.toolchain(
name = "node16",
node_version = "16.20.0",
)
node_dev.toolchain(
name = "node18",
node_version = "18.20.4",
)

# default name+version
node_dev.toolchain()

# additional custom name+versions
node_dev.toolchain(
name = "node20",
node_version = "20.17.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/js_binary/npm_version_test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const assert = require('assert')
const child_process = require('child_process')
const npmVersion = child_process.execSync('npm --version').toString().trim()
assert.equal(npmVersion, '10.7.0')
assert.equal(npmVersion, '10.8.2')
46 changes: 20 additions & 26 deletions js/private/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -72,32 +72,26 @@ if (parseInt(process.version.slice(1)) !== parseInt(process.argv[2])) {

js_test(
name = "main_default_toolchain",
args = ["18"],
entry_point = "binary_version.js",
)

js_test(
name = "main_toolchain_18",
args = ["18"],
entry_point = "binary_version.js",
# using the select statement will download toolchains for all three platforms
# you can also just provide an individual toolchain if you don't want to download them all
node_toolchain = select({
"@bazel_tools//src/conditions:linux_x86_64": "@node18_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node18_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node18_windows_amd64//:node_toolchain",
}),
)

js_test(
name = "main_toolchain_20",
args = ["20"],
entry_point = "binary_version.js",
# using the select statement will download toolchains for all three platforms
# you can also just provide an individual toolchain if you don't want to download them all
node_toolchain = select({
"@bazel_tools//src/conditions:linux_x86_64": "@node20_linux_amd64//:node_toolchain",
"@bazel_tools//src/conditions:darwin": "@node20_darwin_amd64//:node_toolchain",
"@bazel_tools//src/conditions:windows": "@node20_windows_amd64//:node_toolchain",
}),
)

[
js_test(
name = "main_toolchain_%s" % version,
args = [version],
entry_point = "binary_version.js",
# using the select statement will download toolchains for all three platforms
# you can also just provide an individual toolchain if you don't want to download them all
node_toolchain = select({
"@bazel_tools//src/conditions:linux_x86_64": "@node%s_linux_amd64//:node_toolchain" % version,
"@bazel_tools//src/conditions:darwin": "@node%s_darwin_amd64//:node_toolchain" % version,
"@bazel_tools//src/conditions:windows": "@node%s_windows_amd64//:node_toolchain" % version,
}),
)
for version in [
"20",
"22",
"24",
]
]
2 changes: 1 addition & 1 deletion js/private/test/image/checksum_test.expected
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
91b7822d971ff2561696d8db681172e53b05160b597925f5a03d08f5f4ee8d6f js/private/test/image/cksum_node
c01c8dc7e9a202ec0f0e1bd4e48afcdfc4c71c27ebe186275d525eeb199b29ac js/private/test/image/cksum_node
052600f3a82ab6a4cc12cab7384971c960f9c589fdbfcf21bca563c36ff7d16e js/private/test/image/cksum_package_store_3p
971f291232f3ab63aff37fb66c96fbf0eddc05ea9564b9673d0d2c9bfe958994 js/private/test/image/cksum_package_store_1p
febf95a6d554c9bda3f0515bfd5ef273ac67d31c231d8162beaef8c4b7bc72f3 js/private/test/image/cksum_node_modules
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/
-r-xr-xr-x 0 0 0 91342624 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
-r-xr-xr-x 0 0 0 97607264 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
2 changes: 1 addition & 1 deletion js/private/test/image/custom_owner_test_node.listing
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runf
drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/
drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/
drwxr-xr-x 0 100 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/
-r-xr-xr-x 0 100 0 91342624 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
-r-xr-xr-x 0 100 0 97607264 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
2 changes: 1 addition & 1 deletion js/private/test/image/default_test_node.listing
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runf
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/
-r-xr-xr-x 0 0 0 91342624 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
-r-xr-xr-x 0 0 0 97607264 Jan 1 1970 ./js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/
-r-xr-xr-x 0 0 0 91342624 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
-r-xr-xr-x 0 0 0 97607264 Jan 1 1970 ./app/js/private/test/image/non_ascii/bin2.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
2 changes: 1 addition & 1 deletion js/private/test/image/regex_edge_cases_test_node.listing
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/
drwxr-xr-x 0 0 0 0 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/
-r-xr-xr-x 0 0 0 91342624 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
-r-xr-xr-x 0 0 0 97607264 Jan 1 1970 ./app/js/private/test/image/bin.runfiles/rules_nodejs~~node~nodejs_linux_amd64/bin/nodejs/bin/node
6 changes: 4 additions & 2 deletions js/private/test/node-patches/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ CJS_TESTS = [

# Multiple node toolchains for testing across versions
TOOLCHAINS_NAMES = [
"node16",
"node18",
# default name+version
"nodejs",

# custom versions for tests
"node20",
"node22",
"node24",
Expand Down