Commit924748d

committed

chore: merge branch 'tooling' into dev

2 parents61ef82f +7b76e02 commit924748dCopy full SHA for 924748d

File tree

+195

-19

lines changed

+195

-19

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+{`
	`2`	`+ "hooks": {`
	`3`	`+ "pre-commit": "pretty-quick --staged && npm run lint:staged",`
	`4`	`+ "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"`
	`5`	`+ }`
	`6`	`+}`

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"prod":"cross-env GOAL=production run-p server lint:watch",`
`8`	`8`	`"local":"cross-env NODE_ENV=local GOAL=local node server",`
`9`	`9`	`"lint":"eslint --fix pages/*/.js components/*/ containers/*/ stores/*/",`
`10`		`-"lint:watch":"esw -w pages/*/.js components/*/ containers/*/ stores/*/",`
	`10`	`+"lint:staged":"git diff --cached --name-only --diff-filter=ACRM \| grep\".js$\" \| xargs ./node_modules/.bin/eslint",`
`11`	`11`	`"server":"npm run clean && node server.js",`
`12`	`12`	`"build":"run-s dist clean",`
`13`	`13`	`"build:clean":"run-s dist clean",`
`@@ -43,11 +43,6 @@`
`43`	`43`	`"path":"./node_modules/cz-conventional-changelog"`
`44`	`44`	`}`
`45`	`45`	`},`
`46`		`-"husky": {`
`47`		`-"hooks": {`
`48`		`-"commit-msg":"npm run commitmsg"`
`49`		`- }`
`50`		`- },`
`51`	`46`	`"dependencies": {`
`52`	`47`	`"accepts":"^1.3.4",`
`53`	`48`	`"antd":"3.8.4",`
`@@ -150,12 +145,13 @@`
`150`	`145`	`"eslint-plugin-react":"7.11.0",`
`151`	`146`	`"eslint-plugin-react-hooks":"^1.6.0",`
`152`	`147`	`"eslint-watch":"4.0.2",`
`153`		`-"husky":"^0.14.3",`
	`148`	`+"husky":"2.1.0",`
`154`	`149`	`"jest":"23.4.2",`
`155`	`150`	`"lint-staged":"7.2.0",`
`156`	`151`	`"npm-run-all":"^4.1.1",`
`157`	`152`	`"plop":"2.0.0",`
`158`	`153`	`"prettier":"1.14.0",`
	`154`	`+"pretty-quick":"^1.11.0",`
`159`	`155`	`"react-test-renderer":"16.4.2",`
`160`	`156`	`"regenerator-runtime":"^0.13.1",`
`161`	`157`	`"shelljs":"0.8.2",`

Comments

(0)