diff --git a/web/.eslintrc.js b/web/.eslintrc.js index 5d7f5a4c..bbd55376 100644 --- a/web/.eslintrc.js +++ b/web/.eslintrc.js @@ -1,15 +1,7 @@ module.exports = { parser: 'babel-eslint', - extends: [ - 'eslint:recommended', - 'plugin:jsx-a11y/recommended', - 'plugin:prettier/recommended', - ], - plugins: [ - 'react', - 'jsx-a11y', - 'prettier', - ], + extends: ['eslint:recommended', 'plugin:jsx-a11y/recommended', 'plugin:prettier/recommended'], + plugins: ['react', 'jsx-a11y', 'prettier'], env: { browser: true, node: true, @@ -20,7 +12,7 @@ module.exports = { ecmaFeatures: { modules: true, jsx: true, - } + }, }, globals: { remark_config: true, @@ -61,6 +53,6 @@ module.exports = { 'no-var': 2, 'object-shorthand': 2, 'prefer-arrow-callback': 2, - 'prettier/prettier': 1, + 'prettier/prettier': 2, }, }; diff --git a/web/package.json b/web/package.json index 0c3539f9..0b67fcc2 100644 --- a/web/package.json +++ b/web/package.json @@ -4,19 +4,17 @@ "scripts": { "build": "cross-env NODE_ENV=production webpack --config ./webpack.config.js", "start": "webpack-dev-server --progress --hot --inline --config ./webpack.config.js", - "reinstall": "rm -rf ./node_modules/ && npm install", "lint": "eslint --ext=.js,.jsx .", "test": "jest", "prettier": "prettier --write \"./**/*.{js,jsx,scss}\"", "precommit": "./node_modules/.bin/lint-staged" }, "lint-staged": { - "./app/**/*.{js,jsx}": [ - "prettier --write", - "git add", - "eslint --fix" + "./**/*.{js,jsx}": [ + "eslint --fix", + "git add" ], - "./app/**/*.scss": [ + "./**/*.scss": [ "prettier --write", "git add" ]