From 75ff4a09e63318c899f7e8706438429d8ab8d988 Mon Sep 17 00:00:00 2001 From: Mastermindzh Date: Tue, 16 Jun 2020 21:09:25 +0200 Subject: [PATCH] added husky, prettier and changed editorconfig --- .editorconfig | 22 ---------------------- .prettierrc | 5 ----- package.json | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 27 deletions(-) delete mode 100644 .prettierrc diff --git a/.editorconfig b/.editorconfig index 0c7cae4..7b7287b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,28 +5,6 @@ end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true - -[**.js] -indent_style = space -indent_size = 2 - -[**.json] -indent_style = space -indent_size = 2 - -[**.css] -indent_style = space -indent_size = 2 - -[**.html] -indent_style = space -indent_size = 2 - -[**.jsx] -indent_style = space -indent_size = 2 - -[configure] indent_style = space indent_size = 2 diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index deec031..0000000 --- a/.prettierrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "printWidth": 100, - "semi": true, - "single-quote": false -} \ No newline at end of file diff --git a/package.json b/package.json index 1212981..8cae71e 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ }, "scripts": { "build": "webpack", + "prettier": "prettier 'src/**/*.{js*,ts*,htm*,md,scss}' --write", "patch": "npm --no-git-tag-version version patch", "minor": "npm --no-git-tag-version version minor", "major": "npm --no-git-tag-version version major", @@ -40,6 +41,7 @@ }, "homepage": "https://github.com/Mastermindzh/react-cookie-consent#readme", "devDependencies": { + "@mastermindzh/prettier-config": "^1.0.0", "@types/js-cookie": "^2.2.6", "babel-cli": "^6.26.0", "babel-core": "^6.26.3", @@ -51,7 +53,22 @@ "babel-preset-es2015": "^6.24.1", "babel-preset-stage-1": "^6.24.1", "copy-webpack-plugin": "^4.6.0", + "husky": "^4.2.5", + "lint-staged": "^10.2.10", + "prettier": "^2.0.5", "react": "^16.13.1", "webpack": "^2.6.1" + }, + "prettier": "@mastermindzh/prettier-config", + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "*.{js*,ts*,htm*,md,scss}": [ + "prettier --write", + "git add" + ] } }