summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2018-07-04 13:37:40 +0200
committerAndrej Mihajlov <and@mullvad.net>2018-07-05 16:19:49 +0200
commita02ebde9054b9da3446e97f50ca24e73af470afa (patch)
tree7c016f05c1c74eca5d41c5869e174a5b6501afc9
parent76adf1a95524a9df80b4c0b4990a11901e2a1255 (diff)
downloadmullvadvpn-a02ebde9054b9da3446e97f50ca24e73af470afa.tar.xz
mullvadvpn-a02ebde9054b9da3446e97f50ca24e73af470afa.zip
Upgrade prettier and add cross-env for it to work on Windows
-rw-r--r--package.json6
-rw-r--r--yarn.lock6
2 files changed, 6 insertions, 6 deletions
diff --git a/package.json b/package.json
index 2128fbf2aa..5e4578f1d9 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
"flow-typed": "^2.4.0",
"mock-socket": "^7.1.0",
"npm-run-all": "^4.0.1",
- "prettier": "1.13.3",
+ "prettier": "1.13.7",
"rimraf": "^2.5.4"
},
"scripts": {
@@ -73,8 +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 --preload test/setup/renderer.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'",
+ "format": "cross-env prettier --write 'app/**/*.js' 'test/**/*.js'",
+ "check-format": "cross-env prettier --list-different 'app/**/*.js' 'test/**/*.js'",
"flow": "flow",
"pack:mac": "cross-env BABEL_ENV=electron run-s private:clean private:compile private:build:mac && rm -r ./dist/mac",
"pack:win": "cross-env BABEL_ENV=electron run-s private:clean private:compile private:build:win",
diff --git a/yarn.lock b/yarn.lock
index 53d87f03bc..99754a588e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5978,9 +5978,9 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-prettier@1.13.3:
- version "1.13.3"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.3.tgz#e74c09a7df6519d472ca6febaa37cf7addb48a20"
+prettier@1.13.7:
+ version "1.13.7"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
pretty-bytes@^1.0.2:
version "1.0.4"