Skip to content

Commit

Permalink
fix(NODE_PATH): KIT_NODE_PATH
Browse files Browse the repository at this point in the history
  • Loading branch information
johnlindquist committed Oct 11, 2024
1 parent 9565467 commit 18cc8b3
Show file tree
Hide file tree
Showing 24 changed files with 158 additions and 147 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
- name: Build Kit
run: |
pnpm i
export NODE_PATH=$(pnpm node -e )
export KIT_NODE_PATH=$(pnpm node -e )
KIT=./.kit pnpm node ./build/build-ci.js
env:
KIT: ${{ env.kit_path }}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"license": "ISC",
"pnpm": {
"overrides": {
"typescript": "5.6.2",
"typescript": "5.6.3",
"esbuild": "0.24.0"
}
},
Expand Down Expand Up @@ -107,7 +107,7 @@
"suggestion": "2.1.2",
"tmp-promise": "3.0.3",
"tsx": "4.19.1",
"typescript": "5.6.2",
"typescript": "5.6.3",
"untildify": "5.0.0",
"vite": "5.4.8",
"zx": "^8.1.9"
Expand Down
84 changes: 42 additions & 42 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions root/bin/kit
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ KIT=$(cd "$(dirname $(readlink -f ${BASH_SOURCE[0]}))/.." &>/dev/null && pwd)
pwd
)"

NODE_PATH="${NODE_PATH:=$($KIT/node_modules/.bin/pnpm node -p "process.execPath" 2>/dev/null || pnpm node -p "process.execPath" 2>/dev/null || node -p "process.execPath" 2>/dev/null)}"
if ! command -v "$NODE_PATH" &> /dev/null; then
NODE_PATH=$(which node)
if [ -z "$NODE_PATH" ]; then
echo "Error: Node.js not found in PATH. Provide an NODE_PATH in your environment." >&2
KIT_NODE_PATH="${KIT_NODE_PATH:=$($KIT/node_modules/.bin/pnpm node -p "process.execPath" 2>/dev/null || pnpm node -p "process.execPath" 2>/dev/null || node -p "process.execPath" 2>/dev/null)}"
if ! command -v "$KIT_NODE_PATH" &> /dev/null; then
KIT_NODE_PATH=$(which node)
if [ -z "$KIT_NODE_PATH" ]; then
echo "Error: Node.js not found in PATH. Provide an KIT_NODE_PATH in your environment." >&2
exit 1
fi
fi
Expand All @@ -31,7 +31,7 @@ KIT_TARGET="terminal" \
KIT="$KIT" \
KENV="$KENV" \
NODE_NO_WARNINGS=1 \
"$NODE_PATH" \
"$KIT_NODE_PATH" \
--loader "file://$KIT/build/loader.js" \
"$KIT/run/terminal.js" \
"$@"
20 changes: 10 additions & 10 deletions root/bin/kit.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,31 @@ if %errorlevel%==0 (
set "KENV=%CD%"
)

REM Set the default NODE_PATH variable to the custom node binary
set "NODE_PATH="
REM Set the default KIT_NODE_PATH variable to the custom node binary
set "KIT_NODE_PATH="
if exist "%KIT%/node_modules/.bin/pnpm" (
for /f "tokens=* USEBACKQ" %%F in (`%KIT%/node_modules/.bin/pnpm node -p "process.execPath" 2^>nul`) do (
set "NODE_PATH=%%F"
set "KIT_NODE_PATH=%%F"
)
)
if not defined NODE_PATH (
if not defined KIT_NODE_PATH (
for /f "tokens=* USEBACKQ" %%F in (`pnpm node -p "process.execPath" 2^>nul`) do (
set "NODE_PATH=%%F"
set "KIT_NODE_PATH=%%F"
)
)
if not defined NODE_PATH (
if not defined KIT_NODE_PATH (
for /f "tokens=* USEBACKQ" %%F in (`node -p "process.execPath" 2^>nul`) do (
set "NODE_PATH=%%F"
set "KIT_NODE_PATH=%%F"
)
)

if not defined NODE_PATH (
echo Node not found, please provide an NODE_PATH in your environment
if not defined KIT_NODE_PATH (
echo Node not found, please provide an KIT_NODE_PATH in your environment
exit /b 1
)

REM Set the NODE_NO_WARNINGS environment variable
set "NODE_NO_WARNINGS=1"

REM Run the terminal.js file with the determined Node.js binary and pass all arguments
"%NODE_PATH%" --loader "file://%KIT%/build/loader.js" "%KIT%/run/terminal.js" %*
"%KIT_NODE_PATH%" --loader "file://%KIT%/build/loader.js" "%KIT%/run/terminal.js" %*
8 changes: 4 additions & 4 deletions root/script
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# ../../ of this script

KIT=$(cd "$(dirname ${BASH_SOURCE[0]})" &> /dev/null && pwd)
NODE_PATH="${NODE_PATH:=$($KIT/node_modules/.bin/pnpm node -p "process.execPath" 2>/dev/null || pnpm node -p "process.execPath" 2>/dev/null || node -p "process.execPath" 2>/dev/null)}"
KIT_NODE_PATH="${KIT_NODE_PATH:=$($KIT/node_modules/.bin/pnpm node -p "process.execPath" 2>/dev/null || pnpm node -p "process.execPath" 2>/dev/null || node -p "process.execPath" 2>/dev/null)}"

if [ -z "$NODE_PATH" ]; then
echo "Error: Node.js not found in PATH. Provide an NODE_PATH in your environment." >&2
if [ -z "$KIT_NODE_PATH" ]; then
echo "Error: Node.js not found in PATH. Provide an KIT_NODE_PATH in your environment." >&2
exit 1
fi

NODE_NO_WARNINGS=1 \
"$NODE_PATH" \
"$KIT_NODE_PATH" \
--loader "file://$KIT/build/loader.js" \
"$KIT/run/terminal.js" \
"$@"
Loading

0 comments on commit 18cc8b3

Please sign in to comment.