Merge branch 'travis/sourcemaps' into travis/babel7-btargets

.babelrc

@@ -1,5 +1,5 @@
 {
-    "sourceMaps": "inline",
+    "sourceMaps": true,
     "presets": [
         ["@babel/preset-env", {
             "targets": {

CONTRIBUTING.rst

@@ -39,9 +39,10 @@ Code style
 The js-sdk aims to target TypeScript/ES6. All new files should be written in
 TypeScript and existing files should use ES6 principles where possible.
 
-Members should not be exported as a default export - this is to prevent problems
-down the line when importing various bits of code in other layers and in the
-index for this project. In short, don't use `export default`.
+Members should not be exported as a default export in general - it causes problems
+with the architecture of the SDK (index file becomes less clear) and could
+introduce naming problems (as default exports get aliased upon import). In
+general, avoid using `export default`.
 
 The remaining code-style for matrix-js-sdk is not formally documented, but
 contributors are encouraged to read the code style document for matrix-react-sdk

examples/browser/browserTest.js

@@ -1,4 +1,3 @@
-"use strict";
 console.log("Loading browser sdk");
 
 var client = matrixcs.createClient("http://matrix.org");

examples/node/app.js

@@ -1,5 +1,3 @@
-"use strict";
-
 var myUserId = "@example:localhost";
 var myAccessToken = "QGV4YW1wbGU6bG9jYWxob3N0.qPEvLuYfNBjxikiCjP";
 var sdk = require("matrix-js-sdk");

examples/voip/browserTest.js

@@ -1,4 +1,3 @@
-"use strict";
 console.log("Loading browser sdk");
 var BASE_URL = "https://matrix.org";
 var TOKEN = "accesstokengoeshere";

package.json

@@ -32,7 +32,6 @@
   "license": "Apache-2.0",
   "files": [
     "lib",
-    "dist",
     "src",
     "git-revision.txt",
     "CHANGELOG.md",
@@ -79,7 +78,6 @@
     "matrix-mock-request": "^1.2.3",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "rimraf": "^3.0.0",
-    "source-map-support": "^0.5.13",
     "terser": "^4.4.3",
     "tsify": "^4.0.1",
     "tslint": "^5.20.1",

spec/TestClient.js

@@ -16,8 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-"use strict";
-
 // load olm before the sdk if possible
 import './olm-loader';
 

spec/integ/matrix-client-crypto.spec.js

@@ -25,9 +25,6 @@ limitations under the License.
  * See also `megolm.spec.js`.
  */
 
-"use strict";
-import 'source-map-support/register';
-
 // load olm before the sdk if possible
 import '../olm-loader';
 

spec/integ/matrix-client-event-emitter.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as utils from "../test-utils";
 import {TestClient} from "../TestClient";
 

spec/integ/matrix-client-event-timeline.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as utils from "../test-utils";
 import {EventTimeline} from "../../src/matrix";
 import {logger} from "../../src/logger";

spec/integ/matrix-client-methods.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as utils from "../test-utils";
 import {CRYPTO_ENABLED} from "../../src/client";
 import {Filter, MemoryStore, Room} from "../../src/matrix";

spec/integ/matrix-client-opts.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as utils from "../test-utils";
 import HttpBackend from "matrix-mock-request";
 import {MatrixClient} from "../../src/matrix";

spec/integ/matrix-client-retrying.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import {EventStatus} from "../../src/matrix";
 import {MatrixScheduler} from "../../src/scheduler";
 import {Room} from "../../src/models/room";

spec/integ/matrix-client-room-timeline.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as utils from "../test-utils";
 import {EventStatus} from "../../src/models/event";
 import {TestClient} from "../TestClient";

spec/integ/matrix-client-syncing.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import {MatrixEvent} from "../../src/models/event";
 import {EventTimeline} from "../../src/models/event-timeline";
 import * as utils from "../test-utils";

spec/integ/megolm-integ.spec.js

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-"use strict";
-
 import anotherjson from "another-json";
 import * as utils from "../../src/utils";
 import * as testUtils from "../test-utils";

spec/test-utils.js

@@ -1,4 +1,3 @@
-"use strict";
 // load olm before the sdk if possible
 import './olm-loader';
 

spec/unit/autodiscovery.spec.js

@@ -14,9 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
-
-import 'source-map-support/register';
 
 import MockHttpBackend from "matrix-mock-request";
 import * as sdk from "../../src";

spec/unit/content-repo.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as ContentRepo from "../../src/content-repo";
 
 describe("ContentRepo", function() {

spec/unit/crypto.spec.js

@@ -1,5 +1,3 @@
-import 'source-map-support/register';
-
 import '../olm-loader';
 import {Crypto} from "../../src/crypto";
 import {WebStorageSessionStore} from "../../src/store/session/webstorage";

spec/unit/event-timeline.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as utils from "../test-utils";
 import {EventTimeline} from "../../src/models/event-timeline";
 import {RoomState} from "../../src/models/room-state";

spec/unit/filter.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import {Filter} from "../../src/filter";
 
 describe("Filter", function() {

spec/unit/interactive-auth.spec.js

@@ -14,9 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
-import 'source-map-support/register';
 import {logger} from "../../src/logger";
 import {InteractiveAuth} from "../../src/interactive-auth";
 import {MatrixError} from "../../src/http-api";

spec/unit/matrix-client.spec.js

@@ -1,6 +1,3 @@
-"use strict";
-import 'source-map-support/register';
-
 import {logger} from "../../src/logger";
 import {MatrixClient} from "../../src/client";
 import {Filter} from "../../src/filter";

spec/unit/pushprocessor.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as utils from "../test-utils";
 import {PushProcessor} from "../../src/pushprocessor";
 

spec/unit/realtime-callbacks.spec.js

@@ -1,6 +1,3 @@
-"use strict";
-
-import 'source-map-support/register';
 import * as callbacks from "../../src/realtime-callbacks";
 
 let wallTime = 1234567890;

spec/unit/room-member.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as utils from "../test-utils";
 import {RoomMember} from "../../src/models/room-member";
 

spec/unit/room-state.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as utils from "../test-utils";
 import {RoomState} from "../../src/models/room-state";
 import {RoomMember} from "../../src/models/room-member";

spec/unit/room.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as utils from "../test-utils";
 import {EventStatus, MatrixEvent} from "../../src/models/event";
 import {EventTimeline} from "../../src/models/event-timeline";

spec/unit/scheduler.spec.js

@@ -1,7 +1,6 @@
 // This file had a function whose name is all caps, which displeases eslint
 /* eslint new-cap: "off" */
 
-import 'source-map-support/register';
 import {defer} from '../../src/utils';
 import {MatrixError} from "../../src/http-api";
 import {MatrixScheduler} from "../../src/scheduler";

spec/unit/sync-accumulator.spec.js

@@ -15,9 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-"use strict";
-import 'source-map-support/register';
-
 import {SyncAccumulator} from "../../src/sync-accumulator";
 
 describe("SyncAccumulator", function() {

spec/unit/timeline-window.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import {EventTimeline} from "../../src/models/event-timeline";
 import {TimelineIndex, TimelineWindow} from "../../src/timeline-window";
 import * as utils from "../test-utils";

spec/unit/user.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import {User} from "../../src/models/user";
 import * as utils from "../test-utils";
 

spec/unit/utils.spec.js

@@ -1,5 +1,3 @@
-"use strict";
-import 'source-map-support/register';
 import * as utils from "../../src/utils";
 
 describe("utils", function() {

src/base-apis.js

@@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /**
  * This is an internal module. MatrixBaseApis is currently only meant to be used

src/client.js

@@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 
 /**

src/content-helpers.js

@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /** @module ContentHelpers */
 

src/crypto/DeviceList.js

@@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /**
  * @module crypto/DeviceList

src/crypto/algorithms/index.js

@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /**
  * @module crypto/algorithms

src/crypto/algorithms/megolm.js

@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /**
  * Defines m.olm encryption/decryption

src/crypto/algorithms/olm.js

@@ -13,7 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /**
  * Defines m.olm encryption/decryption

src/crypto/deviceinfo.js

@@ -14,8 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
-
 
 /**
  * @module crypto/deviceinfo

src/crypto/index.js

@@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /**
  * @module crypto

src/filter-component.js

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * @module filter-component
  */

src/filter.js

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * @module filter
  */

src/http-api.js

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * This is an internal module. See {@link MatrixHttpApi} for the public class.
  * @module http-api

src/interactive-auth.js

@@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /** @module interactive-auth */
 

src/matrix.js

@@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 import {MemoryCryptoStore} from "./crypto/store/memory-crypto-store";
 import {MemoryStore} from "./store/memory";

src/models/event-context.js

@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /**
  * @module models/event-context

src/models/event-timeline-set.js

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * @module models/event-timeline-set
  */

src/models/event-timeline.js

@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /**
  * @module models/event-timeline

src/models/event.js

@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /**
  * This is an internal module. See {@link MatrixEvent} and {@link RoomEvent} for

src/models/room-member.js

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * @module models/room-member
  */

src/models/room-state.js

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * @module models/room-state
  */

src/models/room-summary.js

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * @module models/room-summary
  */

src/models/room.js

@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * @module models/room
  */

src/models/search-result.js

@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /**
  * @module models/search-result

src/models/user.js

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * @module models/user
  */

src/realtime-callbacks.js

@@ -24,8 +24,6 @@ limitations under the License.
  * it will instead fire as soon as possible after resume.
  */
 
-"use strict";
-
 import {logger} from './logger';
 
 // we schedule a callback at least this often, to check if we've missed out on

src/scheduler.js

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * This is an internal module which manages queuing, scheduling and retrying
  * of requests.

src/store/memory.js

@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * This is an internal module. See {@link MemoryStore} for the public class.
  * @module store/memory

src/store/session/webstorage.js

@@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /**
  * @module store/session/webstorage

src/store/stub.js

@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * This is an internal module.
  * @module store/stub

src/sync.js

@@ -16,7 +16,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /*
  * TODO:

src/timeline-window.js

@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
 
 /** @module timeline-window */
 

src/utils.js

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * This is an internal module.
  * @module utils
@@ -573,55 +573,6 @@ export function runPolyfills() {
  * @param {function} superCtor Constructor function to inherit prototype from.
  */
 export function inherits(ctor, superCtor) {
-    // Add Object.create polyfill for IE8
-    // Source:
-    // https://developer.mozilla.org/en-US/docs/Web/JavaScript
-    // /Reference/Global_Objects/Object/create#Polyfill
-    if (typeof Object.create != 'function') {
-      // Production steps of ECMA-262, Edition 5, 15.2.3.5
-      // Reference: http://es5.github.io/#x15.2.3.5
-      Object.create = (function() {
-        // To save on memory, use a shared constructor
-        function Temp() {}
-
-        // make a safe reference to Object.prototype.hasOwnProperty
-        const hasOwn = Object.prototype.hasOwnProperty;
-
-        return function(O) {
-          // 1. If Type(O) is not Object or Null throw a TypeError exception.
-          if (typeof O != 'object') {
-            throw new TypeError('Object prototype may only be an Object or null');
-          }
-
-          // 2. Let obj be the result of creating a new object as if by the
-          //    expression new Object() where Object is the standard built-in
-          //    constructor with that name
-          // 3. Set the [[Prototype]] internal property of obj to O.
-          Temp.prototype = O;
-          const obj = new Temp();
-          Temp.prototype = null; // Let's not keep a stray reference to O...
-
-          // 4. If the argument Properties is present and not undefined, add
-          //    own properties to obj as if by calling the standard built-in
-          //    function Object.defineProperties with arguments obj and
-          //    Properties.
-          if (arguments.length > 1) {
-            // Object.defineProperties does ToObject on its first argument.
-            const Properties = Object(arguments[1]);
-            for (const prop in Properties) {
-              if (hasOwn.call(Properties, prop)) {
-                obj[prop] = Properties[prop];
-              }
-            }
-          }
-
-          // 5. Return obj
-          return obj;
-        };
-      })();
-    }
-    // END polyfill
-
     // Add util.inherits from Node.js
     // Source:
     // https://github.com/joyent/node/blob/master/lib/util.js

src/webrtc/call.js

@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-"use strict";
+
 /**
  * This is an internal module. See {@link createNewMatrixCall} for the public API.
  * @module webrtc/call

tsconfig.json

@@ -6,7 +6,7 @@
     "moduleResolution": "node",
     "target": "es2016",
     "noImplicitAny": false,
-    "sourceMap": false,
+    "sourceMap": true,
     "outDir": "./lib",
     "declaration": true,
     "types": [

yarn.lock

@@ -5677,7 +5677,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.13, source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12:
+source-map-support@^0.5.16, source-map-support@^0.5.6:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
   integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==