diff --git a/.travis.yml b/.travis.yml index 09da80096..194187048 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ matrix: install: - npm install script: - - npm run prettify-all + - npm run prettify-check - language: node_js name: "Client: Testing" diff --git a/client/package.json b/client/package.json index 207a87689..73f6b8533 100644 --- a/client/package.json +++ b/client/package.json @@ -18,8 +18,8 @@ "compodoc": "./node_modules/.bin/compodoc --hideGenerator -p src/tsconfig.app.json -n 'OpenSlides Documentation' -d ../Compodoc -s -w -t -o --port", "extract": "ngx-translate-extract -i ./src -o ./src/assets/i18n/template-en.pot -clean --sort --format pot -m _", "po2json": "./node_modules/.bin/po2json -f mf src/assets/i18n/de.po src/assets/i18n/de.json && ./node_modules/.bin/po2json -f mf src/assets/i18n/cs.po src/assets/i18n/cs.json", - "prettify-changes": "pretty-quick --staged", - "prettify-all": "pretty-quick" + "prettify-check": "prettier --config ./.prettierrc --list-different \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"", + "prettify-write": "prettier --config ./.prettierrc --write \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"" }, "dependencies": { "@angular/animations": "^7.1.1", @@ -71,7 +71,6 @@ "karma-jasmine-html-reporter": "^0.2.2", "npm-run-all": "^4.1.5", "prettier": "^1.15.3", - "pretty-quick": "^1.8.0", "protractor": "^5.4.1", "ts-node": "~7.0.1", "tslint": "~5.11.0",