summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-12-20 12:09:22 -0500
committerJacob Schatz <jschatz1@gmail.com>2017-12-20 12:09:22 -0500
commit1d7875386059cb880e8ea8766359e87c42ff8ec6 (patch)
treecd89a26c65a0811373e34483ff87aa0c8234eb17
parentf5290c9738bbca7b130ddc86c0cdcc3f35e34c3a (diff)
downloadgitlab-ce-1d7875386059cb880e8ea8766359e87c42ff8ec6.tar.gz
Initial install
-rw-r--r--package.json1
-rw-r--r--scripts/pre-commit11
-rw-r--r--yarn.lock4
3 files changed, 16 insertions, 0 deletions
diff --git a/package.json b/package.json
index 9e816e007ee..fe40cc75148 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
"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",
diff --git a/scripts/pre-commit b/scripts/pre-commit
new file mode 100644
index 00000000000..e3ff5927922
--- /dev/null
+++ b/scripts/pre-commit
@@ -0,0 +1,11 @@
+#!/bin/sh
+jsfiles=$(git diff --cached --name-only --diff-filter=ACM "*.js" "*.jsx" | 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 \ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index c4d1bd3c682..ef1611de82f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5052,6 +5052,10 @@ 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"