From abbfd3de9a5e4aaf2aa8a113bf6241c6f211f49d Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Wed, 7 Feb 2018 19:01:33 -0600
Subject: [PATCH] Adds strophe.js as a dependency to fix build problem.

Bumps lib-jitsi-meet to latest. There was a problem that jitsi-meet build fail if anybody touches package.json (including PR testing), this happen after start using custom strophe.js from github:jitsi/strophejs.
The error:
    ERROR in ../strophejs-plugin-disco/lib/strophe.disco.js
    Module not found: Error: Can't resolve 'strophe.js' in '/Users/dminkov/dev/jitsi-meet/node_modules/strophejs-plugin-disco/lib'
     @ ../strophejs-plugin-disco/lib/strophe.disco.js 4:126-147 4:196-227
     @ ./modules/xmpp/xmpp.js
     @ ./JitsiConnection.js
     @ ./JitsiMeetJS.js
     @ ./index.js

FIXME: We should remove this once strophe.js releases new version and we are back to the official one inside lib-jitsi-meet.
---
 package-lock.json | 11 ++++++++---
 package.json      |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 57482989c..e31aa76a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7158,7 +7158,7 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "github:jitsi/lib-jitsi-meet#5f8c0a662af086e7bcc19c010f1129afc9b6d650",
+      "version": "github:jitsi/lib-jitsi-meet#4ac0af12e26a3012dc59eca06eb823b1a0602826",
       "requires": {
         "async": "0.9.0",
         "current-executing-script": "0.1.3",
@@ -7167,10 +7167,15 @@
         "sdp-interop": "0.1.12",
         "sdp-simulcast": "0.2.1",
         "sdp-transform": "2.3.0",
-        "strophe.js": "github:jitsi/strophejs#d05254fb28f4bbe6df5f905358582db3a12ee04c",
+        "strophe.js": "github:jitsi/strophejs#1501521d305e405f4dea3f51a5473f504672a7b3",
         "strophejs-plugin-disco": "0.0.2",
         "webrtc-adapter": "github:webrtc/adapter#1eec19782b4058d186341263e7d049cea3e3290a",
         "yaeti": "1.0.1"
+      },
+      "dependencies": {
+        "strophe.js": {
+          "version": "github:jitsi/strophejs#1501521d305e405f4dea3f51a5473f504672a7b3"
+        }
       }
     },
     "load-json-file": {
@@ -11271,7 +11276,7 @@
       "dev": true
     },
     "strophe.js": {
-      "version": "github:jitsi/strophejs#d05254fb28f4bbe6df5f905358582db3a12ee04c"
+      "version": "github:jitsi/strophejs#1501521d305e405f4dea3f51a5473f504672a7b3"
     },
     "strophejs-plugin-disco": {
       "version": "0.0.2",
diff --git a/package.json b/package.json
index 877f54d66..63dde2c55 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "jquery-i18next": "1.2.0",
     "js-md5": "0.6.1",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#5f8c0a662af086e7bcc19c010f1129afc9b6d650",
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#4ac0af12e26a3012dc59eca06eb823b1a0602826",
     "lodash": "4.17.4",
     "moment": "2.19.4",
     "nuclear-js": "1.4.0",
@@ -67,6 +67,7 @@
     "react-redux": "5.0.6",
     "redux": "3.7.2",
     "redux-thunk": "2.2.0",
+    "strophe.js": "github:jitsi/strophejs#1.2.14-1",
     "styled-components": "1.3.0",
     "url-polyfill": "github:github/url-polyfill#39734186de44612bc5a16eb25f5407adcc5b2e7c",
     "uuid": "3.1.0",