Skip to content

Remove redundant -r Node flags #169

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

Open
PenguinDevs wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove redundant -r Node flags #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d91d2f
Remove redundant -r Node flags
PenguinDevs Jan 10, 2026
5c551b6
Don't use --require in node override if NODE_OPTIONS is set correctly
pimterry Jan 20, 2026
74b428e
Check for forward-slash path instead in NODE_OPTIONS for windows
PenguinDevs Jan 20, 2026
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
24 changes: 18 additions & 6 deletions overrides/path/node
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,21 @@ PATH="$SCRIPT_DIR:$PATH"
# Define the path to our helper script using the reliable SCRIPT_DIR
PREPEND_PATH="$SCRIPT_DIR/../js/prepend-node.js"

# Call node with the given arguments, prefixed with our extra logic
if command -v winpty >/dev/null 2>&1; then
winpty "$real_node" -r "$PREPEND_PATH" "$@"
else
"$real_node" -r "$PREPEND_PATH" "$@"
fi
case "$NODE_OPTIONS" in
*"$HTTP_TOOLKIT_OVERRIDE_PATH"*)
# If our config is already inside NODE_OPTIONS, we don't need to do anything:
if command -v winpty >/dev/null 2>&1; then
winpty "$real_node" "$@"
else
"$real_node" "$@"
fi
;;
*)
# Otherwise, we need to inject --require $PREPEND into the node CLI:
if command -v winpty >/dev/null 2>&1; then
winpty "$real_node" --require "$PREPEND_PATH" "$@"
else
"$real_node" --require "$PREPEND_PATH" "$@"
fi
;;
esac
19 changes: 16 additions & 3 deletions overrides/path/node.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,23 @@ set WRAPPER_FOLDER=%HTTP_TOOLKIT_OVERRIDE_PATH%\path
call set PATH=%%PATH:%WRAPPER_FOLDER%;=%%

REM Get the real node path, store it in %REAL_NODE%
FOR /F "tokens=*" %%g IN ('where node') do (SET REAL_NODE=%%g)
FOR /F "tokens=*" %%g IN ('where node') do (
SET REAL_NODE=%%g
GOTO :Break
)
:Break

REM Reset PATH, so its visible to node & subprocesses
set PATH=%ORIGINALPATH%

REM Start Node for real, with an extra arg to inject our logic
"%REAL_NODE%" -r "%WRAPPER_FOLDER%\..\js\prepend-node.js" %*
REM Check if our config is already inside NODE_OPTIONS, if so then we don't actually
REM need to do anything.
REM NODE_OPTIONS includes forward slash paths even on Windows for some reason, so
REM check for that instead.
set "OVERRIDE_PATH_POSIX=%HTTP_TOOLKIT_OVERRIDE_PATH:\=/%"
echo "%NODE_OPTIONS%" | findstr /C:"%OVERRIDE_PATH_POSIX%" >nul 2>&1
if %errorlevel% equ 0 (
"%REAL_NODE%" %*
) else (
"%REAL_NODE%" --require "%WRAPPER_FOLDER%\..\js\prepend-node.js" %*
)
Loading