diff options
| author | Erik Larkö <erik@mullvad.net> | 2018-01-25 14:12:45 +0100 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2018-01-25 14:12:45 +0100 |
| commit | 2ab013667c028a2e75017080d8cffd37a3a6141d (patch) | |
| tree | d4e669053d43f5c8e2393cab29d0b7558fed1963 /package.json | |
| parent | 1bc8293ffebdc4afdb71fbfdafb109aec76d7ef9 (diff) | |
| parent | 89469094049ee82862079f7b2301037f5aac9e22 (diff) | |
| download | mullvadvpn-2ab013667c028a2e75017080d8cffd37a3a6141d.tar.xz mullvadvpn-2ab013667c028a2e75017080d8cffd37a3a6141d.zip | |
Merge branch 'android-preparation'
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/package.json b/package.json index 1d31c92e1e..3464e3a993 100644 --- a/package.json +++ b/package.json @@ -19,12 +19,11 @@ "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-mapbox-gl": "^2.1.0", - "react-native": "^0.50.4", - "react-native-windows": "^0.50.0-rc.2", + "react-native": "^0.53.0-rc.0", + "react-native-windows": "^0.52.0-rc.0", "react-redux": "^5.0.2", "react-router": "^4.2.0", "react-router-redux": "5.0.0-alpha.6", @@ -42,14 +41,15 @@ "devDependencies": { "babel-cli": "^6.22.2", "babel-core": "^6.25.0", - "babel-eslint": "^7.1.1", + "babel-eslint": "^8.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", + "browser-sync": "^2.23.6", "chai": "^4.1.0", + "cross-env": "^5.1.3", "electron": "^1.7.9", "electron-builder": "^19.37.2", "electron-devtools-installer": "^2.2.1", @@ -68,22 +68,22 @@ "sinon": "^3.2.1" }, "scripts": { + "android": "react-native run-android", "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", + "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", "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", + "pack": "run-s pack:mac pack:win pack:linux", + "pack:mac": "./pre-mac-sign.sh && cross-env BABEL_ENV=electron run-s private:clean private:compile private:build:mac", + "pack:win": "cross-env BABEL_ENV=electron run-s private:clean private:compile private:build:win", + "pack:linux": "cross-env BABEL_ENV=electron run-s private:clean private:compile private:build:linux", "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:watch": "cross-env BABEL_ENV=electron npm run private:compile -- --source-maps true --watch --skip-initial-build", + "private:serve": "cross-env BABEL_ENV=electron babel-node scripts/serve.js", "private:compile": "babel app/ --copy-files --out-dir build", "private:clean": "rimraf build" } |