Set up nvm to export from script

.github/workflows/build.yml

@@ -16,6 +16,7 @@ on:
     branches:
       - main
       - feature/**
+      - fix/**
     paths:
       - .github/**
       - docker/**

docker/tna-python-dev/bin/dev

@@ -6,8 +6,9 @@ poetry install --no-root --with dev || true
 
 if [ -f "/app/package.json" ]
 then
-  tna-npm install -g [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
-  tna-npm install
+  . tna-nvm
+  npm install -g [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+  npm install
 fi
 
 if [ -d "/home/app/.local/bin/tasks" ]

docker/tna-python-dev/bin/format

@@ -28,7 +28,8 @@ else
 fi
 echo
 
-tna-npm --version
+. tna-nvm
+npm --version
 
 echo "Running prettier..."
 prettier --write /app

docker/tna-python-dev/bin/help

@@ -22,9 +22,6 @@ echo ""
 echo "tna-node"
 echo "  Run a Node command from your package.json"
 echo ""
-echo "tna-npm"
-echo "  Run a command for npm that uses the correct version of Node"
-echo ""
 echo "secret-key"
 echo "  Generate a string that can be used as the environment variable SECRET_KEY"
 echo ""

docker/tna-python-dev/bin/upgrade

@@ -19,7 +19,8 @@ then
   if [ -f "/app/package.json" ]
   then
     echo "Upgrading npm dependencies..."
-    tna-npm update
+    . tna-nvm
+    npm update
   else
     echo "package.json does not exist"
   fi

docker/tna-python/bin/tna-node

@@ -17,5 +17,6 @@ then
   exit 1
 fi
 
-tna-npm install
-tna-npm run "$1"
+. tna-nvm
+npm install
+npm run "$1"

docker/tna-python/bin/tna-npm → docker/tna-python/bin/tna-nvm

@@ -15,5 +15,3 @@ then
     nvm use default --silent
   fi
 fi
-
-npm "$@"