arangodb · KVS85 · Aug 6, 2021 · Jun 6, 2021 · Aug 5, 2021 · Aug 5, 2021
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,9 @@
 devel
 -----
 
+* Fixed ES-867 and ES-922: removed eslint from NPM packages descriptions and
+  updated netmask package to non-vulnerable version.
+
 * Web UI: Fixes a logical error which occured after re-visiting the logs view
   which lead to not displaying the logs view and its entries correctly
   (BTS-507).

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+ferr() { echo "$*"; exit 1; }
+
+if [ -z "${1// /}" ]; then
+  ferr "Package must be specified!"
+else
+  package=$1
+fi
+
+installDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+if [[ ! -e $installDir/../js/node/package.json || ! -e $installDir/../js/node/package-lock.json ]]; then
+  ferr "No $installDir/../js/node/package.json or $installDir/../js/node/package-lock.json is present!"
+fi
+
+if [[ $(type npm >/dev/null 2>&1) ]]; then
+  ferr "npm isn't present in PATH or not installed in system!"
+elif [[ $(npm --version | cut -d'.' -f 1) < 5 ]]; then
+  echo "A" #ferr "Installed npm is $(npm --version). 5+ version is required!"
+fi
+
+test -d $installDir/../tmp/node && rm -rf $installDir/../tmp/node ; mkdir -p $installDir/../tmp/node
+pushd $installDir/../tmp/node
+cp $installDir/../js/node/package{,-lock}.json .
+npm un --save $package && $(for i in package{,-lock}.json; do cp $i $installDir/../js/node/$i-no-$package; done)
+popd
+
+rm -rf $installDir/../tmp/node
+
+git add $installDir/../js/node/package{,-lock}.json-no-$package
+git commit -m "Update package.json-no-$package and package-lock.json-no-$package with delisted $package"
diff --git a/cmake/InstallArangoDBJSClient.cmake b/cmake/InstallArangoDBJSClient.cmake
@@ -38,4 +38,17 @@ install(
   REGEX "^.*/eslint"                                       EXCLUDE
   REGEX "^.*/.npmignore"                                   EXCLUDE
   REGEX "^.*/.bin"                                         EXCLUDE
+  REGEX "^.*/.*-no-eslint"                                 EXCLUDE
+)
+
+install(
+  FILES ${ARANGODB_SOURCE_DIR}/js/node/package.json-no-eslint
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}/node
+  RENAME package.json
+)
+
+install(
+  FILES ${ARANGODB_SOURCE_DIR}/js/node/package-lock.json-no-eslint
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}/node
+  RENAME package-lock.json
 )