Skip to content

Commit 17d987d

Browse files
authored
Merge pull request #14 from mekanix/feature/update
Update dependencies
2 parents ec59171 + 9cc967b commit 17d987d

File tree

4 files changed

+1973
-1443
lines changed

4 files changed

+1973
-1443
lines changed

package.json

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "freenit",
3-
"version": "0.0.12",
3+
"version": "0.0.13",
44
"description": "Freenit framework",
55
"author": "Goran Mekić",
66
"license": "BSD-2-Clause",
@@ -33,73 +33,73 @@
3333
"deploy": "gh-pages -d styleguide"
3434
},
3535
"dependencies": {
36-
"@material-ui/core": "^4.9.5",
36+
"@material-ui/core": "^4.9.14",
3737
"@material-ui/icons": "^4.9.1",
3838
"axios": "^0.19.2",
39-
"react-router-dom": "^5.1.2"
39+
"react-router-dom": "^5.2.0"
4040
},
4141
"peerDependencies": {
4242
"react": "^16.12.0",
4343
"react-dom": "^16.12.0"
4444
},
4545
"devDependencies": {
46-
"@babel/core": "^7.8.7",
46+
"@babel/core": "^7.9.6",
4747
"@babel/plugin-proposal-class-properties": "^7.8.3",
48-
"@babel/plugin-proposal-object-rest-spread": "^7.8.3",
49-
"@babel/plugin-proposal-optional-chaining": "^7.8.3",
48+
"@babel/plugin-proposal-object-rest-spread": "^7.9.6",
49+
"@babel/plugin-proposal-optional-chaining": "^7.9.0",
5050
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
51-
"@rollup/plugin-node-resolve": "^7.1.1",
52-
"@rollup/plugin-url": "^4.0.2",
53-
"@svgr/rollup": "^5.2.0",
54-
"@testing-library/dom": "^6.15.0",
55-
"@testing-library/jest-dom": "^5.1.1",
56-
"@testing-library/react": "^9.5.0",
57-
"@testing-library/user-event": "^10.0.0",
51+
"@rollup/plugin-node-resolve": "^7.1.3",
52+
"@rollup/plugin-url": "^5.0.0",
53+
"@svgr/rollup": "^5.4.0",
54+
"@testing-library/dom": "^7.5.2",
55+
"@testing-library/jest-dom": "^5.7.0",
56+
"@testing-library/react": "^10.0.4",
57+
"@testing-library/user-event": "^10.1.2",
5858
"babel-core": "^6.26.3",
5959
"babel-eslint": "^10.1.0",
60-
"babel-jest": "^25.1.0",
61-
"babel-loader": "^8.0.6",
60+
"babel-jest": "^26.0.1",
61+
"babel-loader": "^8.1.0",
6262
"babel-plugin-named-asset-import": "^0.3.6",
6363
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
64-
"babel-preset-react-app": "^9.1.1",
64+
"babel-preset-react-app": "^9.1.2",
6565
"cross-env": "^7.0.2",
66-
"css-loader": "^3.4.2",
66+
"css-loader": "^3.5.3",
6767
"enzyme": "^3.11.0",
6868
"enzyme-adapter-react-16": "^1.15.2",
69-
"eslint": "^6.8.0",
70-
"eslint-config-airbnb": "^18.0.1",
71-
"eslint-plugin-flowtype": "^4.6.0",
72-
"eslint-plugin-import": "^2.20.1",
73-
"eslint-plugin-jest": "^23.8.2",
69+
"eslint": "^7.0.0",
70+
"eslint-config-airbnb": "^18.1.0",
71+
"eslint-plugin-flowtype": "^4.7.0",
72+
"eslint-plugin-import": "^2.20.2",
73+
"eslint-plugin-jest": "^23.10.0",
7474
"eslint-plugin-jsx-a11y": "^6.2.3",
7575
"eslint-plugin-react": "^7.19.0",
76-
"eslint-plugin-react-hooks": "^2.5.0",
76+
"eslint-plugin-react-hooks": "^4.0.0",
7777
"eslint-watch": "^6.0.1",
7878
"gh-pages": "^2.2.0",
7979
"jasmine-expect": "^4.0.3",
80-
"jest": "^25.1.0",
80+
"jest": "^26.0.1",
8181
"jest-environment-jsdom-fourteen": "^1.0.1",
8282
"jest-pnp-resolver": "^1.2.1",
83-
"jest-resolve": "^25.1.0",
84-
"jest-watch-typeahead": "^0.4.2",
85-
"node-sass": "^4.13.1",
83+
"jest-resolve": "^26.0.1",
84+
"jest-watch-typeahead": "^0.6.0",
85+
"node-sass": "^4.14.1",
8686
"npm-run-all": "^4.1.5",
8787
"prop-types": "^15.7.2",
88-
"react": "^16.13.0",
88+
"react": "^16.13.1",
8989
"react-app-polyfill": "^1.0.6",
90-
"react-dom": "^16.13.0",
91-
"react-styleguidist": "^11.0.0",
92-
"react-test-renderer": "^16.13.0",
93-
"rollup": "^2.0.3",
90+
"react-dom": "^16.13.1",
91+
"react-styleguidist": "^11.0.6",
92+
"react-test-renderer": "^16.13.1",
93+
"rollup": "^2.9.1",
9494
"rollup-plugin-babel": "^4.4.0",
9595
"rollup-plugin-commonjs": "^10.1.0",
9696
"rollup-plugin-peer-deps-external": "^2.2.2",
97-
"rollup-plugin-postcss": "^2.4.1",
97+
"rollup-plugin-postcss": "^3.1.1",
9898
"rollup-plugin-terser": "^5.3.0",
9999
"sass-loader": "^8.0.2",
100-
"style-loader": "^1.1.3",
100+
"style-loader": "^1.2.1",
101101
"typescript": "^3.8.3",
102-
"webpack": "^4.42.0"
102+
"webpack": "^4.43.0"
103103
},
104104
"files": [
105105
"dist"

src/lib/components/protected/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react'
22
import PropTypes from 'prop-types'
3-
43
import { withStore } from '../../store'
54

5+
66
class ProtectedComponent extends React.Component {
77
constructor(props) {
88
super(props)
@@ -26,6 +26,7 @@ class ProtectedComponent extends React.Component {
2626
}
2727
}
2828

29+
2930
ProtectedComponent.propTypes = {
3031
history: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired,
3132
secure: PropTypes.bool,
@@ -45,8 +46,10 @@ ProtectedComponent.propTypes = {
4546
}).isRequired,
4647
}
4748

49+
4850
ProtectedComponent.defaultProps = {
4951
secure: false,
5052
}
5153

54+
5255
export default withStore(ProtectedComponent)

src/lib/templates/empty/detail.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const EmptyTemplate = props => {
1515

1616
return (
1717
<div style={props.style}>
18-
<Protected secure={props.secure} />
18+
<this.props.protected secure={props.secure} />
1919
{props.children}
2020
<Snackbar
2121
autoHideDuration={5000}
@@ -39,6 +39,7 @@ const EmptyTemplate = props => {
3939

4040
EmptyTemplate.propTypes = {
4141
children: PropTypes.node,
42+
protected: PropTypes.shape({}),
4243
secure: PropTypes.bool,
4344
store: PropTypes.shape({
4445
notification: PropTypes.shape({
@@ -54,6 +55,7 @@ EmptyTemplate.propTypes = {
5455

5556
EmptyTemplate.defaultProps = {
5657
children: null,
58+
protected: Protected,
5759
secure: false,
5860
style: {
5961
padding: 20,

0 commit comments

Comments
 (0)