Prevent undefined JitsiMeetJS

react/features/base/conference/actions.js

@@ -1,4 +1,4 @@
-import JitsiMeetJS from '../lib-jitsi-meet';
+import { JitsiConferenceEvents } from '../lib-jitsi-meet';
 import {
     changeParticipantEmail,
     dominantSpeakerChanged,
@@ -30,8 +30,6 @@ import { _addLocalTracksToConference } from './functions';
  * @returns {void}
  */
 function _addConferenceListeners(conference, dispatch) {
-    const JitsiConferenceEvents = JitsiMeetJS.events.conference;
-
     conference.on(
             JitsiConferenceEvents.CONFERENCE_FAILED,
             (...args) => dispatch(conferenceFailed(conference, ...args)));

react/features/base/conference/functions.js

@@ -1,6 +1,4 @@
-import JitsiMeetJS from '../lib-jitsi-meet';
-
-const JitsiTrackErrors = JitsiMeetJS.errors.track;
+import { JitsiTrackErrors } from '../lib-jitsi-meet';
 
 /**
  * Attach a set of local tracks to a conference.

react/features/base/conference/reducer.js

@@ -1,4 +1,4 @@
-import JitsiMeetJS from '../lib-jitsi-meet';
+import { JitsiConferenceErrors } from '../lib-jitsi-meet';
 import {
     ReducerRegistry,
     setStateProperties,
@@ -64,7 +64,6 @@ function _conferenceFailed(state, action) {
         return state;
     }
 
-    const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
     const passwordRequired
         = JitsiConferenceErrors.PASSWORD_REQUIRED === action.error
             ? conference

react/features/base/connection/actions.native.js

@@ -3,7 +3,7 @@
 import type { Dispatch } from 'redux';
 
 import { conferenceWillLeave } from '../conference';
-import JitsiMeetJS from '../lib-jitsi-meet';
+import JitsiMeetJS, { JitsiConnectionEvents } from '../lib-jitsi-meet';
 
 import {
     CONNECTION_DISCONNECTED,
@@ -12,8 +12,6 @@ import {
     SET_DOMAIN
 } from './actionTypes';
 
-const JitsiConnectionEvents = JitsiMeetJS.events.connection;
-
 /**
  * Opens new connection.
  *

react/features/base/connection/actions.web.js

@@ -2,14 +2,14 @@
 
 import type { Dispatch } from 'redux';
 
+import { JitsiConferenceEvents } from '../lib-jitsi-meet';
+
 import UIEvents from '../../../../service/UI/UIEvents';
 
 import { SET_DOMAIN } from './actionTypes';
 
 declare var APP: Object;
-declare var JitsiMeetJS: Object;
 
-const JitsiConferenceEvents = JitsiMeetJS.events.conference;
 const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 export {

react/features/base/lib-jitsi-meet/actions.js

@@ -1,8 +1,6 @@
-/* @flow */
-
 import type { Dispatch } from 'redux';
 
-import JitsiMeetJS from './';
+import JitsiMeetJS from './_';
 import {
     LIB_DID_DISPOSE,
     LIB_DID_INIT,

react/features/base/lib-jitsi-meet/index.js

@@ -3,6 +3,16 @@
 import JitsiMeetJS from './_';
 export { JitsiMeetJS as default };
 
+// XXX Re-export the types exported by JitsiMeetJS in order to prevent undefined
+// imported JitsiMeetJS. It may be caused by import cycles but I have not
+// confirmed the theory.
+export const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
+export const JitsiConferenceEvents = JitsiMeetJS.events.conference;
+export const JitsiConnectionErrors = JitsiMeetJS.errors.connection;
+export const JitsiConnectionEvents = JitsiMeetJS.events.connection;
+export const JitsiTrackErrors = JitsiMeetJS.errors.track;
+export const JitsiTrackEvents = JitsiMeetJS.events.track;
+
 export * from './actions';
 export * from './actionTypes';
 export * from './functions';

react/features/base/tracks/actions.js

@@ -1,4 +1,7 @@
-import JitsiMeetJS from '../lib-jitsi-meet';
+import JitsiMeetJS, {
+    JitsiTrackErrors,
+    JitsiTrackEvents
+} from '../lib-jitsi-meet';
 import {
     CAMERA_FACING_MODE,
     MEDIA_TYPE
@@ -11,9 +14,6 @@ import {
     TRACK_UPDATED
 } from './actionTypes';
 
-const JitsiTrackErrors = JitsiMeetJS.errors.track;
-const JitsiTrackEvents = JitsiMeetJS.events.track;
-
 /**
  * Request to start capturing local audio and/or video. By default, the user
  * facing camera will be selected.

react/features/overlay/reducer.js

@@ -3,8 +3,10 @@ import {
     CONNECTION_ESTABLISHED,
     CONNECTION_FAILED
 } from '../base/connection';
-import JitsiMeetJS, {
-    isFatalJitsiConnectionError
+import {
+    isFatalJitsiConnectionError,
+    JitsiConferenceErrors,
+    JitsiConnectionErrors
 } from '../base/lib-jitsi-meet';
 import {
     ReducerRegistry,
@@ -17,8 +19,6 @@ import {
     SUSPEND_DETECTED
 } from './actionTypes';
 
-const JitsiConferenceErrors = JitsiMeetJS.errors.conference;
-const JitsiConnectionErrors = JitsiMeetJS.errors.connection;
 const logger = require('jitsi-meet-logger').getLogger(__filename);
 
 /**