Merge backend and frontend repo master branches

Conflicts:
	.gitignore
	.travis.yml
	README.md

1 files changed, 91 insertions, 0 deletions

diff --git a/package.json b/package.json
new file mode 100644
index 0000000000..9c08ea1d29
--- /dev/null
+++ b/package.json
@@ -0,0 +1,91 @@
+{
+  "name": "mullvad-vpn",
+  "version": "2017.1.0-beta7",
+  "description": "Mullvad VPN client",
+  "main": "init.js",
+  "author": {
+    "name": "Mullvad VPN",
+    "email": "support@mullvad.net"
+  },
+  "repository": "https://github.com/mullvad/vpnclient-gui",
+  "license": "GPL-3.0",
+  "dependencies": {
+    "babel-runtime": "^6.22.0",
+    "cheap-ruler": "^2.4.1",
+    "electron-log": "^2.2.8",
+    "electron-sudo": "https://github.com/eriklarko/electron-sudo.git",
+    "history": "^4.6.1",
+    "jsonrpc-lite": "^1.2.3",
+    "mapbox-gl": "^0.37.0",
+    "mkdirp": "^0.5.1",
+    "moment": "^2.17.1",
+    "prop-types": "^15.5.10",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
+    "react-if": "^2.2.1",
+    "react-mapbox-gl": "^2.1.0",
+    "react-native": "^0.50.4",
+    "react-native-windows": "^0.50.0-rc.2",
+    "react-redux": "^5.0.2",
+    "react-router": "^4.2.0",
+    "react-router-redux": "5.0.0-alpha.6",
+    "react-transition-group": "^1.2.0",
+    "reactxp": "^0.46.5",
+    "redux": "^3.0.0",
+    "redux-thunk": "^2.2.0",
+    "shell-escape": "^0.2.0",
+    "uuid": "^3.0.1",
+    "validated": "^1.1.0"
+  },
+  "optionalDependencies": {
+    "nseventmonitor": "git+https://github.com/pronebird/NSEventMonitor.git#0.0.5"
+  },
+  "devDependencies": {
+    "babel-cli": "^6.22.2",
+    "babel-core": "^6.25.0",
+    "babel-eslint": "^7.1.1",
+    "babel-plugin-inline-react-svg": "^0.4.0",
+    "babel-plugin-transform-runtime": "^6.22.0",
+    "babel-preset-es2015": "^6.1.18",
+    "babel-preset-react": "^6.22.0",
+    "babel-preset-stage-0": "^6.1.18",
+    "browser-sync": "^2.9.3",
+    "chai": "^4.1.0",
+    "electron": "^1.7.9",
+    "electron-builder": "^19.37.2",
+    "electron-devtools-installer": "^2.2.1",
+    "electron-mocha": "^5.0.0",
+    "enzyme": "^3.2.0",
+    "enzyme-adapter-react-16": "^1.1.0",
+    "eslint": "^4.11.0",
+    "eslint-plugin-flowtype": "^2.39.1",
+    "eslint-plugin-react": "^7.5.1",
+    "flow-bin": "^0.50.0",
+    "flow-typed": "^2.2.3",
+    "npm-run-all": "^4.0.1",
+    "react-test-renderer": "16.0.0",
+    "redux-mock-store": "^1.3.0",
+    "rimraf": "^2.5.4",
+    "sinon": "^3.2.1"
+  },
+  "scripts": {
+    "postinstall": "electron-builder install-app-deps",
+    "develop": "npm run private:compile -- --source-maps true && run-p -r private:watch private:serve",
+    "test": "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",
+    "flow": "flow",
+    "pack": "run-s private:clean private:compile private:build:all",
+    "pack:mac": "./pre-mac-sign.sh && run-s private:clean private:compile private:build:mac",
+    "pack:win": "run-s private:clean private:compile private:build:win",
+    "pack:linux": "run-s private:clean private:compile private:build:linux",
+    "private:build:all": "npm run private:build -- -mwl",
+    "private:build:mac": "npm run private:build -- --mac",
+    "private:build:win": "npm run private:build -- --win",
+    "private:build:linux": "npm run private:build -- --linux",
+    "private:build": "electron-builder",
+    "private:watch": "npm run private:compile -- --source-maps true --watch --skip-initial-build",
+    "private:serve": "babel-node scripts/serve.js",
+    "private:compile": "babel app/ --copy-files --out-dir build",
+    "private:clean": "rimraf build"
+  }
+}