Skip to content

Commit

Permalink
Update dependencies and use Prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
taion committed Dec 26, 2017
1 parent 53793e8 commit 5142398
Show file tree
Hide file tree
Showing 57 changed files with 39,444 additions and 12,738 deletions.
4 changes: 2 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
["latest", {
"es2015": { "loose": true }
["env", {
"loose": true
}],
"stage-1",
"react"
Expand Down
16 changes: 6 additions & 10 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
{
"extends": "4catalyzer-react",
"extends": [
"4catalyzer-react",
"prettier"
],
"plugins": [
"babel"
"prettier"
],
"globals": {
"__DEV__": false
},
"rules": {
// FIXME: Temporary workaround pending fixing this upstream.
"generator-star-spacing": ["error", {
"before": false,
"after": true,
"method": "both"
}],
"semi": "off", // Use babel/semi instead for for-await support.
"babel/semi": ["error", "always"]
"prettier/prettier": "error"
}
}
23 changes: 16 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ Found uses [Redux](http://redux.js.org/) for state management and [Farce](https:
## Usage

```js
import { createBrowserRouter, HttpError, makeRouteConfig, Redirect, Route }
from 'found';
import {
createBrowserRouter,
HttpError,
makeRouteConfig,
Redirect,
Route,
} from 'found';

/* ... */

Expand Down Expand Up @@ -53,7 +58,7 @@ const BrowserRouter = createBrowserRouter({
from="widget/:widgetId"
to="/widgets/:widgetId"
/>
</Route>
</Route>,
),

renderError: ({ error }) => (
Expand Down Expand Up @@ -172,7 +177,7 @@ const jsxRouteConfig = makeRouteConfig(
<Route path="foo" Component={FooPage}>
<Route path="bar" Component={BarPage} />
</Route>
</Route>
</Route>,
);
```

Expand Down Expand Up @@ -247,7 +252,7 @@ const routes = makeRouteConfig(
<Route Component={WidgetsPage} />
<Route path=":widgetId" Component={WidgetPage} />
</Route>
</Route>
</Route>,
);
```

Expand Down Expand Up @@ -971,8 +976,12 @@ import { routerShape } from 'found/lib/PropTypes';
import Route from 'found/lib/Route';

// Instead of:
// import { createBrowserRouter, makeRouteConfig, Route, routerShape }
// from 'found';
// import {
// createBrowserRouter,
// makeRouteConfig,
// Route,
// routerShape,
// } from 'found';
```
[build-badge]: https://img.shields.io/travis/4Catalyzer/found/master.svg
Expand Down

0 comments on commit 5142398

Please sign in to comment.