Upgrade to Babel 7

4 files changed, 19 insertions, 22 deletions

diff --git a/gui/packages/components/package.json b/gui/packages/components/package.json
index c737428e43..c55198c0b8 100644
--- a/gui/packages/components/package.json
+++ b/gui/packages/components/package.json
@@ -33,7 +33,7 @@
     "ts-node": "^7.0.1",
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.15.0",
-    "typescript": "^3.0.3"
+    "typescript": "^3.1.3"
   },
   "dependencies": {},
   "peerDependencies": {
diff --git a/gui/packages/desktop/.babelrc b/gui/packages/desktop/.babelrc
index 285fcb5d3c..2246ea35e5 100644
--- a/gui/packages/desktop/.babelrc
+++ b/gui/packages/desktop/.babelrc
@@ -1,13 +1,10 @@
 {
   "presets": [
-    ["env", {
-      "targets": { "electron": "2.0" },
-      "useBuiltIns": true
-    }], "react"
+    ["@babel/preset-env", {
+      "targets": { "electron": "3.0" }
+    }], "@babel/preset-react", "@babel/preset-flow"
   ],
   "plugins": [
-    "transform-class-properties",
-    "transform-object-rest-spread",
-    ["transform-builtin-extend", { "globals": ["Error"] }]
+    "@babel/plugin-proposal-class-properties"
   ]
 }
diff --git a/gui/packages/desktop/package.json b/gui/packages/desktop/package.json
index 6983abc51d..8b52a9447c 100644
--- a/gui/packages/desktop/package.json
+++ b/gui/packages/desktop/package.json
@@ -14,7 +14,6 @@
   "dependencies": {
     "@mullvad/components": "0.1.0",
     "JSONStream": "^1.3.4",
-    "babel-runtime": "^6.26.0",
     "connected-react-router": "^4.3.0",
     "d3-geo-projection": "^2.3.2",
     "electron-log": "^2.2.8",
@@ -37,13 +36,14 @@
     "nseventmonitor": "https://github.com/mullvad/NSEventMonitor.git#0.0.10"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.3",
-    "babel-plugin-transform-builtin-extend": "^1.1.2",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-react": "^6.24.1",
+    "@babel/cli": "^7.1.2",
+    "@babel/core": "^7.1.2",
+    "@babel/node": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.1.0",
+    "@babel/preset-env": "^7.1.0",
+    "@babel/preset-flow": "^7.0.0",
+    "@babel/preset-react": "^7.0.0",
+    "@babel/register": "^7.0.0",
     "browser-sync": "^2.23.6",
     "chai": "^4.1.0",
     "chai-as-promised": "^7.1.1",
@@ -63,7 +63,7 @@
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
     "develop": "cross-env yarn 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\" --preload \"test/setup/renderer.js\" \"test/*.spec.js\" \"test/**/*.spec.js\"",
+    "test": "electron-mocha --renderer -R spec --require @babel/register --require-main \"test/setup/main.js\" --preload \"test/setup/renderer.js\" \"test/*.spec.js\" \"test/**/*.spec.js\"",
     "pack:mac": "run-s private:clean private:compile private:build:mac private:postbuild:mac",
     "pack:win": "run-s private:clean private:compile private:build:win",
     "pack:linux": "run-s private:clean private:compile private:build:linux",
diff --git a/gui/packages/mobile/package.json b/gui/packages/mobile/package.json
index 5bae95069f..a07c6f6efd 100644
--- a/gui/packages/mobile/package.json
+++ b/gui/packages/mobile/package.json
@@ -17,15 +17,15 @@
     "reactxp": "^1.3.3"
   },
   "devDependencies": {
-    "@babel/cli": "7.0.0-beta.47",
-    "@babel/core": "7.0.0-beta.47",
-    "babel-preset-react-native": "^5"
+    "@babel/cli": "^7.1.2",
+    "@babel/core": "^7.1.2",
+    "babel-preset-react-native": "^5.0.0"
   },
   "scripts": {
     "postinstall": "node ./postinstall.js",
     "eject": "react-native eject",
-    "develop:android": "react-native run-android --simulator",
-    "develop:ios": "react-native run-ios --simulator",
+    "android": "react-native run-android --simulator",
+    "ios": "react-native run-ios --simulator",
     "test": "echo '1' ; exit 1"
   }
 }