diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-04-02 12:05:21 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-04-02 12:05:21 +0200 |
| commit | f2d6aad94d7d62da48447d5d0b29db62aa83c009 (patch) | |
| tree | f47f8b5c4c4b742115074c84f867a90818e57df9 /gui/package.json | |
| parent | 98bf3da24cf29ca93a3685e6cbad8d3e76d7cc4b (diff) | |
| parent | 11df1bcdf8084f57bb10f8b9b477ac71263b86e7 (diff) | |
| download | mullvadvpn-f2d6aad94d7d62da48447d5d0b29db62aa83c009.tar.xz mullvadvpn-f2d6aad94d7d62da48447d5d0b29db62aa83c009.zip | |
Merge branch 'migrate-to-npm'
Diffstat (limited to 'gui/package.json')
| -rw-r--r-- | gui/package.json | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gui/package.json b/gui/package.json index 431fa7dccd..f58286a0fb 100644 --- a/gui/package.json +++ b/gui/package.json @@ -18,7 +18,7 @@ "electron-log": "^2.2.8", "gettext-parser": "^3.1.0", "history": "^4.6.1", - "jsonrpc-lite": "^2.0.5", + "jsonrpc-lite": "^2.0.6", "mkdirp": "^0.5.1", "moment": "^2.24.0", "node-gettext": "^2.0.0", @@ -28,7 +28,7 @@ "react-redux": "^5.1.0", "react-router": "^4.3.1", "react-simple-maps": "^0.12.1", - "reactxp": "^1.5.0", + "reactxp": "^1.6.1", "redux": "^4.0.1", "sprintf-js": "^1.1.2", "uuid": "^3.0.1", @@ -49,9 +49,9 @@ "@types/node": "^10.12.3", "@types/node-gettext": "^2.0.0", "@types/rbush": "^2.0.2", - "@types/react": "16.3.18", - "@types/react-dom": "16.0.7", - "@types/react-redux": "^7.0.0", + "@types/react": "^16.8.8", + "@types/react-dom": "^16.8.2", + "@types/react-redux": "^7.0.6", "@types/react-router": "^4.4.3", "@types/sinon": "^7.0.5", "@types/sprintf-js": "^1.1.2", @@ -83,8 +83,8 @@ "postinstall": "cross-env ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder install-app-deps", "build": "run-s private:clean private:copy-assets private:compile", "lint": "tslint -t stylish -p .", - "format": "yarn run private:format --write", - "check-format": "yarn run private:format --list-different", + "format": "npm run private:format -- --write", + "check-format": "npm run private:format -- --list-different", "develop": "cross-env run-s private:copy-assets private:watch", "test": "cross-env NODE_ENV=test electron-mocha --renderer --reporter spec --require-main \"test/setup/main.js\" --require ts-node/register --require \"test/setup/renderer.ts\" \"test/**/*.{ts,tsx}\"", "update-translations": "node scripts/extract-translations", @@ -92,10 +92,10 @@ "pack:win": "run-s build private:pack:win", "pack:linux": "run-s build private:pack:linux", "private:format": "prettier \"**/*.{js,css,ts,tsx}\"", - "private:pack:mac": "yarn run private:pack --mac", + "private:pack:mac": "npm run private:pack -- --mac", "private:postbuild:mac": "rimraf ../dist/mac", - "private:pack:win": "yarn run private:pack --win", - "private:pack:linux": "yarn run private:pack --linux", + "private:pack:win": "npm run private:pack -- --win", + "private:pack:linux": "npm run private:pack -- --linux", "private:pack": "cross-env ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder", "private:copy-assets": "run-s private:assets:main private:assets:html private:assets:css private:assets:locales", "private:assets:main": "cross-env mkdir -p ./build/assets && cp -R ./assets ./build", |