diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-09-03 14:57:38 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-09-03 14:57:38 +0200 |
| commit | a60e7cd0250d80a25e8e1a2bd01ab701fe977701 (patch) | |
| tree | da04d06eeaf92f8533e9c5eb1700c5f471563b93 /gui/package.json | |
| parent | 6e62c3c65bfe729b9ef2fe5b27721d429b1b2c7e (diff) | |
| parent | 2e951404de676df143acac24785acbf3e07fff96 (diff) | |
| download | mullvadvpn-a60e7cd0250d80a25e8e1a2bd01ab701fe977701.tar.xz mullvadvpn-a60e7cd0250d80a25e8e1a2bd01ab701fe977701.zip | |
Merge branch 'migrate-to-electron-6'
Diffstat (limited to 'gui/package.json')
| -rw-r--r-- | gui/package.json | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/gui/package.json b/gui/package.json index fba6a23223..aa71459bed 100644 --- a/gui/package.json +++ b/gui/package.json @@ -35,7 +35,7 @@ "validated": "^2.0.1" }, "optionalDependencies": { - "nseventmonitor": "https://github.com/mullvad/NSEventMonitor.git#0.0.15" + "nseventmonitor": "https://github.com/mullvad/NSEventMonitor.git#0.0.16" }, "devDependencies": { "@types/chai": "^4.1.7", @@ -64,10 +64,10 @@ "chai-as-promised": "^7.1.1", "chai-spies": "^1.0.0", "cross-env": "^5.1.3", - "electron": "^4.2.9", + "electron": "^6.0.3", "electron-builder": "^21.2.0", "electron-devtools-installer": "^2.2.1", - "electron-mocha": "^6.0.4", + "electron-mocha": "^8.1.1", "enzyme": "^3.7.0", "enzyme-adapter-react-16": "^1.7.0", "gettext-extractor": "^3.5.1", @@ -94,14 +94,9 @@ "develop": "gulp develop", "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", - "pack:mac": "run-s build private:pack:mac private:postbuild:mac", - "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": "npm run private:pack -- --mac", - "private:postbuild:mac": "rimraf ../dist/mac", - "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" + "pack:mac": "gulp pack-mac", + "pack:win": "gulp pack-win", + "pack:linux": "gulp pack-linux", + "private:format": "prettier \"**/*.{js,css,ts,tsx}\"" } } |