Prepare for webpack 2

Webpack 2 defines module.exports as a read-only property in ES6 modules.

JitsiMeetJS.js

@@ -85,9 +85,9 @@ function addDeviceTypeToAnalyticsEvent(name, options) {
 }
 
 /**
- * Namespace for the interface of Jitsi Meet Library.
+ * The public API of the Jitsi Meet library (a.k.a. JitsiMeetJS).
  */
-const LibJitsiMeet = {
+export default {
 
     version: '{#COMMIT_HASH#}',
 
@@ -308,13 +308,14 @@ const LibJitsiMeet = {
                     if (newResolution !== null) {
                         options.resolution = newResolution;
 
-                        logger.debug('Retry createLocalTracks with resolution',
+                        logger.debug(
+                            'Retry createLocalTracks with resolution',
                             newResolution);
 
                         Statistics.analytics.sendEvent(
                             `getUserMedia.fail.resolution.${oldResolution}`);
 
-                        return LibJitsiMeet.createLocalTracks(options);
+                        return this.createLocalTracks(options);
                     }
                 }
 
@@ -453,13 +454,11 @@ const LibJitsiMeet = {
 
     /**
      * Represents a hub/namespace for utility functionality which may be of
-     * interest to LibJitsiMeet clients.
+     * interest to lib-jitsi-meet clients.
      */
     util: {
-        ScriptUtil,
+        AuthUtil,
         RTCUIHelper,
-        AuthUtil
+        ScriptUtil
     }
 };
-
-module.exports = LibJitsiMeet;

index.js

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

karma.conf.js

@@ -15,7 +15,7 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
         files: [
-            './JitsiMeetJS.js',
+            './index.js',
             './modules/**/*.spec.js'
         ],
 
@@ -29,7 +29,7 @@ module.exports = function(config) {
     // available preprocessors:
     //  https://npmjs.org/browse/keyword/karma-preprocessor
         preprocessors: {
-            './JitsiMeetJS.js': [ 'webpack' ],
+            './index.js': [ 'webpack' ],
             './**/*.spec.js': [ 'webpack' ]
         },
 

modules/statistics/RTPStatsCollector.js

@@ -10,8 +10,8 @@ const browserSupported = RTCBrowserType.isChrome()
         || RTCBrowserType.isNWJS() || RTCBrowserType.isElectron();
 
 /**
- * The LibJitsiMeet browser-agnostic names of the browser-specific keys reported
- * by RTCPeerConnection#getStats mapped by RTCBrowserType.
+ * The lib-jitsi-meet browser-agnostic names of the browser-specific keys
+ * reported by RTCPeerConnection#getStats mapped by RTCBrowserType.
  */
 const KEYS_BY_BROWSER_TYPE = {};
 
@@ -207,8 +207,9 @@ export default function StatsCollector(
 
     /**
      * The function which is to be used to retrieve the value associated in a
-     * report returned by RTCPeerConnection#getStats with a LibJitsiMeet
+     * report returned by RTCPeerConnection#getStats with a lib-jitsi-meet
      * browser-agnostic name/key.
+     *
      * @function
      * @private
      */
@@ -329,13 +330,13 @@ StatsCollector.prototype.start = function(startAudioLevelStats) {
 /**
  * Defines a function which (1) is to be used as a StatsCollector method and (2)
  * gets the value from a specific report returned by RTCPeerConnection#getStats
- * associated with a LibJitsiMeet browser-agnostic name.
+ * associated with a lib-jitsi-meet browser-agnostic name.
  *
  * @param {Object.<string,string>} keys the map of LibJitsi browser-agnostic
  * names to RTCPeerConnection#getStats browser-specific keys
  */
 StatsCollector.prototype._defineGetStatValueMethod = function(keys) {
-    // Define the function which converts a LibJitsiMeet browser-asnostic name
+    // Define the function which converts a lib-jitsi-meet browser-asnostic name
     // to a browser-specific key of a report returned by
     // RTCPeerConnection#getStats.
     const keyFromName = function(name) {
@@ -395,10 +396,8 @@ StatsCollector.prototype._defineGetStatValueMethod = function(keys) {
 
     // Compose the 2 functions defined above to get a function which retrieves
     // the value from a specific report returned by RTCPeerConnection#getStats
-    // associated with a specific LibJitsiMeet browser-agnostic name.
-    return function(item, name) {
-        return itemStatByKey(item, keyFromName(name));
-    };
+    // associated with a specific lib-jitsi-meet browser-agnostic name.
+    return (item, name) => itemStatByKey(item, keyFromName(name));
 };
 
 /* eslint-disable no-continue */

modules/version/ComponentsVersions.js

@@ -28,7 +28,7 @@ ComponentsVersions.XMPP_SERVER_COMPONENT = 'xmpp';
  *        listen for focus presence updates.
  * @constructor
  */
-function ComponentsVersions(conference) {
+export default function ComponentsVersions(conference) {
 
     this.versions = {};
 
@@ -99,5 +99,3 @@ ComponentsVersions.prototype.processPresence
 ComponentsVersions.prototype.getComponentVersion = function(componentName) {
     return this.versions[componentName];
 };
-
-module.exports = ComponentsVersions;

modules/xmpp/SDP.js

@@ -6,7 +6,7 @@ import SDPUtil from './SDPUtil';
  *
  * @param sdp
  */
-function SDP(sdp) {
+export default function SDP(sdp) {
     const media = sdp.split('\r\nm=');
 
     for (let i = 1, length = media.length; i < length; i++) {
@@ -852,5 +852,3 @@ SDP.prototype.jingle2media = function(content) {
 
     return media;
 };
-
-module.exports = SDP;

modules/xmpp/SDPDiffer.js

@@ -39,7 +39,7 @@ function arrayEquals(array1, array2) {
  * @param mySDP
  * @param otherSDP
  */
-function SDPDiffer(mySDP, otherSDP) {
+export default function SDPDiffer(mySDP, otherSDP) {
     this.mySDP = mySDP;
     this.otherSDP = otherSDP;
 }
@@ -190,5 +190,3 @@ SDPDiffer.prototype.toJingle = function(modify) {
 
     return modified;
 };
-
-module.exports = SDPDiffer;

package.json

@@ -57,6 +57,6 @@
   "pre-commit": [
     "lint"
   ],
-  "main": "./JitsiMeetJS.js",
+  "main": "./index.js",
   "license": "Apache-2.0"
 }

webpack.config.js

@@ -31,7 +31,7 @@ if (minimize) {
 module.exports = {
     devtool: 'source-map',
     entry: {
-        'lib-jitsi-meet': './JitsiMeetJS.js'
+        'lib-jitsi-meet': './index.js'
     },
     module: {
         loaders: [ {