run tests on pre push

clrfund · Jun 17, 2021 · 637cecc · 637cecc
1 parent 1c94b86
commit 637cecc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.husky/pre-push b/.husky/pre-push
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn check-format && yarn test:web
diff --git a/vue-app/.prettierrc → .prettierrc b/vue-app/.prettierrc → .prettierrc
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     ]
   },
   "lint-staged": {
-    "**/*.{js,jsx,ts,tsx,json,scss,vue}": [
+    "**/*.{js,ts,json,scss,css,vue}": [
       "prettier --write"
     ]
   },
@@ -33,9 +33,9 @@
     "lint": "yarn workspaces run lint",
     "lint:contracts": "yarn workspace @clrfund/contracts run lint",
     "lint:web": "yarn workspace @clrfund/vue-app run lint",
-    "prettier": "prettier --ignore-path .gitignore \"**/*.+(js|jsx|ts|tsx|json|css|vue)\"",
+    "prettier": "prettier --ignore-path .gitignore \"**/*.+(js|ts|json|scss|css|vue)\"",
     "format": "yarn prettier --write",
-    "check-format": "yarn prettier --list-different",
+    "check-format": "yarn prettier --check",
     "prepare": "husky install"
   },
   "devDependencies": {

diff --git a/vue-app/package.json b/vue-app/package.json
@@ -7,7 +7,7 @@
     "serve": "vue-cli-service serve",
     "build": "rm -rf dist/ && vue-cli-service build",
     "lint": "vue-cli-service lint",
-    "test": "vue-cli-service test:unit",
+    "test": "yarn test:lint && vue-cli-service test:unit",
     "test:lint": "eslint 'src/**/*.{js,ts,vue}'"
   },
   "dependencies": {