From cfa1e2f90d8ec244438a3f7303192a6f0e1ee903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@jitsi.org>
Date: Tue, 2 Oct 2018 13:19:16 +0200
Subject: [PATCH] deps: update to Babel 7

---
 package.json      | 18 +++++++++++-------
 webpack.config.js | 17 ++++++++++++-----
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index fdaddd57e..6ebf905ce 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "jsc-android": "224109.1.0",
     "jsrsasign": "8.0.12",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#ba0dc564cba5b49aa55cdce0f8aae19e9e475d8e",
+    "lib-jitsi-meet": "github:saghul/lib-jitsi-meet#rn-057",
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
     "lodash": "4.17.4",
     "moment": "2.19.4",
@@ -85,12 +85,16 @@
     "xmldom": "0.1.27"
   },
   "devDependencies": {
-    "babel-core": "6.26.0",
-    "babel-eslint": "8.0.3",
-    "babel-loader": "7.1.2",
-    "babel-preset-env": "1.6.1",
-    "babel-preset-react": "6.24.1",
-    "babel-preset-stage-1": "6.24.1",
+    "@babel/core": "7.1.2",
+    "@babel/preset-env": "7.1.0",
+    "@babel/preset-flow": "7.0.0",
+    "@babel/preset-react": "7.0.0",
+    "@babel/plugin-proposal-class-properties": "7.1.0",
+    "@babel/plugin-proposal-export-default-from": "7.0.0",
+    "@babel/plugin-proposal-export-namespace-from": "7.0.0",
+    "@babel/plugin-transform-flow-strip-types": "7.0.0",
+    "babel-eslint": "10.0.1",
+    "babel-loader": "8.0.4",
     "clean-css": "3.4.25",
     "css-loader": "0.28.7",
     "eslint": "4.12.1",
diff --git a/webpack.config.js b/webpack.config.js
index dd19718b7..b662756c5 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -67,18 +67,25 @@ const config = {
             options: {
                 // XXX The require.resolve bellow solves failures to locate the
                 // presets when lib-jitsi-meet, for example, is npm linked in
-                // jitsi-meet. The require.resolve, of course, mandates the use
-                // of the prefix babel-preset- in the preset names.
+                // jitsi-meet.
+                plugins: [
+                    require.resolve('@babel/plugin-transform-flow-strip-types'),
+                    require.resolve('@babel/plugin-proposal-class-properties'),
+                    require.resolve(
+                        '@babel/plugin-proposal-export-default-from'),
+                    require.resolve(
+                        '@babel/plugin-proposal-export-namespace-from')
+                ],
                 presets: [
                     [
-                        require.resolve('babel-preset-env'),
+                        require.resolve('@babel/preset-env'),
 
                         // Tell babel to avoid compiling imports into CommonJS
                         // so that webpack may do tree shaking.
                         { modules: false }
                     ],
-                    require.resolve('babel-preset-react'),
-                    require.resolve('babel-preset-stage-1')
+                    require.resolve('@babel/preset-flow'),
+                    require.resolve('@babel/preset-react')
                 ]
             },
             test: /\.jsx?$/