[typescript] Result of hoc withRouter should not require props provid…

…ed by it (#223)

test/typescript/AppPage.tsx → types/example-app/AppPage.tsx

@@ -22,4 +22,4 @@ function AppPage({ children }: { children: React.ReactNode }) {
   );
 }
 
-export default AppPage;
+export { AppPage };

types/example-app/MainPage.tsx

@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { WithRouterComponent } from './WithRouterComponent';
+
+const MainPage = () => (
+  <div>
+    <WithRouterComponent />
+  </div>
+);
+export { MainPage };

types/example-app/WidgetsPage.tsx

@@ -0,0 +1,4 @@
+import * as React from 'react';
+
+const WidgetsPage = () => <div />;
+export { WidgetsPage };

test/typescript/WithRouterComponent.tsx → types/example-app/WithRouterComponent.tsx

@@ -5,9 +5,9 @@ export interface MyProps {
   foo?: boolean;
 }
 
-export default withRouter(
+const WithRouterComponent = withRouter(
   class MyRoutedComponent extends React.Component<MyProps & WithRouter> {
-    public render() {
+    render() {
       const {
         match: { location },
         router,
@@ -20,3 +20,5 @@ export default withRouter(
     }
   },
 );
+
+export { WithRouterComponent };

test/typescript/test-usage.tsx → types/example-app/index.tsx

@@ -8,9 +8,9 @@ import {
   Redirect,
   Route,
 } from 'found';
-import WidgetsPage from './WidgetsPage';
-import AppPage from './AppPage';
-import MainPage from './MainPage';
+import { WidgetsPage } from './WidgetsPage';
+import { AppPage } from './AppPage';
+import { MainPage } from './MainPage';
 
 const fetchWidget = (widgetId: any) =>
   new Promise(resolve => {
@@ -32,7 +32,7 @@ const BrowserRouter = createBrowserRouter({
         <Route
           path="widgets/:widgetId"
           getComponent={() =>
-            import('./WidgetsPage').then(module => module.default)
+            import('./WidgetsPage').then(module => module.WidgetsPage)
           }
           getData={({ params: { widgetId } }) =>
             fetchWidget(widgetId).catch(() => {

types/index.d.ts

@@ -363,9 +363,9 @@ declare module 'found' {
     router: Router;
   }
 
-  function withRouter<OriginalProps>(
-    Component: React.ComponentType<OriginalProps & WithRouter>,
-  ): React.ComponentType<OriginalProps>;
+  function withRouter<Props extends WithRouter>(
+    Component: React.ComponentType<Props>,
+  ): React.ComponentType<Omit<Props, keyof WithRouter>>;
 
   class RedirectException {
     constructor(location: string | LocationDescriptor);

types/tsconfig.json

@@ -15,5 +15,5 @@
     "typeRoots": ["../"],
     "types": []
   },
-  "include": ["./*.ts", "./*.tsx"]
+  "include": ["./**/*.ts", "./**/*.tsx"]
 }