ref: module.exports -> export for the ES6 modules

.jshintignore

@@ -16,6 +16,7 @@ react/
 # The following are checked by ESLint with the minimum configuration which does
 # not supersede JSHint but take advantage of advanced language features such as
 # Facebook Flow which are not supported by JSHint.
+app.js
 modules/translation/translation.js
 
 analytics.js

app.js

@@ -15,60 +15,51 @@ import 'aui-experimental-css';
 
 window.toastr = require("toastr");
 
-import conference from './conference';
+export conference from './conference';
-import API from './modules/API';
+export API from './modules/API';
-import keyboardshortcut from './modules/keyboardshortcut/keyboardshortcut';
+export keyboardshortcut from './modules/keyboardshortcut/keyboardshortcut';
-import remoteControl from "./modules/remotecontrol/RemoteControl";
+export remoteControl from "./modules/remotecontrol/RemoteControl";
-import settings from "./modules/settings/Settings";
+export settings from "./modules/settings/Settings";
-import translation from "./modules/translation/translation";
+export translation from "./modules/translation/translation";
-import UI from "./modules/UI/UI";
+export UI from "./modules/UI/UI";
 
-const APP = {
+/**
-    API,
+ * After the APP has been initialized provides utility methods for dealing
-    conference,
+ * with the conference room URL(address).
+ * @type ConferenceUrl
+ */
+export let ConferenceUrl = null;
 
-    /**
+// Used by do_external_connect.js if we receive the attach data after
-     * After the APP has been initialized provides utility methods for dealing
+// connect was already executed. status property can be "initialized",
-     * with the conference room URL(address).
+// "ready" or "connecting". We are interested in "ready" status only which
-     * @type ConferenceUrl
+// means that connect was executed but we have to wait for the attach data.
-     */
+// In status "ready" handler property will be set to a function that will
-    ConferenceUrl: null,
+// finish the connect process when the attach data or error is received.
-
+export const connect = {
-    // Used by do_external_connect.js if we receive the attach data after
+    status: "initialized",
-    // connect was already executed. status property can be "initialized",
+    handler: null
-    // "ready" or "connecting". We are interested in "ready" status only which
-    // means that connect was executed but we have to wait for the attach data.
-    // In status "ready" handler property will be set to a function that will
-    // finish the connect process when the attach data or error is received.
-    connect: {
-        status: "initialized",
-        handler: null
-    },
-    connection: null,
-
-    // Used for automated performance tests
-    connectionTimes: {
-        "index.loaded": window.indexLoadedTime
-    },
-    keyboardshortcut,
-
-    /**
-     * The log collector which captures JS console logs for this app.
-     * @type {LogCollector}
-     */
-    logCollector: null,
-
-    /**
-     * Indicates if the log collector has been started (it will not be started
-     * if the welcome page is displayed).
-     */
-    logCollectorStarted : false,
-    remoteControl,
-    settings,
-    translation,
-    UI
 };
 
+export let connection = null;
+
+// Used for automated performance tests
+export const connectionTimes = {
+    "index.loaded": window.indexLoadedTime
+};
+
+/**
+ * The log collector which captures JS console logs for this app.
+ * @type {LogCollector}
+ */
+export let logCollector = null;
+
+/**
+ * Indicates if the log collector has been started (it will not be started
+ * if the welcome page is displayed).
+ */
+export let logCollectorStarted = false;
+
 // TODO The execution of the mobile app starts from react/index.native.js.
 // Similarly, the execution of the Web app should start from react/index.web.js
 // for the sake of consistency and ease of understanding. Temporarily though
@@ -76,5 +67,3 @@ const APP = {
 // the execution of the Web app to start from app.js in order to reduce the
 // complexity of the beginning step.
 import './react';
-
-module.exports = APP;

modules/API/external/external_api.js

@@ -145,7 +145,7 @@ function generateURL(domain, options = {}) {
 /**
  * The IFrame API interface class.
  */
-class JitsiMeetExternalAPI extends EventEmitter {
+export default class JitsiMeetExternalAPI extends EventEmitter {
     /**
      * Constructs new API instance. Creates iframe and loads Jitsi Meet in it.
      *
@@ -424,5 +424,3 @@ class JitsiMeetExternalAPI extends EventEmitter {
         eventList.forEach(event => this.removeEventListener(event));
     }
 }
-
-module.exports = JitsiMeetExternalAPI;

modules/API/external/index.js

@@ -0,0 +1,3 @@
+// For legacy purposes, preserve the UMD of the public API of Jitsi Meet
+// external API (a.k.a. JitsiMeetExternalAPI).
+module.exports = require('./external_api').default;

modules/UI/UI.js

@@ -8,6 +8,8 @@ import Chat from "./side_pannels/chat/Chat";
 import SidePanels from "./side_pannels/SidePanels";
 import Avatar from "./avatar/Avatar";
 import SideContainerToggler from "./side_pannels/SideContainerToggler";
+import JitsiPopover from "./util/JitsiPopover";
+import messageHandler from "./util/MessageHandler";
 import UIUtil from "./util/UIUtil";
 import UIEvents from "../../service/UI/UIEvents";
 import EtherpadManager from './etherpad/Etherpad';
@@ -19,7 +21,7 @@ import Filmstrip from "./videolayout/Filmstrip";
 import SettingsMenu from "./side_pannels/settings/SettingsMenu";
 import Profile from "./side_pannels/profile/Profile";
 import Settings from "./../settings/Settings";
-import UIErrors from './UIErrors';
+import { FEEDBACK_REQUEST_IN_PROGRESS } from './UIErrors';
 import { debounce } from "../util/helpers";
 
 import { updateDeviceList } from '../../react/features/base/devices';
@@ -41,9 +43,7 @@ import {
 } from '../../react/features/toolbox';
 
 var EventEmitter = require("events");
-UI.messageHandler = require("./util/MessageHandler");
+UI.messageHandler = messageHandler;
-var messageHandler = UI.messageHandler;
-var JitsiPopover = require("./util/JitsiPopover");
 import Feedback from "./feedback/Feedback";
 import FollowMe from "../FollowMe";
 
@@ -1033,7 +1033,7 @@ UI.updateDTMFSupport
  */
 UI.requestFeedbackOnHangup = function () {
     if (Feedback.isVisible())
-        return Promise.reject(UIErrors.FEEDBACK_REQUEST_IN_PROGRESS);
+        return Promise.reject(FEEDBACK_REQUEST_IN_PROGRESS);
     // Feedback has been submitted already.
     else if (Feedback.isEnabled() && Feedback.isSubmitted()) {
         return Promise.resolve({
@@ -1443,4 +1443,6 @@ const UIListeners = new Map([
     ]
 ]);
 
-module.exports = UI;
+// TODO: Export every function separately. For now there is no point of doing
+// this because we are importing everything.
+export default UI;

modules/UI/UIErrors.js

@@ -1,10 +1,10 @@
 /**
  * A list of all UI errors.
  */
-module.exports = {
+
-    /**
+/**
-     * Indicates that a Feedback request is currently in progress.
+ * Indicates that a Feedback request is currently in progress.
-     * @type {{FEEDBACK_REQUEST_IN_PROGRESS: string}}
+ *
-     */
+ * @type {{FEEDBACK_REQUEST_IN_PROGRESS: string}}
-    FEEDBACK_REQUEST_IN_PROGRESS: "FeedbackRequestInProgress"
+ */
-};
+export const FEEDBACK_REQUEST_IN_PROGRESS = "FeedbackRequestInProgress";

modules/UI/util/JitsiPopover.js

@@ -77,7 +77,7 @@ const positionConfigurations = {
         }
     }
 };
-var JitsiPopover = (function () {
+export default (function () {
     /**
      * The default options
      */
@@ -294,5 +294,3 @@ var JitsiPopover = (function () {
 
     return JitsiPopover;
 })();
-
-module.exports = JitsiPopover;

modules/UI/util/MessageHandler.js

@@ -504,4 +504,4 @@ var messageHandler = {
     }
 };
 
-module.exports = messageHandler;
+export default messageHandler;

modules/keyboardshortcut/keyboardshortcut.js

@@ -82,7 +82,7 @@ let enabled = true;
 /**
  * Maps keycode to character, id of popover for given function and function.
  */
-var KeyboardShortcut = {
+const KeyboardShortcut = {
     init: function () {
         initGlobalShortcuts();
 
@@ -273,4 +273,4 @@ var KeyboardShortcut = {
     }
 };
 
-module.exports = KeyboardShortcut;
+export default KeyboardShortcut;

webpack.config.js

@@ -188,7 +188,7 @@ const configs = [
     // JitsiMeetExternalAPI).
     Object.assign({}, config, {
         entry: {
-            'external_api': './modules/API/external/external_api.js'
+            'external_api': './modules/API/external/index.js'
         },
         output: Object.assign({}, config.output, {
             library: 'JitsiMeetExternalAPI'