diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..dd8b0a1 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,3 @@ +{ + "extends": "@inc" +} diff --git a/.eslintrc.json b/.eslintrc.json deleted file mode 100644 index 8328816..0000000 --- a/.eslintrc.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "env": { - "browser": true, - "es6": true, - "node": true - }, - "extends": [ - "eslint:recommended" - ], - "parserOptions": { - "ecmaVersion": 2017, - "sourceType": "module" - }, - "rules": { - "indent": ["error", 2, { "SwitchCase": 1 }], - "linebreak-style": ["error", "unix"], - "quotes": ["error", "double"], - "semi": ["error", "always"] - } -} diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..f760d1b --- /dev/null +++ b/.prettierrc @@ -0,0 +1,11 @@ +{ + "arrowParens": "avoid", + "bracketSpacing": true, + "jsxBracketSameLine": false, + "proseWrap": "preserve", + "semi": true, + "singleQuote": false, + "trailingComma": "none", + "tabs": false, + "tabWidth": 2 +} diff --git a/package.json b/package.json index 9e4a9c6..69f5eec 100755 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "fastify-plugin": "^1.2.1", "fastify-static": "^0.14.0", "fastify-ws": "^1.0.0", - "front-matter": "^2.3.0", + "front-matter": "^3.0.0", "fs-exists-sync": "^0.1.0", "graceful-fs": "^4.1.11", "heroku-ssl-redirect": "0.0.4", @@ -56,9 +56,13 @@ "@babel/plugin-syntax-import-meta": "7.0.0", "@babel/preset-env": "^7.1.0", "@babel/register": "^7.0.0", - "husky": "^1.1.0", + "@inc/eslint-config": "^1.0.2", + "eslint": "^5.6.1", + "husky": "^1.1.1", "nodemon": "^1.18.4", "npm-run-all": "^4.1.3", + "prettier": "^1.14.3", + "pretty-quick": "^1.7.0", "sass": "^1.14.1", "snazzy": "^8.0.0", "standardx": "^3.0.1", @@ -69,7 +73,7 @@ }, "husky": { "hooks": { - "pre-commit": "npm run test:lint" + "pre-commit": "pretty-quick --staged" } }, "main": "server.js",