Skip to content

Commit

Permalink
Merge pull request #65 from PeculiarVentures/app-dependencies-patch
Browse files Browse the repository at this point in the history
App dependencies patch
  • Loading branch information
WorldThirteen committed Aug 9, 2020
2 parents b06c9ae + 7f503ed commit 374af8c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
11 changes: 6 additions & 5 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,20 @@
"gh-pages": "^1.0.0",
"history": "^4.7.2",
"js-beautify": "^1.7.5",
"lib-pintl": "^0.0.2",
"lib-pwa-engine": "^0.0.9",
"lib-react-components": "0.1.0",
"loader-utils": "^1.1.0",
"marked": "^0.4.0",
"lib-pintl": "^0.0.2",
"marked": "^1.1.1",
"micro-fps": "^0.1.2",
"platform": "^1.3.4",
"prismjs": "^1.20.0",
"prop-types": "^15.6.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-loadable": "^5.4.0",
"react-router": "^4.2.0",
"react-router-dom": "^4.2.2",
"micro-fps": "^0.1.2",
"react-router-hash-link": "^1.2.0"
},
"devDependencies": {
Expand Down Expand Up @@ -80,10 +81,10 @@
"eslint-config-airbnb": "^16.1.0",
"eslint-plugin-import": "^2.13.0",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-react": "^7.10.0",
"eslint-plugin-react": "7.20.3",
"express": "^4.16.2",
"extract-text-webpack-plugin": "^3.0.2",
"favicons-webpack-plugin": "git+https://github.com/donskov/favicons-webpack-plugin.git",
"favicons-webpack-plugin": "^2.1.0",
"generate-json-webpack-plugin": "^0.2.2",
"html-webpack-plugin": "^2.30.1",
"jsdom": "^11.6.2",
Expand Down
10 changes: 5 additions & 5 deletions app/src/components/docs/usage_part/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ const UsagePart = (props, { intl, theme }) => {
{
inner && usedData.params ? (
<span className={s.title_text}>
({
usedData.params
.map(param => `${param.name}${param.optional ? '?' : ''}${param.rest ? ', ...' : ''}`)
.join(', ')
})
({
usedData.params
.map(param => `${param.name}${param.optional ? '?' : ''}${param.rest ? ', ...' : ''}`)
.join(', ')
})
</span>
) : null
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/containers/example/example_container.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default class ExampleContainer extends Component {
static propTypes = {
example: PropTypes.shape({
op: PropTypes.func,
params: PropTypes.object,
params: PropTypes.object, // eslint-disable-line
tick: PropTypes.func,
init: PropTypes.func,
}),
Expand Down
4 changes: 3 additions & 1 deletion app/src/containers/example/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import s from './styles/index.sass';

export default class Container extends Component {
static propTypes = {
match: PropTypes.shape({ params: PropTypes.object }),
match: PropTypes.shape({
params: PropTypes.object, // eslint-disable-line
}),
}

static defaultProps = {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"eslint-config-airbnb": "^16.1.0",
"eslint-plugin-import": "^2.12.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.8.2",
"eslint-plugin-react": "7.20.3",
"karma": "2.0.2",
"karma-chrome-launcher": "^2.2.0",
"karma-detect-browsers": "^2.3.2",
Expand Down

0 comments on commit 374af8c

Please sign in to comment.