@modernpoacher/deps 2.0.21 → 2.0.22

package/README.md

@@ -179,17 +179,17 @@ deps-install \
   --bundle \ # Boolean
   --peer \ # Boolean
   --save \ # Boolean
-  '--registry '<REGISTRY>' \
+  --registry '<REGISTRY>' \
   --force # Boolean
 
 deps-deps \
-  --path=. \
-  --from=. \
-  --only=.
+  --path . \
+  --from . \
+  --only .
 
-deps-wipe --path=.
-deps-push --path=.
-deps-head --path=.
+deps-wipe --path .
+deps-push --path .
+deps-head --path .
 ```
 
 ## *Deps* with its own script targets
@@ -219,15 +219,15 @@ npm run deps-install -- \
   --bundle \ # Boolean
   --peer \ # Boolean
   --save \ # Boolean
-  '--registry '<REGISTRY>' \
+  --registry '<REGISTRY>' \
   --force # Boolean
 
 npm run deps-deps -- \
-  --path=. \
-  --from=. \
-  --only=.
+  --path . \
+  --from . \
+  --only .
 
-npm run deps-wipe -- --path=.
-npm run deps-push -- --path=.
-npm run deps-head -- --path=.
+npm run deps-wipe -- --path .
+npm run deps-push -- --path .
+npm run deps-head -- --path .
 ```

package/bin/common/index.mjs

@@ -4,22 +4,22 @@ import debug from 'debug'
 
 import {
   exec
-} from 'child_process'
+} from 'node:child_process'
 
 import {
   resolve,
   relative,
   normalize
-} from 'path'
+} from 'node:path'
 
 import {
   constants
-} from 'fs'
+} from 'node:fs'
 
 import {
   access,
   readFile
-} from 'fs/promises'
+} from 'node:fs/promises'
 
 import {
   VERSION,

package/bin/deps.sh

@@ -23,17 +23,21 @@ function update {
 }
 
 function can_update {
+  local directory_name
+
+  directory_name="${1##*/}" # directory_name="$(basename "$(git rev-parse --show-toplevel)")"
+
   git_status=$(git status 2> /dev/null)
 
   if [[ $? != 0 ]]
   then
-    echo -e "\033[0;35m$1\033[0m is not configured for Git" # "$1 is not configured for Git"
+    echo -e "\033[0;35m$directory_name\033[0m is not configured for Git" # "$1 is not configured for Git"
 
     return 1
   else
     if [[ ! "$git_status" =~ "nothing to commit" ]]
     then
-      echo -e "\033[0;35m$1\033[0m has changes to commit" # "$1 has changes to commit"
+      echo -e "\033[0;35m$directory_name\033[0m has changes to commit" # "$1 has changes to commit"
 
       return 1
     fi
@@ -43,20 +47,24 @@ function can_update {
 
   if [ -z "$default_branch" ]
   then
-    echo -e "Failed to identify the default branch for \033[0;35m$1\033[0m"
+    echo -e "Failed to identify the default branch for \033[0;35m$directory_name\033[0m"
 
     return 1
   else
-    echo -e "The default branch for \033[0;35m$1\033[0m is '$default_branch'"
+    echo -e "The default branch for \033[0;35m$directory_name\033[0m is '$default_branch'"
 
     return 0
   fi
 }
 
 function report {
+  local directory_name
+
+  directory_name="${1##*/}" # directory_name="$(basename "$(git rev-parse --show-toplevel)")"
+
   echo
   echo "==========================="
-  echo -e "\033[0;35m$1\033[0m" # $1
+  echo -e "\033[0;35m$directory_name\033[0m" # $1
   echo "==========================="
   echo
 }

package/bin/execute/app.mjs

@@ -4,7 +4,7 @@ import debug from 'debug'
 
 import {
   resolve
-} from 'path'
+} from 'node:path'
 
 import glob from 'glob-all'
 

package/bin/head.sh

@@ -5,38 +5,50 @@ export PATH=/usr/local/bin:$PATH
 EXP="[-0-9a-zA-Z]*$"
 
 function report {
+  local directory_name
+
+  directory_name="${1##*/}" # directory_name="$(basename "$(git rev-parse --show-toplevel)")"
+
   echo
   echo "==========================="
-  echo -e "\033[0;35m$1\033[0m" # $1
+  echo -e "\033[0;35m$directory_name\033[0m" # $1
   echo "==========================="
   echo
 }
 
 function has_git {
+  local directory_name
+
+  directory_name="${1##*/}" # directory_name="$(basename "$(git rev-parse --show-toplevel)")"
+
   git_status=$(git status 2> /dev/null)
 
   if [[ $? != 0 ]]
   then
-    echo -e "\033[0;35m$1\033[0m is not configured for Git" # "$1 is not configured for Git"
+    echo -e "\033[0;35m$directory_name\033[0m is not configured for Git" # "$1 is not configured for Git"
 
     return 1
   else
-    echo -e "\033[0;35m$1\033[0m is configured for Git" # "$1 is configured for Git"
+    echo -e "\033[0;35m$directory_name\033[0m is configured for Git" # "$1 is configured for Git"
 
     return 0
   fi
 }
 
 function is_clean {
+  local directory_name
+
+  directory_name="${1##*/}" # directory_name="$(basename "$(git rev-parse --show-toplevel)")"
+
   git_status=$(git status 2> /dev/null)
 
   if [[ ! "$git_status" =~ "nothing to commit" ]]
   then
-    echo -e "\033[0;35m$1\033[0m is not clean" # "$1 is not clean"
+    echo -e "\033[0;35m$directory_name\033[0m is not clean" # "$1 is not clean"
 
     return 1
   else
-    echo -e "\033[0;35m$1\033[0m is clean" # "$1 is clean"
+    echo -e "\033[0;35m$directory_name\033[0m is clean" # "$1 is clean"
 
     return 0
   fi
@@ -55,15 +67,19 @@ function get_current_branch {
 }
 
 function can_git_remote_set_head {
+  local directory_name
+
+  directory_name="${1##*/}" # directory_name="$(basename "$(git rev-parse --show-toplevel)")"
+
   DIR=$(echo "$PWD" | sed 's/\\/\//g' | sed 's/://') && [[ $(cat "$DIR/.git/refs/remotes/origin/HEAD" 2> /dev/null) =~ $EXP ]] && default_branch="${BASH_REMATCH[0]}"
 
   if [ -z "$default_branch" ]
   then
-    echo -e "Failed to identify the default branch for \033[0;35m$1\033[0m"
+    echo -e "Failed to identify the default branch for \033[0;35m$directory_name\033[0m"
 
     return 1
   else
-    echo -e "The default branch for \033[0;35m$1\033[0m is '$default_branch'"
+    echo -e "The default branch for \033[0;35m$directory_name\033[0m is '$default_branch'"
 
     return 0
   fi
@@ -76,10 +92,14 @@ function git_remote_set_head {
 }
 
 function execute {
-  report "${1##*/}"
+  report "$1"
 
   has_git "$1"
 
+  local directory_name
+
+  directory_name="${1##*/}" # directory_name="$(basename "$(git rev-parse --show-toplevel)")"
+
   if [[ $? = 0 ]]
   then
     is_clean "$1"
@@ -96,7 +116,7 @@ function execute {
 
         if [[ $default_branch == $current_branch ]];
         then
-          echo -e "The current branch for \033[0;35m$1\033[0m is '$default_branch'"
+          echo -e "The current branch for \033[0;35m$directory_name\033[0m is '$default_branch'"
 
           return 0
         else
@@ -104,11 +124,11 @@ function execute {
 
           if [[ $? = 1 ]]
           then
-            echo -e "Failed to change current branch for \033[0;35m$1\033[0m to '$default_branch'"
+            echo -e "Failed to change current branch for \033[0;35m$directory_name\033[0m to '$default_branch'"
 
             return 1
           else
-            echo -e "The current branch for \033[0;35m$1\033[0m is '$default_branch'"
+            echo -e "The current branch for \033[0;35m$directory_name\033[0m is '$default_branch'"
 
             return 0
           fi

package/bin/push.sh

@@ -5,9 +5,13 @@ export PATH=/usr/local/bin:$PATH
 EXP="[-0-9a-zA-Z]*$"
 
 function report {
+  local directory_name
+
+  directory_name="${1##*/}" # directory_name="$(basename "$(git rev-parse --show-toplevel)")"
+
   echo
   echo "==========================="
-  echo -e "\033[0;35m$1\033[0m" # $1
+  echo -e "\033[0;35m$directory_name\033[0m" # $1
   echo "==========================="
   echo
 }
@@ -15,19 +19,23 @@ function report {
 function checkout_default_branch {
   DIR=$(echo "$PWD" | sed 's/\\/\//g' | sed 's/://') && [[ $(cat "$DIR/.git/refs/remotes/origin/HEAD" 2> /dev/null) =~ $EXP ]] && default_branch="${BASH_REMATCH[0]}"
 
+  local directory_name
+
+  directory_name="${1##*/}" # directory_name="$(basename "$(git rev-parse --show-toplevel)")"
+
   if [ -z "$default_branch" ]
   then
-    echo -e "Failed to identify the default branch for \033[0;35m$1\033[0m"
+    echo -e "Failed to identify the default branch for \033[0;35m$directory_name\033[0m"
 
     return 1
   else
-    echo -e "The default branch for \033[0;35m$1\033[0m is '$default_branch'"
+    echo -e "The default branch for \033[0;35m$directory_name\033[0m is '$default_branch'"
 
     git checkout $default_branch 2> /dev/null
 
     if [[ $? != 0 ]]
     then
-      echo -e "Failed to checkout the default branch for \033[0;35m$1\033[0m" # "$d is not configured for Git"
+      echo -e "Failed to checkout the default branch for \033[0;35m$directory_name\033[0m" # "$d is not configured for Git"
 
       return 1
     fi
@@ -45,7 +53,7 @@ function update {
 }
 
 function execute {
-  report "${1##*/}"
+  report "$1"
 
   checkout_default_branch "$1"
 

package/bin/wipe.sh

@@ -5,9 +5,13 @@ export PATH=/usr/local/bin:$PATH
 EXP="[-0-9a-zA-Z]*$"
 
 function report {
+  local directory_name
+
+  directory_name="${1##*/}" # directory_name="$(basename "$(git rev-parse --show-toplevel)")"
+
   echo
   echo "==========================="
-  echo -e "\033[0;35m$1\033[0m" # $1
+  echo -e "\033[0;35m$directory_name\033[0m" # $1
   echo "==========================="
   echo
 }
@@ -15,19 +19,23 @@ function report {
 function checkout_default_branch {
   DIR=$(echo "$PWD" | sed 's/\\/\//g' | sed 's/://') && [[ $(cat "$DIR/.git/refs/remotes/origin/HEAD" 2> /dev/null) =~ $EXP ]] && default_branch="${BASH_REMATCH[0]}"
 
+  local directory_name
+
+  directory_name="${1##*/}" # directory_name="$(basename "$(git rev-parse --show-toplevel)")"
+
   if [ -z "$default_branch" ]
   then
-    echo -e "Failed to identify the default branch for \033[0;35m$1\033[0m"
+    echo -e "Failed to identify the default branch for \033[0;35m$directory_name\033[0m"
 
     return 1
   else
-    echo -e "The default branch for \033[0;35m$1\033[0m is '$default_branch'"
+    echo -e "The default branch for \033[0;35m$directory_name\033[0m is '$default_branch'"
 
     git checkout $default_branch 2> /dev/null
 
     if [[ $? != 0 ]]
     then
-      echo -e "Failed to checkout the default branch for \033[0;35m$1\033[0m" # "$d is not configured for Git"
+      echo -e "Failed to checkout the default branch for \033[0;35m$directory_name\033[0m" # "$d is not configured for Git"
 
       return 1
     fi
@@ -46,7 +54,7 @@ function update {
 }
 
 function execute {
-  report "${1##*/}"
+  report "$1"
 
   checkout_default_branch "$1"
 

package/nvm.sh

@@ -2,29 +2,37 @@
 
 NVM=~/.nvm
 
-if [[ -f "$NVM/nvm.sh" ]];
+if [ -f "$NVM/nvm.sh" ];
 then
+  unset npm_package_scripts_nvm
+  unset npm_config_prefix
+  unset npm_lifecycle_script
+
   source $NVM/nvm.sh
 else
-  NVM=$(brew --prefix nvm)
+  NVM=$(brew --prefix nvm 2> /dev/null)
 
-  if [[ -f "$NVM/nvm.sh" ]];
+  if [ -f "$NVM/nvm.sh" ];
   then
+    unset npm_package_scripts_nvm
+    unset npm_config_prefix
+    unset npm_lifecycle_script
+
     source $NVM/nvm.sh
   fi
 fi
 
-VERSION=$(nvm --version)
+VERSION=$(nvm --version 2> /dev/null)
 
-if [[ -z "$VERSION" ]];
+if [ -z "$VERSION" ];
 then
   echo Environment does not have NVM installed
 else
   echo Environment has NVM version $VERSION installed
 
-  set +e
+  set -e
 
-  nvm use &> /dev/null
+  nvm use
 
   if [[ $? != 0 ]];
   then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/deps",
-  "version": "2.0.21",
+  "version": "2.0.22",
   "description": "Update NPM package dependencies from the command line",
   "keywords": [
     "deps",
@@ -58,14 +58,14 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.21.5",
-    "@babel/core": "^7.21.5",
-    "@babel/eslint-parser": "^7.21.3",
+    "@babel/core": "^7.21.8",
+    "@babel/eslint-parser": "^7.21.8",
     "@babel/preset-env": "^7.21.5",
     "@babel/register": "^7.21.0",
     "chai": "^4.3.7",
     "core-js": "^3.30.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.39.0",
+    "eslint": "^8.40.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",

package/src/common/env/index.mjs

@@ -4,15 +4,15 @@ import PATH from '#where-am-i'
 
 import {
   join
-} from 'path'
+} from 'node:path'
 
 import {
   readFileSync
-} from 'fs'
+} from 'node:fs'
 
 import {
   platform
-} from 'os'
+} from 'node:os'
 
 const {
   name: NAME,

package/src/common/git/index.mjs

@@ -2,11 +2,11 @@ import debug from 'debug'
 
 import {
   normalize
-} from 'path'
+} from 'node:path'
 
 import {
   exec
-} from 'child_process'
+} from 'node:child_process'
 
 import {
   VERSION,

package/src/common/index.mjs

@@ -39,7 +39,7 @@ import PATH from '#where-am-i'
 
 import {
   resolve
-} from 'path'
+} from 'node:path'
 
 import {
   VERSION,

package/src/index.mjs

@@ -12,11 +12,11 @@ import debug from 'debug'
 
 import {
   normalize
-} from 'path'
+} from 'node:path'
 
 import {
   exec
-} from 'child_process'
+} from 'node:child_process'
 
 import {
   VERSION,

package/src/install/index.mjs

@@ -12,11 +12,11 @@ import debug from 'debug'
 
 import {
   normalize
-} from 'path'
+} from 'node:path'
 
 import {
   exec
-} from 'child_process'
+} from 'node:child_process'
 
 import {
   VERSION,