diff --git a/frontend/.eslintignore b/frontend/.eslintignore index 2348c2db..524d155a 100644 --- a/frontend/.eslintignore +++ b/frontend/.eslintignore @@ -6,3 +6,4 @@ public !.lintstagedrc.js !.stylelintrc.js !.size-limit.js +!.huskyrc.js diff --git a/frontend/.huskyrc.js b/frontend/.huskyrc.js new file mode 100644 index 00000000..2a0b0c18 --- /dev/null +++ b/frontend/.huskyrc.js @@ -0,0 +1,7 @@ +module.exports = { + hooks: { + 'pre-commit': 'lint-staged', + 'post-commit': 'git update-index --again', + 'pre-push': 'run-s check test', + }, +}; diff --git a/frontend/.lintstagedrc.js b/frontend/.lintstagedrc.js new file mode 100644 index 00000000..dc6e1161 --- /dev/null +++ b/frontend/.lintstagedrc.js @@ -0,0 +1,5 @@ +module.exports = { + './**/*.{ts,tsx,js,jsx}': ['eslint --fix --max-warnings=0', 'prettier --write', 'git add'], + './**/*.{scss,pcss,css}': ['prettier --write', 'stylelint', 'git add'], + './iframe.html': ['prettier --write', 'stylelint', 'git add'], +}; diff --git a/frontend/.prettierrc b/frontend/.prettierrc deleted file mode 100644 index bd27edb1..00000000 --- a/frontend/.prettierrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "printWidth": 120, - "useTabs": false, - "semi": true, - "singleQuote": true, - "trailingComma": "es5", - "bracketSpacing": true, - "arrowParens": "avoid", - "overrides": [ - { - "files": ["*.ejs", "*.html"], - "options": { - "trailingComma": "none" - } - } - ] -} diff --git a/frontend/.prettierrc.js b/frontend/.prettierrc.js new file mode 100644 index 00000000..7f94fc39 --- /dev/null +++ b/frontend/.prettierrc.js @@ -0,0 +1,17 @@ +module.exports = { + printWidth: 120, + useTabs: false, + semi: true, + singleQuote: true, + trailingComma: 'es5', + bracketSpacing: true, + arrowParens: 'avoid', + overrides: [ + { + files: ['*.ejs', '*.html'], + options: { + trailingComma: 'none', + }, + }, + ], +}; diff --git a/frontend/package.json b/frontend/package.json index b1b6e901..e833df3e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -123,29 +123,5 @@ "webpack-bundle-analyzer": "^3.6.1", "webpack-cli": "^3.3.9", "webpack-dev-server": "^3.9.0" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged", - "post-commit": "git update-index --again", - "pre-push": "run-s check test" - } - }, - "lint-staged": { - "./**/*.{ts,tsx,js,jsx}": [ - "eslint --fix --max-warnings=0", - "prettier --write", - "git add" - ], - "./**/*.{scss,pcss,css}": [ - "prettier --write", - "stylelint", - "git add" - ], - "./iframe.html": [ - "prettier --write", - "stylelint", - "git add" - ] } }