diff --git a/nodejs/extensions.bzl b/nodejs/extensions.bzl index 3a2d932..b092522 100644 --- a/nodejs/extensions.bzl +++ b/nodejs/extensions.bzl @@ -13,24 +13,7 @@ load("//nodejs/private:versions.bzl", "NODEJS_RELEASES") _BUILD_FILE = Label("//:nodejs.BUILD.bazel") _CRATES_BUILD_FILE = Label("//nodejs/private/overlays/crates:BUILD.crates.bazel") _ICU_BUILD_FILE = Label("//nodejs/private/overlays/icu:BUILD.icu.bazel") -_NODEJS_PATCHES = [ - Label("//nodejs/private/patches/nodejs:histogram-windows-intrinsic.patch"), - Label("//nodejs/private/patches/nodejs:libffi-clang-cl-inline-asm.patch"), -] _V8_FAST_FLOAT_BUILD_FILE = Label("//nodejs/private/overlays/v8/third_party/fast_float/src:BUILD.fast_float.bazel") -_V8_PATCHES = [ - Label("//nodejs/private/patches/v8:hermetic-toolchain.patch"), - Label("//nodejs/private/patches/v8:llvm-ml.patch"), - Label("//nodejs/private/patches/v8:nodejs-icu.patch"), - Label("//nodejs/private/patches/v8:nodejs-targets.patch"), - Label("//nodejs/private/patches/v8:temporal.patch"), - Label("//nodejs/private/patches/v8:windows-defines.patch"), - Label("//nodejs/private/patches/v8:windows-libraries.patch"), - Label("//nodejs/private/patches/v8:nodejs-config.patch"), - Label("//nodejs/private/patches/v8:windows-target-config.patch"), - Label("//nodejs/private/patches/v8:zlib.patch"), - Label("//nodejs/private/patches/v8:simd256.patch"), -] def _nodejs_impl(module_ctx): requested_versions = {} @@ -60,7 +43,7 @@ def _nodejs_impl(module_ctx): headers_strip_prefix = release.headers_strip_prefix, headers_urls = release.headers_urls, node_module_version = release.node_module_version, - patches = _NODEJS_PATCHES, + patches = release.node_patches, release = release.release, sha256 = release.sha256, strip_prefix = release.strip_prefix, @@ -76,7 +59,7 @@ def _nodejs_impl(module_ctx): nodejs_v8_repository( name = release.v8_repository_name, fast_float_build_file = _V8_FAST_FLOAT_BUILD_FILE, - patches = _V8_PATCHES, + patches = release.v8_patches, sha256 = release.sha256, strip_prefix = release.v8_strip_prefix, urls = release.urls, diff --git a/nodejs/private/versions.bzl b/nodejs/private/versions.bzl index 394b462..98fa54f 100644 --- a/nodejs/private/versions.bzl +++ b/nodejs/private/versions.bzl @@ -6,11 +6,13 @@ def _nodejs_release( doc_package_lock_sha256, headers_sha256, icu_repository_name, + node_patches, release, repository_name, sha256, node_module_version, v8_repository_name, + v8_patches, v8_version, uv_version): version_parts = release.split(".") @@ -37,6 +39,7 @@ def _nodejs_release( icu_repository_name = icu_repository_name, icu_strip_prefix = "node-v{}/deps/icu-small".format(release), node_module_version = node_module_version, + node_patches = node_patches, release = release, repository_name = repository_name, sha256 = sha256, @@ -47,6 +50,7 @@ def _nodejs_release( ), ], uv_version = uv_version, + v8_patches = v8_patches, v8_repository_name = v8_repository_name, v8_strip_prefix = "node-v{}/deps/v8".format(release), v8_version = v8_version, @@ -59,11 +63,28 @@ NODEJS_RELEASES = { doc_package_lock_sha256 = "961b216809fea8cea581cfa6115c74ac99dc8d743b11f473e4e3911d90bd5bb0", headers_sha256 = "e84075cd1296f089ad17bc87d34cea964bad7f1018378656af16d494adf91d1a", icu_repository_name = "nodejs_icu_26_3_1", + node_patches = [ + Label("//nodejs/private/patches/nodejs:histogram-windows-intrinsic.patch"), + Label("//nodejs/private/patches/nodejs:libffi-clang-cl-inline-asm.patch"), + ], release = "26.3.1", repository_name = "nodejs_26_3_1", sha256 = "979b9b8308a8d2d4a27c662ed50448c85f970c0fd4f5ce8b98e8da78c441f2bc", node_module_version = 147, v8_repository_name = "v8", + v8_patches = [ + Label("//nodejs/private/patches/v8:hermetic-toolchain.patch"), + Label("//nodejs/private/patches/v8:llvm-ml.patch"), + Label("//nodejs/private/patches/v8:nodejs-icu.patch"), + Label("//nodejs/private/patches/v8:nodejs-targets.patch"), + Label("//nodejs/private/patches/v8:temporal.patch"), + Label("//nodejs/private/patches/v8:windows-defines.patch"), + Label("//nodejs/private/patches/v8:windows-libraries.patch"), + Label("//nodejs/private/patches/v8:nodejs-config.patch"), + Label("//nodejs/private/patches/v8:windows-target-config.patch"), + Label("//nodejs/private/patches/v8:zlib.patch"), + Label("//nodejs/private/patches/v8:simd256.patch"), + ], v8_version = "14.6.202.34", uv_version = "1.52.1", ),