fix ts type cherry-picking (#226)

package.json

@@ -3,13 +3,12 @@
   "version": "0.3.17",
   "description": "Extensible route-based routing for React applications",
   "files": [
-    "lib",
-    "types/index.d.ts"
+    "lib"
   ],
   "main": "lib/index.js",
-  "types": "types/index.d.ts",
+  "types": "lib/index.d.ts",
   "scripts": {
-    "build": "rimraf lib && babel src -d lib",
+    "build": "rimraf lib && babel src -d lib && cpy types/*.d.ts lib",
     "format": "eslint --fix . && npm run prettier -- --write",
     "lint": "eslint . && npm run prettier -- -l",
     "prepublish": "npm run build",
@@ -101,6 +100,7 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-1": "^6.24.1",
     "codecov": "^3.1.0",
+    "cpy-cli": "^2.0.0",
     "delay": "^4.1.0",
     "doctoc": "^1.4.0",
     "dtslint": "^0.4.2",

types/HttpError.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/HttpError' {
+  import { HttpError } from 'found';
+
+  export default HttpError;
+}

types/Link.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/Link' {
+  import { Link } from 'found';
+
+  export default Link;
+}

types/Redirect.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/Redirect' {
+  import { Redirect } from 'found';
+
+  export default Redirect;
+}

types/RedirectException.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/RedirectException' {
+  import { RedirectException } from 'found';
+
+  export default RedirectException;
+}

types/Route.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/Route' {
+  import { Route } from 'found';
+
+  export default Route;
+}

types/createBrowserRouter.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/createBrowserRouter' {
+  import { createBrowserRouter } from 'found';
+
+  export default createBrowserRouter;
+}

types/createConnectedRouter.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/createConnectedRouter' {
+  import { createConnectedRouter } from 'found';
+
+  export default createConnectedRouter;
+}

types/createFarceRouter.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/createFarceRouter' {
+  import { createFarceRouter } from 'found';
+
+  export default createFarceRouter;
+}

types/createMatchEnhancer.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/createMatchEnhancer' {
+  import { createMatchEnhancer } from 'found';
+
+  export default createMatchEnhancer;
+}

types/createRender.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/createRender' {
+  import { createRender } from 'found';
+
+  export default createRender;
+}

types/foundReducer.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/foundReducer' {
+  import { foundReducer } from 'found';
+
+  export default foundReducer;
+}

types/index.d.ts

@@ -416,8 +416,12 @@ declare module 'found' {
     render?: (args: RouterRenderArgs) => React.ReactNode;
   }
 
+  interface CreateConnectedRouterArgs extends BaseCreateRouterArgs {
+    getFound?: (store: any) => FoundState;
+  }
+
   interface FarceCreateRouterArgs extends BaseCreateRouterArgs {
-    store?: Store<FoundState>;
+    store?: Store;
     historyProtocol: any;
     historyMiddlewares?: any[];
     historyOptions?: any;
@@ -440,7 +444,10 @@ declare module 'found' {
     matchContext?: any;
   }>;
 
-  function createConnectedRouter({ store, ...options }: any): ConnectedRouter;
+  function createConnectedRouter({
+    getFound,
+    ...opts
+  }: CreateConnectedRouterArgs): ConnectedRouter;
 
   function createFarceRouter({
     store,
@@ -449,39 +456,9 @@ declare module 'found' {
     historyOptions,
     routeConfig,
     ...options
-  }: any): ConnectedRouter;
+  }: FarceCreateRouterArgs): ConnectedRouter;
 
   function createBrowserRouter(
     options: CreateBrowserRouterArgs,
   ): BrowserRouter;
 }
-
-declare module 'found/lib/Route' {
-  import { Route } from 'found';
-
-  export default Route;
-}
-
-declare module 'found/lib/createRender' {
-  import { createRender } from 'found';
-
-  export default createRender;
-}
-
-declare module 'found/lib/makeRouteConfig' {
-  import { makeRouteConfig } from 'found';
-
-  export default makeRouteConfig;
-}
-
-declare module 'found/lib/RedirectException' {
-  import { RedirectException } from 'found';
-
-  export default RedirectException;
-}
-
-declare module 'found/lib/HttpError' {
-  import { HttpError } from 'found';
-
-  export default HttpError;
-}

types/makeRouteConfig.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/makeRouteConfig' {
+  import { makeRouteConfig } from 'found';
+
+  export default makeRouteConfig;
+}

types/resolver.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/resolver' {
+  import { resolver } from 'found';
+
+  export default resolver;
+}

types/tslint.json

@@ -15,7 +15,7 @@
       "check-type-operator",
       "check-preblock"
     ],
-
+    "no-single-declare-module": false,
     "no-unnecessary-generics": false,
     "no-unnecessary-class": false
   }

types/withRouter.d.ts

@@ -0,0 +1,5 @@
+declare module 'found/lib/withRouter' {
+  import { withRouter } from 'found';
+
+  export default withRouter;
+}