Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: prevent weird behaviour of pre-commit hook #973

Merged
merged 10 commits into from
Jul 4, 2019
Merged

chore: prevent weird behaviour of pre-commit hook #973

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b5062d6
chore: prevent weird behaviour of pre-commit hook
jamesgeorge007 Jun 23, 2019
c15b1d2
fix: update eslint config
jamesgeorge007 Jun 24, 2019
410ef09
fix: revert
jamesgeorge007 Jun 24, 2019
00ae728
fix: refactor config
jamesgeorge007 Jun 24, 2019
c10fdd3
fix: lock-file changes for generate-loader
jamesgeorge007 Jun 25, 2019
267d108
fix: lock-file changes for generators
jamesgeorge007 Jun 25, 2019
ad9e335
fix: update lock file for info
jamesgeorge007 Jun 25, 2019
713fada
fix: update lock file for generate-plugins
jamesgeorge007 Jun 25, 2019
f8603e8
fix: update lock file for migrate
jamesgeorge007 Jun 25, 2019
71287d1
fix: update lock file for serve
jamesgeorge007 Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
module.exports = {
extends: ["eslint:recommended", "plugin:prettier/recommended"],
extends: [
"eslint:recommended",
"plugin:prettier/recommended",
"plugin:@typescript-eslint/recommended",
"prettier",
"prettier/@typescript-eslint"
],
plugins: ["prettier"],
env: {
node: true,
Expand Down
8 changes: 7 additions & 1 deletion bin/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
module.exports = {
root: true,
plugins: ["node"],
extends: ["../.eslintrc.js", "plugin:node/recommended"],
extends: [
"../.eslintrc.js",
"plugin:node/recommended",
"plugin:@typescript-eslint/recommended",
"prettier",
"prettier/@typescript-eslint"
],
env: {
node: true,
es6: true,
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"commit": "git-cz",
"docs": "typedoc",
"format": "npm run format:js && npm run format:ts",
"format:js": "prettier-eslint ./bin/*.js ./bin/**/*.js ./test/**/*.js ./packages/**/**/*.js ./packages/**/*.js --write",
jamesgeorge007 marked this conversation as resolved.
Show resolved Hide resolved
"format:ts": "prettier-eslint ./packages/**/**/*.ts ./packages/**/*.ts ./packages/**/**/**/*.ts --write",
"format:js": "prettier-eslint ./bin/*.js ./bin/**/*.js ./test/**/*.js ./packages/**/**/*.js ./packages/**/*.js",
"format:ts": "prettier-eslint ./packages/**/**/*.ts ./packages/**/*.ts ./packages/**/**/**/*.ts",
"lint": "eslint \"./bin/*.js\" \"./bin/**/*.js\" \"./test/**/*.js\" \"packages/**/!(node_modules)/*.ts\" \"packages/**/!(node_modules)/**/*.ts\"",
"pretest": "npm run build && npm run lint",
"reportCoverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json --disable=gcov",
Expand Down