kevin/ohmyzsh
1
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-15 01:48:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

feat(nvm): add _omz_nvm_load function

Browse Source
This commit is contained in:
Carlo Sala 2024-09-19 11:44:51 +02:00
parent 99e2c31484
commit 1514145a09
No known key found for this signature in database
GPG Key ID: DA6FB450C1A4FE9A
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/nvm/README.md
View File

@ -42,6 +42,8 @@ as you want:
zstyle ':omz:plugins:nvm' lazy-cmd eslint prettier typescript ... zstyle ':omz:plugins:nvm' lazy-cmd eslint prettier typescript ...
``` ```
There will be a function `_omz_nvm_load` available to load `nvm` without executing any other trigger command.
#### `.nvmrc` autoload #### `.nvmrc` autoload
Note: _if used at the same time as `lazy`, `autoload` will start working only after nvm has been lazy-loaded_ Note: _if used at the same time as `lazy`, `autoload` will start working only after nvm has been lazy-loaded_

24
plugins/nvm/nvm.plugin.zsh
View File

@ -20,7 +20,7 @@ if [[ -z "$NVM_DIR" ]] || [[ ! -f "$NVM_DIR/nvm.sh" ]]; then
return return
fi fi
function _omz_load_nvm_completion { function _omz_nvm_setup_completion {
local _nvm_completion local _nvm_completion
# Load nvm bash completion # Load nvm bash completion
for _nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do for _nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
@ -33,12 +33,12 @@ function _omz_load_nvm_completion {
break break
fi fi
done done
unfunction _omz_load_nvm_completion unfunction _omz_nvm_setup_completion
} }
function _omz_setup_autoload { function _omz_nvm_setup_autoload {
if ! zstyle -t ':omz:plugins:nvm' autoload; then if ! zstyle -t ':omz:plugins:nvm' autoload; then
unfunction _omz_setup_autoload unfunction _omz_nvm_setup_autoload
return return
fi fi
@ -68,13 +68,13 @@ function _omz_setup_autoload {
add-zsh-hook chpwd load-nvmrc add-zsh-hook chpwd load-nvmrc
load-nvmrc load-nvmrc
unfunction _omz_setup_autoload unfunction _omz_nvm_setup_autoload
} }
if zstyle -t ':omz:plugins:nvm' lazy; then if zstyle -t ':omz:plugins:nvm' lazy; then
# Call nvm when first using nvm, node, npm, pnpm, yarn, corepack or other commands in lazy-cmd # Call nvm when first using nvm, node, npm, pnpm, yarn, corepack or other commands in lazy-cmd
zstyle -a ':omz:plugins:nvm' lazy-cmd nvm_lazy_cmd zstyle -a ':omz:plugins:nvm' lazy-cmd nvm_lazy_cmd
nvm_lazy_cmd=(nvm node npm npx pnpm pnpx yarn corepack $nvm_lazy_cmd) # default values nvm_lazy_cmd=(_omz_nvm_load nvm node npm npx pnpm pnpx yarn corepack $nvm_lazy_cmd) # default values
eval " eval "
function $nvm_lazy_cmd { function $nvm_lazy_cmd {
for func in $nvm_lazy_cmd; do for func in $nvm_lazy_cmd; do
@ -84,14 +84,16 @@ if zstyle -t ':omz:plugins:nvm' lazy; then
done done
# Load nvm if it exists in \$NVM_DIR # Load nvm if it exists in \$NVM_DIR
[[ -f \"\$NVM_DIR/nvm.sh\" ]] && source \"\$NVM_DIR/nvm.sh\" [[ -f \"\$NVM_DIR/nvm.sh\" ]] && source \"\$NVM_DIR/nvm.sh\"
_omz_load_nvm_completion _omz_nvm_setup_completion
_omz_setup_autoload _omz_nvm_setup_autoload
\"\$0\" \"\$@\" if [[ \"\$0\" != _omz_nvm_load ]]; then
\"\$0\" \"\$@\"
fi
} }
" "
unset nvm_lazy_cmd unset nvm_lazy_cmd
else else
source "$NVM_DIR/nvm.sh" source "$NVM_DIR/nvm.sh"
_omz_load_nvm_completion _omz_nvm_setup_completion
_omz_setup_autoload _omz_nvm_setup_autoload
fi fi