Skip to content

Commit bbfbcec

Browse files
committed
Fixing dependencies
1 parent 1c5d535 commit bbfbcec

File tree

10 files changed

+77
-50
lines changed

10 files changed

+77
-50
lines changed

.DS_Store

6 KB
Binary file not shown.

book/about-the-book.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ To watch them running on your local machine:
3737
|-- __tests__ # example tests
3838
|-- book # all the chapters of the book
3939
|-- cypress/integration # all the Cypress tests
40-
|-- demo-app # the React application used for the integration/unit tests part
4140
|-- docs # auto-generated directory, GitHub pages points here
4241
|-- realworld # both the frontend/backend RealWorld apps
4342
|-- slides # the GitPitch files (if used)

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"cy-run-record": "node utils/cy-run-record.js",
1919
"// REALWORLD ///////////": "",
2020
"realworld:install": "npm run realworld:frontend:install && npm run realworld:backend:install",
21-
"realworld:frontend:install": "cd realworld/frontend && npm i",
22-
"realworld:backend:install": "cd realworld/backend && npm i",
21+
"realworld:frontend:install": "cd realworld/frontend && npm ci",
22+
"realworld:backend:install": "cd realworld/backend && npm ci",
2323
"realworld:start": "node utils/start-mongod.js & npm run realworld:db:start && concurrently --kill-others \"npm run realworld:backend:start\" \"npm run realworld:frontend:start\"",
2424
"realworld:frontend:start": "cd realworld/frontend && npm start",
2525
"realworld:backend:start": "cd realworld/backend && npm start",

realworld/frontend/package-lock.json

Lines changed: 59 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

realworld/frontend/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"private": true,
55
"devDependencies": {
66
"cross-env": "7.0.2",
7-
"react-scripts": "3.4.4"
7+
"react-scripts": "3.4.4",
8+
"nan": "2.14.2"
89
},
910
"dependencies": {
1011
"history": "5.0.0",
@@ -13,8 +14,8 @@
1314
"react": "17.0.1",
1415
"react-dom": "17.0.1",
1516
"react-redux": "5.1.1",
16-
"react-router": "5.2.0",
17-
"react-router-dom": "5.2.0",
17+
"react-router": "4.3.1",
18+
"react-router-dom": "4.3.1",
1819
"react-router-redux": "5.0.0-alpha.9",
1920
"redux": "4.0.5",
2021
"redux-devtools-extension": "2.13.8",

realworld/frontend/src/components/Home/MainView.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const YourFeedTab = props => {
1313

1414
return (
1515
<li className="nav-item">
16+
{/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
1617
<a href=""
1718
className={ props.tab === 'feed' ? 'nav-link active' : 'nav-link' }
1819
onClick={clickHandler}>
@@ -31,8 +32,8 @@ const GlobalFeedTab = props => {
3132
};
3233
return (
3334
<li className="nav-item">
34-
<a
35-
href=""
35+
{/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
36+
<a href=""
3637
className={ props.tab === 'all' ? 'nav-link active' : 'nav-link' }
3738
onClick={clickHandler}>
3839
Global Feed
@@ -48,6 +49,7 @@ const TagFilterTab = props => {
4849

4950
return (
5051
<li className="nav-item">
52+
{/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
5153
<a href="" className="nav-link active">
5254
<i className="ion-pound"></i> {props.tag}
5355
</a>

realworld/frontend/src/components/Home/Tags.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ const Tags = props => {
1414
};
1515

1616
return (
17-
<a
18-
href=""
17+
// eslint-disable-next-line jsx-a11y/anchor-is-valid
18+
<a href=""
1919
className="tag-default tag-pill"
2020
key={tag}
2121
onClick={handleClick}>

realworld/frontend/src/components/ListPagination.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ const ListPagination = props => {
4343
onClick={onClick}
4444
key={v.toString()}>
4545

46+
{/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
4647
<a className="page-link" href="">{v + 1}</a>
4748

4849
</li>

realworld/frontend/src/store.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { promiseMiddleware, localStorageMiddleware } from './middleware';
55
import reducer from './reducer';
66

77
import { routerMiddleware } from 'react-router-redux'
8-
import createHistory from 'history/createBrowserHistory';
8+
import { createBrowserHistory } from 'history';
99

10-
export const history = createHistory();
10+
export const history = createBrowserHistory();
1111

1212
// Build the middleware for intercepting and dispatching navigation actions
1313
const myRouterMiddleware = routerMiddleware(history);

renovate.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@
55
{
66
"paths": [
77
"realworld/frontend/package.json",
8-
"realworld/backend/package.json",
9-
"demo-app/package.json"
8+
"realworld/backend/package.json"
109
],
1110
"extends": ["config:base"],
1211
"automerge": true,
1312
"excludePackageNames": [
14-
"react-router",
15-
"react-router-dom",
16-
"react-router-redux",
1713
"react-redux"
18-
]
14+
],
15+
"excludePackagePatterns": ["^react-router"]
1916
}
2017
]
2118
}

0 commit comments

Comments
 (0)