From 63328163ab746efc23d7803be8fc7280ea5387b4 Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Tue, 10 May 2022 14:09:41 +0200 Subject: [PATCH] chore: pre-push run lint --- .git-hooks/{pre-commit => pre-push} | 9 ++++++--- package.json | 3 ++- src/auth/AuthManager.ts | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) rename .git-hooks/{pre-commit => pre-push} (56%) diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-push similarity index 56% rename from .git-hooks/pre-commit rename to .git-hooks/pre-push index ddec82b..6e79d5f 100755 --- a/.git-hooks/pre-commit +++ b/.git-hooks/pre-push @@ -3,6 +3,9 @@ # Using `--silent` helps for showing any errs in the first line of the response # The first line is picked up by the VS Code GIT UI popup when rc is not 0 -npm run --silent lint:fix - -exit 0 +if npm run --silent lint:silent ; then + exit 0 +else + echo "❌ Prettier check failed! Please run lint:fix." + exit 1 +fi diff --git a/package.json b/package.json index 02f528b..a88e5e1 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,9 @@ "build": "rimraf build && rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && rimraf build/src && rimraf node", "package:lib": "npm run build && copyfiles ./package.json ./checkNodeVersion.js build && cd build && npm version \"5.0.0\" && npm pack", "publish:lib": "npm run build && cd build && npm publish", - "lint:fix": "npx prettier --loglevel silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"", + "lint:fix": "npx prettier --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"", "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"", + "lint:silent": "npx prettier --loglevel silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"", "test": "jest --silent --coverage", "prepublishOnly": "cp -r ./build/* . && rm -rf ./build", "postpublish": "git clean -fd", diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts index 5d69c94..e442291 100644 --- a/src/auth/AuthManager.ts +++ b/src/auth/AuthManager.ts @@ -171,7 +171,7 @@ export class AuthManager { if (isLoggedIn) { if (this.serverType === ServerType.Sas9) { - await this.performCASSecurityCheck() + await this.performCASSecurityCheck(); } this.loginCallback()