chore(types): Typings -> @types

The old type Typings tool is now deprecated, switch to the current @types mechanism which avoids the need for another, separate tool.

(and minor incidental whitespace cleanup)

Author: Kyle Cordes

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
-addons: 
+addons:
   "firefox": "latest"
 node_js:
   - "5"

most-typings.d.ts

@@ -1,5 +1,5 @@
 import {Stream} from 'most';
-import {Pathname, Location} from '@cycle/history/lib/interfaces';
+import {Pathname, Location} from '@cycle/history';
 import {RouteDefinitionsMap, RouteMatcherReturn} from './lib/interfaces';
 export interface RouterSource {
     history$: Stream<Location>;

package.json

@@ -34,6 +34,8 @@
   },
   "devDependencies": {
     "@cycle/rxjs-run": "^6.1.0",
+    "@types/mocha": "^2.2.41",
+    "@types/node": "^7.0.22",
     "assert": "^1.4.1",
     "babel-preset-es2015": "^6.16.0",
     "babel-register": "^6.18.0",
@@ -44,14 +46,13 @@
     "mkdirp": "^0.5.1",
     "mocha": "^2.5.3",
     "rxjs": "^5.2.0",
+    "switch-path": "^1.1.8",
     "testem": "^1.10.4",
     "tslint": "^3.10.2",
     "typescript": "^2.0.7",
-    "typings": "^0.8.1",
     "uglify-js": "^2.7.1",
     "validate-commit-message": "^3.0.1",
-    "xstream": "^10.3.0",
-    "switch-path": "^1.1.8"
+    "xstream": "^10.3.0"
   },
   "config": {
     "ghooks": {
@@ -67,7 +68,6 @@
     "pretest-ci": "npm run lib",
     "test-ci": "npm run lint && npm run test-node && testem ci",
     "predist": "rm -rf dist/ && mkdirp dist/",
-    "prelib": "typings install",
     "lib": "tsc",
     "start": "npm install && npm prune",
     "prerelease": "npm run lib",

rx-typings.d.ts

@@ -1,5 +1,5 @@
 import {Observable} from 'rx';
-import {Pathname, Location} from '@cycle/history/lib/interfaces';
+import {Pathname, Location} from '@cycle/history';
 import {RouteDefinitionsMap, RouteMatcherReturn} from './lib/interfaces';
 export interface RouterSource {
     history$: Observable<Location>;

rxjs-typings.d.ts

@@ -1,5 +1,5 @@
 import {Observable} from 'rxjs';
-import {Pathname, Location} from '@cycle/history/lib/interfaces';
+import {Pathname, Location} from '@cycle/history';
 import {RouteDefinitionsMap, RouteMatcherReturn} from './lib/interfaces';
 export interface RouterSource {
     history$: Observable<Location>;

src/interfaces.ts

@@ -13,4 +13,4 @@ export interface RouteMatcherReturn {
 
 export interface RouteMatcher {
   (path: string, routes: RouteDefinitionsMap | RouteDefinitionsArray): RouteMatcherReturn;
-} 
+}

typings.json

@@ -1,5 +1,5 @@
 import {Stream} from 'xstream';
-import {Pathname} from '@cycle/history/lib/interfaces';
+import {Pathname} from '@cycle/history';
 import {RouteDefinitionsMap, RouteMatcherReturn} from './lib/interfaces';
 export interface RouterSource {
     history$: Stream<Location>;