Merge pull request #122 from thoov/import-changes

Support ES2015 imports via index file

README.md

@@ -62,8 +62,7 @@ describe('Chat Unit Test', () => {
       const messageLen = chatApp.messages.length;
       assert.equal(messageLen, 2, '2 messages where sent from the s server');
 
-      mockServer.stop();
-      done();
+      mockServer.stop(done);
     }, 100);
   });
 });
@@ -110,7 +109,7 @@ describe('Chat Unit Test', () => {
     setTimeout(() => {
       const messageLen = chatApp.messages.length;
       assert.equal(messageLen, 2, '2 messages where sent from the server');
-      done();
+      mockServer.stop(done);
     }, 100);
   });
 });
@@ -122,41 +121,43 @@ describe('Chat Unit Test', () => {
 The easiest way to work on the project is to clone the repo down via:
 
 ```shell
-git clone git@github.com:thoov/mock-socket.git; cd mock-socket; npm i
+git clone git@github.com:thoov/mock-socket.git
+cd mock-socket
+yarn
 ```
 Then to create a local build via:
 
 ```shell
-npm run build
+yarn build
 ```
 
 Then create a local npm link via:
 
 ```shell
-npm link
+yarn link
 ```
 
 At this point you can create other projects / apps locally and reference this local build via:
 
 ```shell
-npm link mock-socket
+yarn link mock-socket
 ```
 
-from within your other projects folder. Make sure that after any changes you run `npm run build`!
+from within your other projects folder. Make sure that after any changes you run `yarn build`!
 
 ### Tests
 This project uses mocha as its test framework. Tests are located in /test and have 1 of 3 file name prefixes (functional-, issue-#, or unit-).
 
 ```shell
-npm test
+yarn test
 ```
 
 ### Linting
 
 This project uses eslint and a rules set from [airbnb's javascript style guides](https://github.com/airbnb/javascript). To run linting:
 
 ```shell
-npm run lint
+yarn lint
 ```
 
 ### Code Coverage

dist/main.js → dist/index.js

@@ -8,7 +8,7 @@
       exports: {}
     };
     factory(mod.exports, global.server, global.socketIo, global.websocket);
-    global.main = mod.exports;
+    global.index = mod.exports;
   }
 })(this, function (exports, _server, _socketIo, _websocket) {
   'use strict';

dist/server.js

@@ -74,7 +74,7 @@
     /*
     * Removes the mock websocket object from the global object
     */
-    stop() {
+    stop(callback = () => {}) {
       const globalObj = (0, _globalObject2.default)();
 
       if (this.originalWebSocket) {
@@ -86,6 +86,10 @@
       this.originalWebSocket = null;
 
       _networkBridge2.default.removeServer(this.url);
+
+      if (typeof callback === 'function') {
+        callback();
+      }
     }
 
     /*

package.json

@@ -2,7 +2,7 @@
   "name": "mock-socket",
   "version": "5.0.1",
   "description": "Javascript mocking library for websockets and socket.io",
-  "main": "./dist/main.js",
+  "main": "./dist/index.js",
   "directories": {
     "test": "tests"
   },

src/server.js

@@ -45,7 +45,7 @@ class Server extends EventTarget {
   /*
   * Removes the mock websocket object from the global object
   */
-  stop() {
+  stop(callback = () => {}) {
     const globalObj = globalObject();
 
     if (this.originalWebSocket) {
@@ -57,6 +57,10 @@ class Server extends EventTarget {
     this.originalWebSocket = null;
 
     networkBridge.removeServer(this.url);
+
+    if (typeof callback === 'function') {
+      callback();
+    }
   }
 
   /*