Skip to content

fix node patches in node 20.12 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bradzacher merged 4 commits into from
Apr 24, 2024
Merged

fix node patches in node 20.12 #53

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
686a01e
fix node patches in node 20.12
bradzacher Apr 24, 2024
ec11fb0
Update node_patches.js
bradzacher Apr 24, 2024
32dfe83
Update node_patches.js
bradzacher Apr 24, 2024
a69bada
Update node_patches.js
bradzacher Apr 24, 2024
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
31 changes: 18 additions & 13 deletions internal/node/node_patches.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ function patcher$1(fs = fs__namespace, roots) {
if (err) {
return cb(err);
}
path__namespace.resolve(args[0]);
path__namespace.resolve(
// node 20.12 tightened the constraints and requires the input to be a string
String(args[0]));
if (!stats.isSymbolicLink()) {
return cb(null, stats);
}
Expand Down Expand Up @@ -216,7 +218,9 @@ function patcher$1(fs = fs__namespace, roots) {
return str;
};
fs.readdir = (...args) => {
const p = path__namespace.resolve(args[0]);
const p = path__namespace.resolve(
// node 20.12 tightened the constraints and requires the input to be a string
String(args[0]));
let cb = args[args.length - 1];
if (typeof cb !== 'function') {
// this will likely throw callback required error.
Expand All @@ -229,8 +233,7 @@ function patcher$1(fs = fs__namespace, roots) {
}
// user requested withFileTypes
if (result[0] && result[0].isSymbolicLink) {
Promise
.all(result.map((v) => handleDirent(p, v)))
Promise.all(result.map((v) => handleDirent(p, v)))
.then(() => {
cb(null, result);
})
Expand All @@ -247,7 +250,9 @@ function patcher$1(fs = fs__namespace, roots) {
};
fs.readdirSync = (...args) => {
const res = origReaddirSync(...args);
const p = path__namespace.resolve(args[0]);
const p = path__namespace.resolve(
// node 20.12 tightened the constraints and requires the input to be a string
String(args[0]));
res.forEach((v) => {
handleDirentSync(p, v);
});
Expand Down Expand Up @@ -561,21 +566,22 @@ const runfilesPathMatcher = '.runfiles';
function inferRunfilesDirFromPath(maybeRunfilesSource) {
while (maybeRunfilesSource !== '/') {
if (maybeRunfilesSource.endsWith(runfilesPathMatcher)) {
return maybeRunfilesSource + '/';
return (maybeRunfilesSource + '/');
}
maybeRunfilesSource = path__namespace.dirname(maybeRunfilesSource);
}
throw new Error('Path does not contain a runfiles parent directory.');
}
const removeNulls = (value) => value != null;
function removeNulls(value) {
return value != null;
}
function runfilesLocator() {
// Sometimes cwd is under runfiles
const cwd = process.cwd();
// Runfiles environment variables are the preferred reference point, but can fail
const envRunfilesCanidates = [
process.env.RUNFILES_DIR,
process.env.RUNFILES,
].filter(removeNulls).map(runfilesDir => {
const envRunfilesCanidates = [process.env.RUNFILES_DIR, process.env.RUNFILES]
.filter(removeNulls)
.map(runfilesDir => {
const adjustedRunfilesDir = fs__namespace.realpathSync(runfilesDir);
if (runfilesDir !== adjustedRunfilesDir) {
return adjustedRunfilesDir;
Expand Down Expand Up @@ -625,8 +631,7 @@ VERBOSE_LOGS, } = process.env;
if (BAZEL_PATCH_ROOTS) {
const roots = BAZEL_PATCH_ROOTS ? BAZEL_PATCH_ROOTS.split(',') : [];
if (VERBOSE_LOGS) {
console
.error(`bazel node patches enabled. roots: ${roots} symlinks in these directories will not escape`);
console.error(`bazel node patches enabled. roots: ${roots} symlinks in these directories will not escape`);
}
const fs = require('fs');
patcher$1(fs, roots);
Expand Down