From 838d7f856a3f752c1047d21c563080a9c6921ffa Mon Sep 17 00:00:00 2001
From: MoshMage <moshmage@gmail.com>
Date: Mon, 19 Dec 2016 14:45:44 +0000
Subject: [PATCH] one step forward, two steps baaack

---
 package.json                   |  4 ++--
 src/subjects/socket-io.spec.ts | 10 ++++++----
 tsconfig.json                  |  5 +++--
 tsconfig.spec.json             |  4 +++-
 typings.json                   |  1 +
 typings/index.d.ts             |  1 +
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 40a1201..93b8456 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "test": "karma start karma.conf.js",
-    "posttest":"rm -rf spec/",
+    "posttest": "rm -rf spec/",
     "prebuild": "npm run test",
     "build": "ntsc"
   },
@@ -25,7 +25,7 @@
     "karma-cli": "^1.0.1",
     "karma-jasmine": "^1.1.0",
     "karma-phantomjs-launcher": "^1.0.2",
-    "karma-typescript": "https://github.com/monounity/karma-typescript",
+    "karma-typescript": "^2.1.5",
     "socket.io": "^1.7.2",
     "typescript": "^2.1.4"
   }
diff --git a/src/subjects/socket-io.spec.ts b/src/subjects/socket-io.spec.ts
index 3ad1390..c1c3400 100644
--- a/src/subjects/socket-io.spec.ts
+++ b/src/subjects/socket-io.spec.ts
@@ -4,16 +4,17 @@
 import {IO} from './socket-io';
 import {ioEvent} from './io-events';
 import {assign} from "rxjs/util/assign";
-const socketIO = require('socket.io');
+import * as io from 'socket.io';
 
 function setUpTestServer() {
-    return socketIO.listen(1337).on('connection', (socket) => {
+    return io.listen(1337).on('connection', (socket) => {
         socket.on('test-event',(socket)=> {
             socket.emit('test-event', {data: true});
         })
     });
 }
-setUpTestServer();
+
+
 
 describe('IO', () => {
     it ('is instance of itself', () => {
@@ -101,9 +102,10 @@ describe('IO', () => {
 
     describe('Connection', () => {
         let socket = new IO();
+        setUpTestServer();
 
         it('connects', () => {
-            console.log()
+            console.log('testing connects');
             socket.event$.subscribe((newData)=>{
                 console.log('newData', newData);
                 expect(newData).toContain({connected: true})
diff --git a/tsconfig.json b/tsconfig.json
index 4dc15ff..6c5f166 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,9 +4,10 @@
     "target": "es5",
     "sourceMap": false,
     "removeComments": false,
-    "outDir": "dist/",
     "declaration": true,
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "outDir": "dist/",
+    "declarationDir": "types/"
   },
   "include": [
     "src/**/*"
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
index 280022f..7f2031a 100644
--- a/tsconfig.spec.json
+++ b/tsconfig.spec.json
@@ -6,7 +6,9 @@
     "removeComments": true,
     "outDir": "spec/",
     "declaration": false,
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "listFiles": true,
+    "baseUrl": "./"
   },
   "include": [
     "src/**/*"
diff --git a/typings.json b/typings.json
index 4ce7fa1..6bb1dd1 100644
--- a/typings.json
+++ b/typings.json
@@ -1,5 +1,6 @@
 {
   "globalDevDependencies": {
+    "socket.io": "registry:dt/socket.io#1.4.4+20160915014424",
     "socket.io-client": "registry:dt/socket.io-client#1.4.4+20161116080703"
   }
 }
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 5f7ba1d..9844a85 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -1 +1,2 @@
 /// <reference path="globals/socket.io-client/index.d.ts" />
+/// <reference path="globals/socket.io/index.d.ts" />