Merge tag 'v284' into deps/upstream_v284

Author: Frzk

CHANGELOG.md

@@ -18,6 +18,19 @@
 ## [Unreleased]
 
 
+## [v284] - 2025-02-14
+
+- Added Node.js version 23.8.0.
+
+## [v283] - 2025-02-11
+
+- Added Node.js version 22.14.0.
+- Added Node.js version 20.18.3.
+
+## [v282] - 2025-02-06
+
+- Removed `UV_USE_IO_URING` override. ([#1376](https://github.com/heroku/heroku-buildpack-nodejs/pull/1376))
+
 ## [v281] - 2025-02-05
 
 - Exporting `COREPACK_HOME` to downstream buildpacks to prevent Corepack shims from downloading the requested package manager again in a subsequent buildpack. ([#1374](https://github.com/heroku/heroku-buildpack-nodejs/pull/1374))
@@ -1016,7 +1029,10 @@ Accepts `cacheDirectories` array in package.json to override default `node_modul
 
 - Documented at https://devcenter.heroku.com/articles/nodejs-support#cache-behavior
 
-[unreleased]: https://github.com/heroku/heroku-buildpack-nodejs/compare/v281...main
+[unreleased]: https://github.com/heroku/heroku-buildpack-nodejs/compare/v284...main
+[v284]: https://github.com/heroku/heroku-buildpack-nodejs/compare/v283...v284
+[v283]: https://github.com/heroku/heroku-buildpack-nodejs/compare/v282...v283
+[v282]: https://github.com/heroku/heroku-buildpack-nodejs/compare/v281...v282
 [v281]: https://github.com/heroku/heroku-buildpack-nodejs/compare/v280...v281
 [v280]: https://github.com/heroku/heroku-buildpack-nodejs/compare/v279...v280
 [v279]: https://github.com/heroku/heroku-buildpack-nodejs/compare/v278...v279

bin/compile

@@ -76,19 +76,6 @@ export PATH="$BUILD_DIR/.scalingo/node/bin:$BUILD_DIR/.scalingo/yarn/bin":$PATH
 export COREPACK_HOME="$BUILD_DIR/.scalingo/corepack"
 export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
 
-# 2024-11-20:
-# We started getting reports on build timeouts on the platform that were unexpected
-# due to the specific versions on Node.js and npm which had been working fine up until
-# this date. After some extensive digging, we believe we narrowed down the cause to
-# a bug in io_uring that affects the Amazon Linux 2023 release. There is a pending fix
-# which will be released around Dec. 9th but, until then, the workaround is set disable
-# the use of io_uring in libuv.
-#
-# See https://github.com/npm/cli/issues/7814#issuecomment-2488626736
-# → https://github.com/amazonlinux/amazon-linux-2023/issues/840#issuecomment-2485782075
-# → https://lore.kernel.org/io-uring/[email protected]/T/#m57570b5f8f2fc00d5a17cfe18ffeeba9fc23a43d
-export UV_USE_IO_URING=${UV_USE_IO_URING:-0}
-
 LOG_FILE=$(mktemp -t node-build-log.XXXXX)
 echo "" > "$LOG_FILE"
 

inventory/node.toml

@@ -5761,6 +5761,13 @@ arch = "linux-x64"
 url = "https://heroku-nodebin.s3.us-east-1.amazonaws.com/node/release/linux-x64/node-v20.18.2-linux-x64.tar.gz"
 etag = "57fb9f69599980a53ca41d2e9184b41f-6"
 
+[[releases]]
+version = "20.18.3"
+channel = "release"
+arch = "linux-x64"
+url = "https://heroku-nodebin.s3.us-east-1.amazonaws.com/node/release/linux-x64/node-v20.18.3-linux-x64.tar.gz"
+etag = "775cb781f31b9f4626238c7771c9320f-6"
+
 [[releases]]
 version = "20.2.0"
 channel = "release"
@@ -5985,6 +5992,13 @@ arch = "linux-x64"
 url = "https://heroku-nodebin.s3.us-east-1.amazonaws.com/node/release/linux-x64/node-v22.13.1-linux-x64.tar.gz"
 etag = "079174ec54c6c25c620d70435f0967bc-7"
 
+[[releases]]
+version = "22.14.0"
+channel = "release"
+arch = "linux-x64"
+url = "https://heroku-nodebin.s3.us-east-1.amazonaws.com/node/release/linux-x64/node-v22.14.0-linux-x64.tar.gz"
+etag = "a4f866b8bb6dfb9c061632ce08e2455b-7"
+
 [[releases]]
 version = "22.2.0"
 channel = "release"
@@ -6118,6 +6132,13 @@ arch = "linux-x64"
 url = "https://heroku-nodebin.s3.us-east-1.amazonaws.com/node/release/linux-x64/node-v23.7.0-linux-x64.tar.gz"
 etag = "75c39248ddfca65e360e905adf48c265-7"
 
+[[releases]]
+version = "23.8.0"
+channel = "release"
+arch = "linux-x64"
+url = "https://heroku-nodebin.s3.us-east-1.amazonaws.com/node/release/linux-x64/node-v23.8.0-linux-x64.tar.gz"
+etag = "912a65edbeb289c5b271bef333642020-7"
+
 [[releases]]
 version = "4.0.0"
 channel = "release"

lib/environment.sh

@@ -117,18 +117,6 @@ write_export() {
     echo "export NODE_EXTRA_CA_CERTS=\"\${NODE_EXTRA_CA_CERTS:-/usr/share/ca-certificates/Scalingo/scalingo-database.pem}\"" >> "$bp_dir/export"
     # shellcheck disable=SC2016
     echo 'export NODE_OPTIONS=${NODE_OPTIONS:-"--max_old_space_size=2560"}' >> "$bp_dir/export"
-
-    # 2024-11-21:
-    # Set UV_USE_IO_URING for later buildpacks to prevent build timeouts when
-    # running `yarn install` on some Amazon Linux 2023 releases. This may be
-    # removed in the future when a fixed AL2023 release is available
-    # (~2024-12-09 or later).
-    #
-    # See https://github.com/npm/cli/issues/7814#issuecomment-2488626736
-    # → https://github.com/amazonlinux/amazon-linux-2023/issues/840#issuecomment-2485782075
-    # → https://lore.kernel.org/io-uring/[email protected]/T/#m57570b5f8f2fc00d5a17cfe18ffeeba9fc23a43d
-    echo 'export UV_USE_IO_URING=${UV_USE_IO_URING:-0}' >> "$bp_dir/export"
-
     # ensure corepack installed binaries are findable by downstream buildpacks
     echo "export COREPACK_HOME=\"$build_dir/.heroku/corepack\"" >> "$bp_dir/export"
   fi

test/fixtures/libuv_io_uring_fix/README.md

@@ -2082,21 +2082,6 @@ testConflictingPackageManagerMetadata() {
   assertCapturedError
 }
 
-testDisableIoUringFix() {
-  compile "libuv_io_uring_fix"
-  assertCaptured "UV_USE_IO_URING is set to 0"
-  assertCapturedSuccess
-}
-
-testDisableIoUringFixUserOverride() {
-  cache_dir=$(mktmpdir)
-  env_dir=$(mktmpdir)
-  echo "1" > "$env_dir/UV_USE_IO_URING"
-  compile "libuv_io_uring_fix" "$cache_dir" "$env_dir"
-  assertCaptured "UV_USE_IO_URING is set to 1"
-  assertCapturedSuccess
-}
-
 # Utils
 
 pushd "$(dirname 0)" >/dev/null