Revert "Merge branch 'pre-commit-prettier' into 'master'"
This reverts merge request !16061
This commit is contained in:
parent
0e7e9e32b3
commit
ecf6f1f872
|
@ -61,7 +61,6 @@
|
|||
"mousetrap": "^1.4.6",
|
||||
"name-all-modules-plugin": "^1.0.1",
|
||||
"pikaday": "^1.6.1",
|
||||
"prettier": "^1.9.2",
|
||||
"prismjs": "^1.6.0",
|
||||
"raphael": "^2.2.7",
|
||||
"raven-js": "^3.14.0",
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Check if file exists with -f. Check if in in the gdk rook directory.
|
||||
if [ ! -f ../GDK_ROOT ]; then
|
||||
echo "Please run script from gitlab (e.g. gitlab-development-kit/gitlab) root directory."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
PRECOMMIT=$(git rev-parse --git-dir)/hooks/pre-commit
|
||||
|
||||
# Check if symlink exists with -L. Check if script was already installed.
|
||||
if [ -L $PRECOMMIT ]; then
|
||||
echo "Pre-commit script already installed."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
ln -s ./pre-commit $PRECOMMIT
|
||||
echo "Pre-commit script installed successfully"
|
|
@ -1,18 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Check if file exists with -f. Check if in in the gdk rook directory.
|
||||
if [ ! -f ../GDK_ROOT ]; then
|
||||
echo "Please run pre-commit from gitlab (e.g. gitlab-development-kit/gitlab) root directory."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
jsfiles=$(git diff --cached --name-only --diff-filter=ACM "*.js" | tr '\n' ' ')
|
||||
[ -z "$jsfiles" ] && exit 0
|
||||
|
||||
# Prettify all staged .js files
|
||||
echo "$jsfiles" | xargs ./node_modules/.bin/prettier --write
|
||||
|
||||
# Add back the modified/prettified files to staging
|
||||
echo "$jsfiles" | xargs git add
|
||||
|
||||
exit 0
|
|
@ -5150,10 +5150,6 @@ prettier@^1.7.0:
|
|||
version "1.8.2"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.2.tgz#bff83e7fd573933c607875e5ba3abbdffb96aeb8"
|
||||
|
||||
prettier@^1.9.2:
|
||||
version "1.9.2"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.2.tgz#96bc2132f7a32338e6078aeb29727178c6335827"
|
||||
|
||||
prismjs@^1.6.0:
|
||||
version "1.6.0"
|
||||
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz#118d95fb7a66dba2272e343b345f5236659db365"
|
||||
|
|
Loading…
Reference in New Issue