Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: node_js
addons:
addons:
"firefox": "latest"
node_js:
- "5"
- "7"
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
Expand Down
2 changes: 1 addition & 1 deletion most-typings.d.ts
Original file line number Diff line number Diff line change
@@ -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>;
Expand Down
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,32 @@
},
"homepage": "https://github.com/cyclejs-community/cyclic-router#readme",
"dependencies": {
"@cycle/history": "^6.1.0",
"@types/history": "^4.5.0",
"history": "^4.5.0",
"@cycle/run": "^3.0.0"
"@cycle/history": "^6.2.0",
"@cycle/run": "^3.1.0",
"history": "^4.6.1"
},
"devDependencies": {
"@cycle/rxjs-run": "^6.1.0",
"@cycle/rxjs-run": "^7.0.0",
"@types/history": "^4.5.1",
"@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",
"babel-preset-es2015": "^6.24.1",
"babel-register": "^6.24.1",
"babelify": "^7.3.0",
"browserify": "^13.0.1",
"browserify": "^14.4.0",
"cli-release": "^1.0.4",
"ghooks": "^1.2.1",
"mkdirp": "^0.5.1",
"mocha": "^2.5.3",
"rxjs": "^5.2.0",
"testem": "^1.10.4",
"mocha": "^3.4.2",
"rxjs": "^5.4.0",
"switch-path": "^1.2.0",
"testem": "^1.16.1",
"tslint": "^3.10.2",
"typescript": "^2.0.7",
"typings": "^0.8.1",
"uglify-js": "^2.7.1",
"typescript": "^2.3.3",
"uglify-js": "^3.0.12",
"validate-commit-message": "^3.0.1",
"xstream": "^10.3.0",
"switch-path": "^1.1.8"
"xstream": "^10.8.0"
},
"config": {
"ghooks": {
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion rx-typings.d.ts
Original file line number Diff line number Diff line change
@@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion rxjs-typings.d.ts
Original file line number Diff line number Diff line change
@@ -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>;
Expand Down
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export {makeRouterDriver} from './makeRouterDriver';
export {RouterSource} from './RouterSource';
export * from './interfaces';
2 changes: 1 addition & 1 deletion src/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export interface RouteMatcherReturn {

export interface RouteMatcher {
(path: string, routes: RouteDefinitionsMap | RouteDefinitionsArray): RouteMatcherReturn;
}
}
10 changes: 0 additions & 10 deletions typings.json

This file was deleted.

2 changes: 1 addition & 1 deletion xstream-typings.d.ts
Original file line number Diff line number Diff line change
@@ -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>;
Expand Down