From f49ca4f7ab7ee036e3aa1deab3558758c70326f0 Mon Sep 17 00:00:00 2001
From: Karol Janyst <lapkom@gmail.com>
Date: Thu, 19 Jan 2017 11:13:06 +0900
Subject: [PATCH] Update react-router-bootstrap definitions

---
 react-router-bootstrap/index.d.ts             | 44 ++-----------------
 .../lib/IndexLinkContainer.d.ts               |  7 +++
 react-router-bootstrap/lib/LinkContainer.d.ts |  7 +++
 react-router-bootstrap/tsconfig.json          |  3 --
 4 files changed, 18 insertions(+), 43 deletions(-)
 create mode 100644 react-router-bootstrap/lib/IndexLinkContainer.d.ts
 create mode 100644 react-router-bootstrap/lib/LinkContainer.d.ts

diff --git a/react-router-bootstrap/index.d.ts b/react-router-bootstrap/index.d.ts
index b4b36006ec..c414d8f3b0 100644
--- a/react-router-bootstrap/index.d.ts
+++ b/react-router-bootstrap/index.d.ts
@@ -1,43 +1,7 @@
-// Type definitions for react-router-bootstrap
+// Type definitions for react-router-bootstrap 0.23
 // Project: https://github.com/react-bootstrap/react-router-bootstrap
-// Definitions by: Vincent Lesierse <https://github.com/vlesierse>
+// Definitions by: Vincent Lesierse <https://github.com/vlesierse>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="react"/>
-/// <reference types="react-router"/>
-
-declare namespace ReactRouterBootstrap {
-    interface LinkContainerProps extends ReactRouter.LinkProps {
-        disabled?: boolean
-    }
-    interface LinkContainer extends React.ComponentClass<LinkContainerProps> {}
-    interface LinkContainerElement extends React.ReactElement<LinkContainerProps> {}
-    const LinkContainer: LinkContainer
-
-    const IndexLinkContainer: LinkContainer
-}
-
-declare module "react-router-bootstrap/lib/LinkContainer" {
-
-    export default ReactRouterBootstrap.LinkContainer
-
-}
-
-declare module "react-router-bootstrap/lib/IndexLinkContainer" {
-
-    export default ReactRouterBootstrap.IndexLinkContainer
-
-}
-
-declare module "react-router-bootstrap" {
-
-    import LinkContainer from "react-router-bootstrap/lib/LinkContainer"
-    
-    import IndexLinkContainer from "react-router-bootstrap/lib/IndexLinkContainer"
-
-    export {
-        LinkContainer,
-        IndexLinkContainer
-    }
-
-}
+export { default as LinkContainer } from "react-router-bootstrap/lib/LinkContainer"
+export { default as IndexLinkContainer } from "react-router-bootstrap/lib/IndexLinkContainer"
diff --git a/react-router-bootstrap/lib/IndexLinkContainer.d.ts b/react-router-bootstrap/lib/IndexLinkContainer.d.ts
new file mode 100644
index 0000000000..045edc1fde
--- /dev/null
+++ b/react-router-bootstrap/lib/IndexLinkContainer.d.ts
@@ -0,0 +1,7 @@
+import { ComponentClass } from "react";
+import { IndexLinkProps } from "react-router/lib/IndexLink";
+
+type IndexLinkContainer = ComponentClass<IndexLinkProps>;
+declare const IndexLinkContainer: IndexLinkContainer;
+
+export default IndexLinkContainer;
diff --git a/react-router-bootstrap/lib/LinkContainer.d.ts b/react-router-bootstrap/lib/LinkContainer.d.ts
new file mode 100644
index 0000000000..df5ac3cbdb
--- /dev/null
+++ b/react-router-bootstrap/lib/LinkContainer.d.ts
@@ -0,0 +1,7 @@
+import { ComponentClass } from "react";
+import { LinkProps } from "react-router/lib/Link";
+
+type LinkContainer = ComponentClass<LinkProps>;
+declare const LinkContainer: LinkContainer;
+
+export default LinkContainer;
diff --git a/react-router-bootstrap/tsconfig.json b/react-router-bootstrap/tsconfig.json
index 7e111b1004..ecee2cb765 100644
--- a/react-router-bootstrap/tsconfig.json
+++ b/react-router-bootstrap/tsconfig.json
@@ -10,9 +10,6 @@
         "strictNullChecks": false,
         "jsx": "preserve",
         "baseUrl": "../",
-        "paths": {
-            "history": ["history/v2"]
-        },
         "typeRoots": [
             "../"
         ],