8000 Bug-fix eslint by fceller · Pull Request #14335 · arangodb/arangodb · GitHub
[go: up one dir, main page]

Skip to content

Bug-fix eslint #14335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
32 changes: 32 additions & 0 deletions Installation/delistClienNodePackage.sh
Original file line number Diff line number Diff line change
@@ -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"
13 changes: 13 additions & 0 deletions cmake/InstallArangoDBJSClient.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Loading
0