From fe90a4c69a087279f44dacf61254a364a64f6e5c Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Fri, 19 Dec 2025 09:37:33 +0000 Subject: [PATCH 1/2] build: switch Node.js toolchain to derive version from .nvmrc. Remove hardcoded node.js version --- MODULE.bazel | 2 +- MODULE.bazel.lock | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 93d0e60b4f70..299263434db5 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -56,7 +56,7 @@ rules_ts_ext.deps( use_repo(rules_ts_ext, **{"npm_typescript": "components_npm_typescript"}) node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node") -node.toolchain(node_version = "22.12.0") +node.toolchain(node_version_from_nvmrc = "//:.nvmrc") use_repo(node, "nodejs_toolchains") pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 63eabfe4a06d..3d50bb90fe26 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1082,7 +1082,7 @@ "@@rules_nodejs+//nodejs:extensions.bzl%node": { "general": { "bzlTransitiveDigest": "NwcLXHrbh2hoorA/Ybmcpjxsn/6avQmewDglodkDrgo=", - "usagesDigest": "4EFhtm5twnSpJMz+Rq0fm1mZHX4kbpwtqhRGWppSY1A=", + "usagesDigest": "vKTYUZ7V3yAw15zU0GBgwkuBQhQOpv3xsdGU894jB04=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -1095,7 +1095,8 @@ "node_urls": [ "https://nodejs.org/dist/v{version}/{filename}" ], - "node_version": "22.12.0", + "node_version": "20.19.5", + "node_version_from_nvmrc": "@@//:.nvmrc", "include_headers": false, "platform": "linux_amd64" } @@ -1108,7 +1109,8 @@ "node_urls": [ "https://nodejs.org/dist/v{version}/{filename}" ], - "node_version": "22.12.0", + "node_version": "20.19.5", + "node_version_from_nvmrc": "@@//:.nvmrc", "include_headers": false, "platform": "linux_arm64" } @@ -1121,7 +1123,8 @@ "node_urls": [ "https://nodejs.org/dist/v{version}/{filename}" ], - "node_version": "22.12.0", + "node_version": "20.19.5", + "node_version_from_nvmrc": "@@//:.nvmrc", "include_headers": false, "platform": "linux_s390x" } @@ -1134,7 +1137,8 @@ "node_urls": [ "https://nodejs.org/dist/v{version}/{filename}" ], - "node_version": "22.12.0", + "node_version": "20.19.5", + "node_version_from_nvmrc": "@@//:.nvmrc", "include_headers": false, "platform": "linux_ppc64le" } @@ -1147,7 +1151,8 @@ "node_urls": [ "https://nodejs.org/dist/v{version}/{filename}" ], - "node_version": "22.12.0", + "node_version": "20.19.5", + "node_version_from_nvmrc": "@@//:.nvmrc", "include_headers": false, "platform": "darwin_amd64" } @@ -1160,7 +1165,8 @@ "node_urls": [ "https://nodejs.org/dist/v{version}/{filename}" ], - "node_version": "22.12.0", + "node_version": "20.19.5", + "node_version_from_nvmrc": "@@//:.nvmrc", "include_headers": false, "platform": "darwin_arm64" } @@ -1173,7 +1179,8 @@ "node_urls": [ "https://nodejs.org/dist/v{version}/{filename}" ], - "node_version": "22.12.0", + "node_version": "20.19.5", + "node_version_from_nvmrc": "@@//:.nvmrc", "include_headers": false, "platform": "windows_amd64" } @@ -1186,7 +1193,8 @@ "node_urls": [ "https://nodejs.org/dist/v{version}/{filename}" ], - "node_version": "22.12.0", + "node_version": "20.19.5", + "node_version_from_nvmrc": "@@//:.nvmrc", "include_headers": false, "platform": "windows_arm64" } From 942f6e494b2b9174a393664c884574cb9e662362 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Fri, 19 Dec 2025 12:56:18 +0000 Subject: [PATCH 2/2] build: add pnpm extension with specified version and integrity Ensure that the same version of pnpm is used. --- MODULE.bazel | 5 +++++ MODULE.bazel.lock | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 299263434db5..7fd963227ed0 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -60,6 +60,11 @@ node.toolchain(node_version_from_nvmrc = "//:.nvmrc") use_repo(node, "nodejs_toolchains") pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm") +pnpm.pnpm( + name = "pnpm", + pnpm_version = "10.26.0", + pnpm_version_integrity = "sha512-Oz9scl6+cSUGwKsa1BM8+GsfS2h+/85iqbOLTXLjlUJC5kMZD8UfoWQpScc19APevUT1yw7dZXq+Y6i2p+HkAg==", +) use_repo(pnpm, "pnpm") npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 3d50bb90fe26..46f83e182d6e 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -406,7 +406,7 @@ "@@aspect_rules_js+//npm:extensions.bzl%pnpm": { "general": { "bzlTransitiveDigest": "tQ+7EwLfQwqi/T4v5/N3NNHTmP6Wu/FqXxRDndEB2OU=", - "usagesDigest": "4zPPt9pTOwrdTWBmkgV1AbopWlVrIKP+Yokpw5c2X+g=", + "usagesDigest": "P+i0x4shIfQ52VgrfmEA2YOTpwyIfLRdaDta4gGRuoU=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -415,11 +415,11 @@ "repoRuleId": "@@aspect_rules_js+//npm/private:npm_import.bzl%npm_import_rule", "attributes": { "package": "pnpm", - "version": "8.15.9", + "version": "10.26.0", "root_package": "", "link_workspace": "", "link_packages": {}, - "integrity": "sha512-SZQ0ydj90aJ5Tr9FUrOyXApjOrzuW7Fee13pDzL0e1E6ypjNXP0AHDHw20VLw4BO3M1XhQHkyik6aBYWa72fgQ==", + "integrity": "sha512-Oz9scl6+cSUGwKsa1BM8+GsfS2h+/85iqbOLTXLjlUJC5kMZD8UfoWQpScc19APevUT1yw7dZXq+Y6i2p+HkAg==", "url": "", "commit": "", "patch_args": [ @@ -442,7 +442,7 @@ "repoRuleId": "@@aspect_rules_js+//npm/private:npm_import.bzl%npm_import_links", "attributes": { "package": "pnpm", - "version": "8.15.9", + "version": "10.26.0", "dev": false, "root_package": "", "link_packages": {},