pusher-js 7.0.2 → 7.0.6

package/spec/javascripts/unit/web/http/http_xdomain_request_spec.js

@@ -13,11 +13,11 @@ describe("HTTP.getXDR", function() {
     HTTPFactory = require('runtime').default.HTTPFactory;
 
 
-    window.XDomainRequest = jasmine.createSpy().andCallFake(
+    window.XDomainRequest = jasmine.createSpy().and.callFake(
       Mocks.getXHR
     );;
 
-    spyOn(HTTPFactory, "createRequest").andCallFake(function(h, m, u) {
+    spyOn(HTTPFactory, "createRequest").and.callFake(function(h, m, u) {
       hooks = h;
       method = m;
       url = u;
@@ -52,15 +52,15 @@ describe("HTTP.getXDR", function() {
       describe("on XDR timeout", function() {
         it("should close the socket", function() {
           xdr.ontimeout();
-          expect(socket.close.calls.length).toEqual(1);
+          expect(socket.close.calls.count()).toEqual(1);
         });
 
         it("should emit an RequestTimedOut error before closing the socket", function() {
           var onError = jasmine.createSpy();
           socket.bind("error", onError);
 
-          socket.close.andCallFake(function() {
-            expect(onError.calls.length).toEqual(1);
+          socket.close.and.callFake(function() {
+            expect(onError.calls.count()).toEqual(1);
             expect(onError).toHaveBeenCalledWith(
               jasmine.any(Errors.RequestTimedOut)
             );
@@ -73,15 +73,15 @@ describe("HTTP.getXDR", function() {
       describe("on XDR error", function() {
         it("should close the socket", function() {
           xdr.onerror("test error");
-          expect(socket.close.calls.length).toEqual(1);
+          expect(socket.close.calls.count()).toEqual(1);
         });
 
         it("should emit the error before closing the socket", function() {
           var onError = jasmine.createSpy();
           socket.bind("error", onError);
 
-          socket.close.andCallFake(function() {
-            expect(onError.calls.length).toEqual(1);
+          socket.close.and.callFake(function() {
+            expect(onError.calls.count()).toEqual(1);
             expect(onError).toHaveBeenCalledWith("test error");
           });
 
@@ -108,7 +108,7 @@ describe("HTTP.getXDR", function() {
           xdr.responseText = "asdf";
 
           xdr.onprogress();
-          expect(socket.onChunk.calls.length).toEqual(1);
+          expect(socket.onChunk.calls.count()).toEqual(1);
           expect(socket.onChunk).toHaveBeenCalledWith(200, "asdf");
         });
 
@@ -116,12 +116,12 @@ describe("HTTP.getXDR", function() {
           xdr.responseText = "asdf";
 
           xdr.onprogress();
-          expect(socket.onChunk.calls.length).toEqual(1);
+          expect(socket.onChunk.calls.count()).toEqual(1);
           expect(socket.onChunk).toHaveBeenCalledWith(200, "asdf");
 
           xdr.responseText = "asdfghjkl";
           xdr.onprogress();
-          expect(socket.onChunk.calls.length).toEqual(2);
+          expect(socket.onChunk.calls.count()).toEqual(2);
           expect(socket.onChunk).toHaveBeenCalledWith(200, "asdfghjkl");
         });
       });
@@ -131,7 +131,7 @@ describe("HTTP.getXDR", function() {
           xdr.responseText = "";
 
           xdr.onload();
-          expect(socket.close.calls.length).toEqual(1);
+          expect(socket.close.calls.count()).toEqual(1);
         });
 
         it("should not call socket.onChunk if there is no responseText", function() {
@@ -151,8 +151,8 @@ describe("HTTP.getXDR", function() {
         it("should call socket.onChunk before closing if responseText is not empty", function() {
           xdr.responseText = "12356890";
 
-          socket.close.andCallFake(function() {
-            expect(socket.onChunk.calls.length).toEqual(1);
+          socket.close.and.callFake(function() {
+            expect(socket.onChunk.calls.count()).toEqual(1);
             expect(socket.onChunk).toHaveBeenCalledWith(200, "12356890");
           });
 
@@ -165,8 +165,8 @@ describe("HTTP.getXDR", function() {
           var onFinished = jasmine.createSpy();
           socket.bind("finished", onFinished);
 
-          socket.close.andCallFake(function() {
-            expect(onFinished.calls.length).toEqual(1);
+          socket.close.and.callFake(function() {
+            expect(onFinished.calls.count()).toEqual(1);
             expect(onFinished).toHaveBeenCalledWith(200);
           });
 
@@ -177,14 +177,14 @@ describe("HTTP.getXDR", function() {
 
     describe("#abortRequest", function() {
       it("should abort the passed request", function() {
-        expect(xdr.abort.calls.length).toEqual(0);
+        expect(xdr.abort.calls.count()).toEqual(0);
         hooks.abortRequest(xdr);
-        expect(xdr.abort.calls.length).toEqual(1);
+        expect(xdr.abort.calls.count()).toEqual(1);
       });
 
       it("should set the ontimeout listener to null before calling abort", function() {
         xdr.ontimeout = function() {};
-        xdr.abort.andCallFake(function() {
+        xdr.abort.and.callFake(function() {
           expect(xdr.ontimeout).toBe(null);
         });
 
@@ -193,7 +193,7 @@ describe("HTTP.getXDR", function() {
 
       it("should set the onerror listener to null before calling abort", function() {
         xdr.onerror = function() {};
-        xdr.abort.andCallFake(function() {
+        xdr.abort.and.callFake(function() {
           expect(xdr.onerror).toBe(null);
         });
 
@@ -202,7 +202,7 @@ describe("HTTP.getXDR", function() {
 
       it("should set the onprogress listener to null before calling abort", function() {
         xdr.onprogress = function() {};
-        xdr.abort.andCallFake(function() {
+        xdr.abort.and.callFake(function() {
           expect(xdr.onprogress).toBe(null);
         });
 
@@ -211,7 +211,7 @@ describe("HTTP.getXDR", function() {
 
       it("should set the onload listener to null before calling abort", function() {
         xdr.onload = function() {};
-        xdr.abort.andCallFake(function() {
+        xdr.abort.and.callFake(function() {
           expect(xdr.onload).toBe(null);
         });
 

package/spec/javascripts/unit/web/pusher_authorizer_spec.js

@@ -22,10 +22,10 @@ describe("JSONP Authorizer", function() {
     var script = Mocks.getDocumentElement();
     var documentElement = Mocks.getDocumentElement();
 
-    document.createElement.andReturn(script);
-    document.getElementsByTagName.andReturn([]);
+    document.createElement.and.returnValue(script);
+    document.getElementsByTagName.and.returnValue([]);
     document.documentElement = documentElement;
-    spyOn(Runtime, "getDocument").andReturn(document);
+    spyOn(Runtime, "getDocument").and.returnValue(document);
 
     spyOn(Logger, "warn");
     authorizer.authorize("1.23", function() {});

package/spec/javascripts/unit/web/timeline/timeline_sender_spec.js

@@ -9,13 +9,13 @@ describe("TimelineSender", function() {
 
   beforeEach(function() {
     timeline = Mocks.getTimeline();
-    timeline.isEmpty.andReturn(false);
-    timeline.send.andCallFake(function(sendJSONP, callback) {
+    timeline.isEmpty.and.returnValue(false);
+    timeline.send.and.callFake(function(sendJSONP, callback) {
       sendJSONP({ events: [1, 2, 3]}, callback);
     });
 
     onSend = jasmine.createSpy("onSend");
-    spyOn(Runtime, "createJSONPRequest").andCallFake(function() {
+    spyOn(Runtime, "createJSONPRequest").and.callFake(function() {
       // JSONPRequest and ScriptRequest have compatible interfaces
       jsonpRequest = Mocks.getScriptRequest();
       return jsonpRequest;
@@ -44,7 +44,7 @@ describe("TimelineSender", function() {
     it("should send a non-empty timeline", function() {
       sender.send(false, onSend);
 
-      expect(Runtime.createJSONPRequest.calls.length).toEqual(1);
+      expect(Runtime.createJSONPRequest.calls.count()).toEqual(1);
       expect(Runtime.createJSONPRequest).toHaveBeenCalledWith(
         "http://example.com/timeline",
         { "events": [1, 2, 3] }
@@ -60,7 +60,7 @@ describe("TimelineSender", function() {
       });
       sender.send(true, onSend);
 
-      expect(Runtime.createJSONPRequest.calls.length).toEqual(1);
+      expect(Runtime.createJSONPRequest.calls.count()).toEqual(1);
       expect(Runtime.createJSONPRequest).toHaveBeenCalledWith(
         "https://example.com/timeline",
         { "events": [1, 2, 3] }
@@ -70,7 +70,7 @@ describe("TimelineSender", function() {
     it("should register a receiver using ScriptReceivers", function() {
       sender.send(false, onSend);
 
-      var jsonpReceiver = jsonpRequest.send.calls[0].args[0];
+      var jsonpReceiver = jsonpRequest.send.calls.first().args[0];
       expect(ScriptReceivers[jsonpReceiver.number]).toBe(jsonpReceiver.callback);
     });
 
@@ -78,7 +78,7 @@ describe("TimelineSender", function() {
       sender.send(false, onSend);
 
       expect(onSend).not.toHaveBeenCalled();
-      var jsonpReceiver = jsonpRequest.send.calls[0].args[0];
+      var jsonpReceiver = jsonpRequest.send.calls.first().args[0];
       jsonpReceiver.callback(null, { result: "ok" });
       expect(onSend).toHaveBeenCalledWith(null, { result: "ok" });
     });
@@ -87,7 +87,7 @@ describe("TimelineSender", function() {
       sender.send(false, onSend);
 
       expect(onSend).not.toHaveBeenCalled();
-      var jsonpReceiver = jsonpRequest.send.calls[0].args[0];
+      var jsonpReceiver = jsonpRequest.send.calls.first().args[0];
       jsonpReceiver.callback("ERROR!", undefined);
       expect(onSend).toHaveBeenCalledWith("ERROR!", undefined);
     });
@@ -95,7 +95,7 @@ describe("TimelineSender", function() {
     it("should remove the receiver from ScriptReceivers", function() {
       sender.send(false, onSend);
 
-      var jsonpReceiver = jsonpRequest.send.calls[0].args[0];
+      var jsonpReceiver = jsonpRequest.send.calls.first().args[0];
       jsonpReceiver.callback(null, {});
       expect(ScriptReceivers[jsonpReceiver.number]).toBe(undefined);
     });
@@ -104,13 +104,13 @@ describe("TimelineSender", function() {
       sender.send(false, onSend);
 
       expect(jsonpRequest.cleanup).not.toHaveBeenCalled();
-      var jsonpReceiver = jsonpRequest.send.calls[0].args[0];
+      var jsonpReceiver = jsonpRequest.send.calls.first().args[0];
       jsonpReceiver.callback(null, {});
       expect(jsonpRequest.cleanup).toHaveBeenCalled();
     });
 
     it("should not send an empty timeline", function() {
-      timeline.isEmpty.andReturn(true);
+      timeline.isEmpty.and.returnValue(true);
       sender.send(false, onSend);
       expect(Runtime.createJSONPRequest).not.toHaveBeenCalled();
     });
@@ -118,7 +118,7 @@ describe("TimelineSender", function() {
     it("should use returned hostname for subsequent requests", function() {
       sender.send(false);
 
-      var jsonpReceiver = jsonpRequest.send.calls[0].args[0];
+      var jsonpReceiver = jsonpRequest.send.calls.first().args[0];
       jsonpReceiver.callback(null, { host: "returned.example.com" });
 
       sender.send(false);

package/spec/javascripts/unit/web/transports/hosts_and_ports_spec.js

@@ -16,13 +16,16 @@ describe("Host/Port Configuration", function() {
   var Transports;
 
   beforeEach(function() {
-    spyOn(Runtime, 'getNetwork').andCallFake(function(){
+    jasmine.clock().uninstall();
+    jasmine.clock().install();
+
+    spyOn(Runtime, 'getNetwork').and.callFake(function(){
       var network = new NetInfo();
       network.isOnline = jasmine.createSpy("isOnline")
-        .andReturn(true);
+        .and.returnValue(true);
       return network;
     });
-    spyOn(Runtime, "getLocalStorage").andReturn({});
+    spyOn(Runtime, "getLocalStorage").and.returnValue({});
     Transports = Runtime.Transports;
   });
 
@@ -34,19 +37,19 @@ describe("Host/Port Configuration", function() {
     var _SockJS;
 
     beforeEach(function() {
-      spyOn(Transports.ws, "isSupported").andReturn(false);
-      spyOn(Transports.xdr_streaming, "isSupported").andReturn(false);
-      spyOn(Transports.xhr_streaming, "isSupported").andReturn(false);
-      spyOn(Transports.xdr_polling, "isSupported").andReturn(false);
-      spyOn(Transports.xhr_polling, "isSupported").andReturn(false);
-      spyOn(Transports.sockjs, "isSupported").andReturn(true);
-
-      spyOn(Dependencies, "load").andCallFake(function(file, callback) {
+      spyOn(Transports.ws, "isSupported").and.returnValue(false);
+      spyOn(Transports.xdr_streaming, "isSupported").and.returnValue(false);
+      spyOn(Transports.xhr_streaming, "isSupported").and.returnValue(false);
+      spyOn(Transports.xdr_polling, "isSupported").and.returnValue(false);
+      spyOn(Transports.xhr_polling, "isSupported").and.returnValue(false);
+      spyOn(Transports.sockjs, "isSupported").and.returnValue(true);
+
+      spyOn(Dependencies, "load").and.callFake(function(file, callback) {
         callback();
       });
 
       _SockJS = window.WebSocket;
-      window.SockJS = jasmine.createSpy("WebSocket").andCallFake(function() {
+      window.SockJS = jasmine.createSpy("WebSocket").and.callFake(function() {
         return Mocks.getTransport();
       });
     });

package/spec/javascripts/unit/web/transports/transports_spec.js

@@ -55,7 +55,7 @@ describe("Transports", function() {
         "ws://example.com:123/path/app/foobar?protocol=7&client=js&version=" + VERSION + "&flash=false"
       );
     });
- 
+
     it("should generate correct TLS URLs with custom path prefix", function() {
       var url = Transports.ws.hooks.urls.getInitial("foobar", {
         useTLS: true,
@@ -114,15 +114,14 @@ describe("Transports", function() {
     describe("getSocket hook", function() {
       it("should return a new WebSocket object, if the class is present", function() {
         if(!isSafari()) {
-          window.WebSocket = jasmine.createSpy().andCallFake(function(url) {
+          window.WebSocket = jasmine.createSpy().and.callFake(function(url) {
             this.url = url;
           });
           window.MozWebSocket = undefined;
 
           var socket = Transports.ws.hooks.getSocket("testurl");
-          expect(window.WebSocket.calls.length).toEqual(1);
+          expect(window.WebSocket.calls.count()).toEqual(1);
           expect(window.WebSocket).toHaveBeenCalledWith("testurl");
-          expect(socket).toEqual(jasmine.any(window.WebSocket));
           expect(socket.url).toEqual("testurl");
         }
       });
@@ -131,15 +130,14 @@ describe("Transports", function() {
         if(!isSafari()) {
           window.WebSocket = undefined;
 
-          window.MozWebSocket = jasmine.createSpy().andCallFake(function(url) {
+          window.MozWebSocket = jasmine.createSpy().and.callFake(function(url) {
             this.url = url;
           });
 
           var socket = Transports.ws.hooks.getSocket("moztesturl");
 
-          expect(window.MozWebSocket.calls.length).toEqual(1);
+          expect(window.MozWebSocket.calls.count()).toEqual(1);
           expect(window.MozWebSocket).toHaveBeenCalledWith("moztesturl");
-          expect(socket).toEqual(jasmine.any(window.MozWebSocket));
           expect(socket.url).toEqual("moztesturl");
         }
       });
@@ -192,8 +190,8 @@ describe("Transports", function() {
         var socket = Mocks.getWebSocket();
         Transports.sockjs.hooks.beforeOpen(socket, "test/path");
 
-        expect(socket.send.calls.length).toEqual(1);
-        var pathMessage = JSON.parse(socket.send.calls[0].args[0]);
+        expect(socket.send.calls.count()).toEqual(1);
+        var pathMessage = JSON.parse(socket.send.calls.first().args[0]);
         expect(pathMessage).toEqual({ path: "test/path" });
       });
     });
@@ -209,7 +207,7 @@ describe("Transports", function() {
         Dependencies.load = jasmine.createSpy("load");
         Dependencies.getRoot = jasmine.createSpy("getRoot");
         Dependencies.getPath = jasmine.createSpy("getPath");
-        Dependencies.getPath.andCallFake(function(file, options) {
+        Dependencies.getPath.and.callFake(function(file, options) {
           return (options.useTLS ? "https" : "http") + "://host/" + file;
         });
       });
@@ -233,21 +231,21 @@ describe("Transports", function() {
         var socket = Transports.sockjs.hooks.getSocket(
           "url", { useTLS: true }
         );
-        expect(window.SockJS).toHaveBeenCalledWith(
-          "url", null, { js_path: "https://host/sockjs" }
-        );
+        expect(window.SockJS).toHaveBeenCalledWith('url', null, {
+          js_path: 'https://host/sockjs',
+          ignore_null_origin: undefined
+        });
       });
 
       it("should return a new SockJS object", function() {
-        window.SockJS = jasmine.createSpy().andCallFake(function(url) {
+        window.SockJS = jasmine.createSpy().and.callFake(function(url) {
           this.url = url;
         });
 
         var socket = Transports.sockjs.hooks.getSocket(
           "sock_test", { useTLS: false }
         );
-        expect(window.SockJS.calls.length).toEqual(1);
-        expect(socket).toEqual(jasmine.any(window.SockJS));
+        expect(window.SockJS.calls.count()).toEqual(1);
         expect(socket.url).toEqual("sock_test");
       });
     });
@@ -331,14 +329,14 @@ describe("Transports", function() {
 
       describe("isSupported hook", function() {
         it("should return true if window.XMLHttpRequest exists and its instances have a withCredentials property", function() {
-          window.XMLHttpRequest = jasmine.createSpy().andCallFake(function() {
+          window.XMLHttpRequest = jasmine.createSpy().and.callFake(function() {
             this.withCredentials = false;
           });
           expect(Transports[transport].hooks.isSupported({})).toBe(true);
         });
 
         it("should return false if window.XMLHttpRequest exists, but its instances don't have a withCredentials property", function() {
-          window.XMLHttpRequest = jasmine.createSpy().andCallFake(function() {
+          window.XMLHttpRequest = jasmine.createSpy().and.callFake(function() {
             this.withCredentials = undefined;
           });
           expect(Transports[transport].hooks.isSupported({})).toBe(false);
@@ -363,7 +361,7 @@ describe("Transports", function() {
       describe("isSupported hook", function() {
         it("should return true if window.XDomainRequest exists, document protocol is http: and connection is not using TLS", function() {
           window.XDomainRequest = function() {};
-          spyOn(Runtime, "getDocument").andReturn({
+          spyOn(Runtime, "getDocument").and.returnValue({
             location: {
               protocol: "http:"
             }
@@ -373,7 +371,7 @@ describe("Transports", function() {
 
         it("should return true if window.XDomainRequest exists, document protocol is https: and connection is using TLS", function() {
           window.XDomainRequest = function() {};
-          spyOn(Runtime, "getDocument").andReturn({
+          spyOn(Runtime, "getDocument").and.returnValue({
             location: {
               protocol: "https:"
             }
@@ -383,7 +381,7 @@ describe("Transports", function() {
 
         it("should return false if window.XDomainRequest exists, document protocol is http: and connection is using TLS", function() {
           window.XDomainRequest = function() {};
-          spyOn(Runtime, "getDocument").andReturn({
+          spyOn(Runtime, "getDocument").and.returnValue({
             location: {
               protocol: "http:"
             }
@@ -393,7 +391,7 @@ describe("Transports", function() {
 
         it("should return false if window.XDomainRequest exists, document protocol is https: and connection is not using TLS", function() {
           window.XDomainRequest = function() {};
-          spyOn(Runtime, "getDocument").andReturn({
+          spyOn(Runtime, "getDocument").and.returnValue({
             location: {
               protocol: "https:"
             }
@@ -414,12 +412,12 @@ describe("Transports", function() {
     describe(transport, function() {
       describe("getSocket hook", function() {
         it("should return a new streaming HTTPSocket object", function() {
-          spyOn(HTTP, "createStreamingSocket").andCallFake(function(url) {
+          spyOn(HTTP, "createStreamingSocket").and.callFake(function(url) {
             return "streaming socket mock";
           });
 
           var socket = Transports[transport].hooks.getSocket("streamurl");
-          expect(HTTP.createStreamingSocket.calls.length).toEqual(1);
+          expect(HTTP.createStreamingSocket.calls.count()).toEqual(1);
           expect(HTTP.createStreamingSocket).toHaveBeenCalledWith("streamurl");
           expect(socket).toEqual("streaming socket mock");
         });
@@ -431,12 +429,12 @@ describe("Transports", function() {
     describe(transport, function() {
       describe("getSocket hook", function() {
         it("should return a new polling HTTPSocket object", function() {
-          spyOn(HTTP, "createPollingSocket").andCallFake(function(url) {
+          spyOn(HTTP, "createPollingSocket").and.callFake(function(url) {
             return "polling socket mock";
           });
 
           var socket = Transports[transport].hooks.getSocket("streamurl");
-          expect(HTTP.createPollingSocket.calls.length).toEqual(1);
+          expect(HTTP.createPollingSocket.calls.count()).toEqual(1);
           expect(HTTP.createPollingSocket).toHaveBeenCalledWith("streamurl");
           expect(socket).toEqual("polling socket mock");
         });

package/spec/javascripts/unit/worker/pusher_authorizer_spec.js

@@ -77,7 +77,7 @@ describe("Fetch Authorizer", function(){
     );
     var callback = jasmine.createSpy("callback");
     authorizer.authorize("1.23", callback).then(function(){
-      expect(callback.calls.length).toEqual(1);
+      expect(callback.calls.count()).toEqual(1);
       expect(callback).toHaveBeenCalledWith(false, data);
     });
   });
@@ -99,7 +99,7 @@ describe("Fetch Authorizer", function(){
     var callback = jasmine.createSpy("callback");
 
     authorizer.authorize("1.23", callback).then(function(){
-      expect(callback.calls.length).toEqual(1);
+      expect(callback.calls.count()).toEqual(1);
       expect(callback).toHaveBeenCalledWith(
         true,
         "JSON returned from auth endpoint was invalid, yet status code was 200. " +

package/spec/javascripts/unit/worker/timeline_sender_spec.js

@@ -9,8 +9,8 @@ describe("fetch", function(){
 
   beforeEach(function(){
     timeline = Mocks.getTimeline();
-    timeline.isEmpty.andReturn(false);
-    timeline.send.andCallFake(function(sendXHR, callback) {
+    timeline.isEmpty.and.returnValue(false);
+    timeline.send.and.callFake(function(sendXHR, callback) {
       sendXHR({ events: [1, 2, 3]}, callback);
     });
 

package/src/core/auth/options.ts

@@ -26,6 +26,7 @@ export interface AuthorizerGenerator {
 
 export interface AuthorizerOptions {
   authTransport: 'ajax' | 'jsonp';
+  authEndpoint: string;
   auth?: AuthOptions;
   authorizer?: AuthorizerGenerator;
 }

package/types/src/core/auth/options.d.ts

@@ -17,6 +17,7 @@ export interface AuthorizerGenerator {
 }
 export interface AuthorizerOptions {
     authTransport: 'ajax' | 'jsonp';
+    authEndpoint: string;
     auth?: AuthOptions;
     authorizer?: AuthorizerGenerator;
 }

package/webpack/config.node.js

@@ -1,9 +1,9 @@
 var path = require('path');
-var objectAssign = require('object-assign-deep');
+const { merge } = require('webpack-merge');
 var configShared = require('./config.shared');
 var webpack = require('webpack');
 
-module.exports = objectAssign({}, configShared, {
+module.exports = merge({}, configShared, {
   entry: {
     pusher: './src/core/pusher-with-encryption.js'
   },

package/webpack/config.react-native.js

@@ -2,12 +2,12 @@ var path = require('path');
 var NormalModuleReplacementPlugin = require('webpack')
   .NormalModuleReplacementPlugin;
 var version = require('../package').version;
-var objectAssign = require('object-assign-deep');
+const { merge } = require('webpack-merge');
 var configShared = require('./config.shared');
 var webpack = require('webpack');
 var buffer = require('buffer');
 
-module.exports = objectAssign({}, configShared, {
+module.exports = merge({}, configShared, {
   entry: {
     pusher: './src/core/pusher-with-encryption.js'
   },

package/webpack/config.shared.js

@@ -16,13 +16,21 @@ module.exports = {
   entry: {
     pusher: './src/core/pusher.js'
   },
+  devtool: 'source-map',
   resolve: {
     extensions: ['.webpack.js', '.web.js', '.ts', '.js'],
     // add runtimes for easier importing of isomorphic runtime modules
     modules: ['src', 'src/runtimes', 'node_modules']
   },
   module: {
-    rules: [{ test: /\.ts$/, loader: 'ts-loader' }]
+    rules: [
+      { test: /\.ts$/, loader: 'ts-loader' },
+      {
+        test: /\.js$/,
+        enforce: 'pre',
+        use: ['source-map-loader']
+      }
+    ]
   },
   node: {
     // nacl uses Buffer on node.js but has a different code path for the browser.

package/webpack/config.web.js

@@ -1,7 +1,7 @@
 var path = require('path');
 var webpack = require('webpack');
 var NormalModuleReplacementPlugin = webpack.NormalModuleReplacementPlugin;
-var objectAssign = require('object-assign-deep');
+const { merge } = require('webpack-merge');
 var configShared = require('./config.shared');
 
 var filename = configShared.optimization.minimize
@@ -14,7 +14,7 @@ if (process.env.INCLUDE_TWEETNACL === 'true') {
   filename = filename.replace('pusher', 'pusher-with-encryption');
 }
 
-module.exports = objectAssign({}, configShared, {
+module.exports = merge({}, configShared, {
   entry: {
     pusher: entry
   },

package/webpack/config.worker.js

@@ -2,7 +2,7 @@ var path = require('path');
 var NormalModuleReplacementPlugin = require('webpack')
   .NormalModuleReplacementPlugin;
 var version = require('../package').version;
-var objectAssign = require('object-assign-deep');
+const { merge } = require('webpack-merge');
 var webpack = require('webpack');
 var configShared = require('./config.shared');
 
@@ -16,14 +16,16 @@ if (process.env.INCLUDE_TWEETNACL === 'true') {
   filename = filename.replace('pusher', 'pusher-with-encryption');
 }
 
-var config = objectAssign(configShared, {
+var config = merge(configShared, {
   entry: {
     pusher: entry
   },
   output: {
     library: 'Pusher',
     path: path.join(__dirname, '../dist/worker'),
-    filename: filename
+    filename: filename,
+    libraryTarget: 'umd',
+    globalObject: 'this'
   },
   resolve: {
     // in order to import the appropriate runtime.ts

package/worker/index.d.ts

@@ -0,0 +1,15 @@
+export {
+  Authorizer,
+  AuthOptions,
+  AuthorizerGenerator,
+  AuthorizerCallback,
+} from '../types/src/core/auth/options';
+export { Options } from '../types/src/core/options';
+
+export { default as Channel } from '../types/src/core/channels/channel';
+export { default as PresenceChannel } from '../types/src/core/channels/presence_channel';
+export { default as Members } from '../types/src/core/channels/members';
+export { default as Runtime } from '../types/src/runtimes/interface';
+export { default as ConnectionManager } from '../types/src/core/connection/connection_manager';
+
+export { default } from '../types/src/core/pusher';

package/worker/index.js

@@ -0,0 +1 @@
+module.exports = require('../dist/worker/pusher.worker.js');