Merge branch 'master' into next

Author: taion

.eslintignore

@@ -1,2 +1,3 @@
+**/coverage/
 **/lib/
 **/node_modules/

README.md

@@ -609,19 +609,18 @@ The created `<BrowserRouter>` accepts an optional `matchContext` prop as describ
 
 ```js
 import { BrowserProtocol, queryMiddleware } from 'farce';
-import { createFarceRouter, createRender, resolver } from 'found';
+import { createFarceRouter, resolver } from 'found';
 
 /* ... */
 
 const FarceRouter = createFarceRouter({
   historyProtocol: new BrowserProtocol(),
+  historyMiddlewares: [queryMiddleware],
   routeConfig,
 
-  render: createRender({
-    renderError: ({ error }) => (
-      <div>{error.status === 404 ? 'Not found' : 'Error'}</div>
-    ),
-  }),
+  renderError: ({ error }) => (
+    <div>{error.status === 404 ? 'Not found' : 'Error'}</div>
+  ),
 });
 
 ReactDOM.render(
@@ -632,8 +631,6 @@ ReactDOM.render(
 
 The options object for `createFarceRouter` should have a `historyProtocol` property that has a history protocol object. For example, to use the HTML History API as with `createBrowserRouter`, you would provide `new BrowserProtocol()`.
 
-The `createFarceRouter` options object does not have a default for the `render` property. It ignores the `renderPending`, `renderReady`, and `renderError` properties.
-
 The created `<FarceRouter>` manages setting up and providing a Redux store with the appropriate configuration internally. It also requires a `resolver` prop with the route element resolver object. For routes configured as above, this should be the `resolver` object in this library.
 
 #### `createConnectedRouter`

package.json

@@ -1,23 +1,23 @@
 {
   "name": "found",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "description": "Extensible route-based routing for React applications",
   "files": [
     "lib",
-    "index.d.ts"
+    "types/index.d.ts"
   ],
   "main": "lib/index.js",
-  "types": "index.d.ts",
+  "types": "types/index.d.ts",
   "scripts": {
     "build": "rimraf lib && babel src -d lib",
     "format": "eslint --fix . && npm run prettier -- --write",
     "lint": "eslint . && npm run prettier -- -l",
     "prepublish": "npm run build",
     "prettier": "prettier --ignore-path .eslintignore '**/*.{js,md,ts,tsx}'",
     "tdd": "jest --watch",
-    "test": "npm run lint && npm run tsc && npm run testonly -- --coverage",
-    "testonly": "jest --runInBand --verbose",
-    "tsc": "tsc -p tsconfig.json"
+    "test": "npm run lint && npm run test:ts && npm run testonly -- --coverage",
+    "test:ts": "dtslint types",
+    "testonly": "jest --runInBand --verbose"
   },
   "husky": {
     "hooks": {
@@ -103,6 +103,7 @@
     "codecov": "^3.1.0",
     "delay": "^4.1.0",
     "doctoc": "^1.4.0",
+    "dtslint": "^0.4.2",
     "enzyme": "^3.8.0",
     "enzyme-adapter-react-16": "^1.7.1",
     "eslint": "^5.10.0",

src/createBaseRouter.js

@@ -6,9 +6,24 @@ import warning from 'warning';
 
 import { routerShape } from './PropTypes';
 import RedirectException from './RedirectException';
+import createRender from './createRender';
 import resolveRenderArgs from './utils/resolveRenderArgs';
 
-export default function createBaseRouter({ render }) {
+export default function createBaseRouter({
+  render,
+  renderPending,
+  renderReady,
+  renderError,
+}) {
+  // eslint-disable-next-line no-param-reassign
+  render =
+    render ||
+    createRender({
+      renderPending,
+      renderReady,
+      renderError,
+    });
+
   const propTypes = {
     match: PropTypes.object.isRequired,
     resolvedMatch: PropTypes.object.isRequired,

src/createBrowserRouter.js

@@ -2,30 +2,16 @@ import BrowserProtocol from 'farce/lib/BrowserProtocol';
 import React from 'react';
 
 import createFarceRouter from './createFarceRouter';
-import createRender from './createRender';
 import resolver from './resolver';
 
-export default function createBrowserRouter({
-  render,
-  renderPending,
-  renderReady,
-  renderError,
-  ...options
-}) {
+export default function createBrowserRouter(options) {
   const FarceRouter = createFarceRouter({
     ...options,
     historyProtocol: new BrowserProtocol(),
-    render:
-      render ||
-      createRender({
-        renderPending,
-        renderReady,
-        renderError,
-      }),
   });
 
   function BrowserRouter(props) {
-    return <FarceRouter {...props} resolver={resolver} />;
+    return <FarceRouter resolver={resolver} {...props} />;
   }
 
   return BrowserRouter;