diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-06-05 12:25:23 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-06-05 12:25:23 +0200 |
| commit | 531b4cee31778a0e4710eeb3c79c533be93d4192 (patch) | |
| tree | b1f7754eb50896ab3681e35fa4e08be642b940c9 /package.json | |
| parent | aa859cf72f0e1927dbf9362918ddb04641b59c3a (diff) | |
| parent | ca2f6fbfcad7b73d4ea63ef46cb1cab943ec9087 (diff) | |
| download | mullvadvpn-531b4cee31778a0e4710eeb3c79c533be93d4192.tar.xz mullvadvpn-531b4cee31778a0e4710eeb3c79c533be93d4192.zip | |
Merge branch 'javascript-formatter'
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/package.json b/package.json index 5bd516bb24..420e032361 100644 --- a/package.json +++ b/package.json @@ -55,11 +55,13 @@ "enzyme": "^3.2.0", "enzyme-adapter-react-16": "^1.1.0", "eslint": "^4.18.2", + "eslint-config-prettier": "^2.9.0", "eslint-plugin-flowtype": "^2.46.1", "eslint-plugin-react": "^7.7.0", "flow-bin": "^0.66.0", "flow-typed": "^2.3.0", "npm-run-all": "^4.0.1", + "prettier": "1.13.3", "react-test-renderer": "16.0.0", "redux-mock-store": "^1.3.0", "rimraf": "^2.5.4", @@ -71,6 +73,8 @@ "develop": "cross-env BABEL_ENV=electron npm run private:compile -- --source-maps true && run-p -r private:watch private:serve", "test": "cross-env BABEL_ENV=electron electron-mocha --renderer -R spec --require babel-core/register --require-main test/setup/main.js test/*.spec.js test/**/*.spec.js", "lint": "eslint --no-ignore scripts app test *.js", + "format": "prettier --write 'app/**/*.js' 'test/**/*.js'", + "check-format": "prettier --list-different 'app/**/*.js' 'test/**/*.js'", "flow": "flow", "pack": "run-s pack:mac pack:win pack:linux", "pack:mac": "cross-env BABEL_ENV=electron run-s private:clean private:compile private:build:mac && rm -r ./dist/mac", |