Commit 4b1b3a60 authored by Ruben Young On's avatar Ruben Young On

Fixed conflicts in package.json

parent c9e97bd4
......@@ -3,7 +3,7 @@
"main": "index.js",
"license": "AGPL-3.0",
"scripts": {
"dev": "concurrently --kill-others --names \"WEBPACK,PYTHON,CELERY\" --prefix-colors \"bgBlue.bold,bgGreen.bold,bgRed.bold\" \"webpack-dev-server --hot --inline --progress --config\" \"ZESJE_SETTINGS=$(pwd)/ python3 zesje\" \"ZESJE_SETTINGS=$(pwd)/ celery -A zesje.celery worker -l info --autoscale=4,1 --max-tasks-per-child=16 \"",
"dev": "concurrently --kill-others --names \"WEBPACK,PYTHON,CELERY\" --prefix-colors \"bgBlue.bold,bgGreen.bold,bgRed.bold\" \"webpack-dev-server --hot --inline --progress --config\" \"ZESJE_SETTINGS=$(pwd)/ python3 zesje\" \"ZESJE_SETTINGS=$(pwd)/ celery -A zesje.celery worker\"",
"build": "webpack --config",
"ci": "yarn lint; yarn test",
"lint": "yarn lint:js; yarn lint:py",
......@@ -17,7 +17,8 @@
"migrate:dev": "ZESJE_SETTINGS=$(pwd)/ FLASK_APP=zesje/ flask db upgrade",
"migrate": "FLASK_APP=zesje/ flask db upgrade",
"prepare-migration": "ZESJE_SETTINGS=$(pwd)/ FLASK_APP=zesje/ flask db migrate",
"cov": "python -m pytest --cov=zesje --cov-report=xml:cov.xml tests/"
"cov": "python -m pytest --cov=zesje --cov-report=xml:cov.xml --cov-report=term tests/",
"migrate-down": "FLASK_APP=zesje/ flask db downgrade"
"standard": {
"parser": "babel-eslint",
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment