Merge remote-tracking branch 'origin/master'

# Conflicts: # package-lock.json # package.json
avniproject · Dec 21, 2023 · 5317a19 · 5317a19
2 parents 46c99a3 + b073ab1
commit 5317a19
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -1,24 +1,22 @@
-set-node-version:
-	. ${NVM_DIR}/nvm.sh && nvm use
-
 clean:
 	rm -rf node_modules
 
-deps: set-node-version
+deps:
 	npm install
 
-start: set-node-version
+start:
 	npm start
 	#ENV='UTC' npm start
 
-test: set-node-version
+tests:
 	npm test
 
+test: tests
+
 zip-app:
 	npm install
 	make zip-app-only
 
 zip-app-only:
 	-rm rules-server.tgz
 	tar -czvf rules-server.tgz  -C ../rules-server .
-
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "express": "^4.14.0",
     "safe-eval": "^0.4.1",
     "uuid": "^7.0.2",
-    "avni-health-modules": "latest",
+    "avni-health-modules": "0.0.24",
     "openchs-models": "1.31.6",
     "rules-config": "https://github.com/avniproject/rules-config.git#fe552da405368bfd138e2f38e605c1d307e3ebe4",
     "lodash": "^4.17.11",