Merge branch 'develop' into 'master'
Develop See merge request !15
Showing
... | ... | @@ -61,6 +61,7 @@ |
"@psu/schematics": "^1.0.4-beta.13", | ||
"@types/jest": "24.0.9", | ||
"@types/node": "~8.9.4", | ||
"@types/ramda": "^0.26.43", | ||
"backoff-rxjs": "^6.3.3", | ||
"codelyzer": "~5.0.1", | ||
"commitizen": "^4.0.3", | ||
... | ... | @@ -78,6 +79,7 @@ |
"ngx-cookie": "^4.1.2", | ||
"npm-link-check": "3.0.0", | ||
"prettier": "1.18.2", | ||
"ramda": "^0.27.0", | ||
"short-uuid": "^3.1.1", | ||
"ts-jest": "24.0.0", | ||
"ts-mocks": "^2.6.0", | ||
... | ... | @@ -93,28 +95,28 @@ |
"url": "https://git.psu.edu/ais-swe/ux/utils" | ||
}, | ||
"lint-staged": { | ||
"*.json": [ | ||
"prettier --write", | ||
"*.html": [ | ||
"html-beautify -qr", | ||
"git add" | ||
], | ||
"*.ts": [ | ||
"*.json": [ | ||
"prettier --write", | ||
"tslint --project tsconfig.json", | ||
"git add" | ||
], | ||
"*.html": [ | ||
"html-beautify -qr", | ||
"git add" | ||
], | ||
"*.scss": [ | ||
"css-beautify -qr", | ||
"git add" | ||
], | ||
"*.ts": [ | ||
"prettier --write", | ||
"tslint --fix --project tsconfig.json", | ||
"git add" | ||
] | ||
}, | ||
"husky": { | ||
"hooks": { | ||
"pre-commit": "lint-staged", | ||
"pre-push": "yarn test" | ||
"pre-push": "yarn test utils" | ||
} | ||
}, | ||
"config": { | ||
... | ... |
Please register or sign in to comment