File tree Expand file tree Collapse file tree 4 files changed +23
-14
lines changed
Expand file tree Collapse file tree 4 files changed +23
-14
lines changed Original file line number Diff line number Diff line change 2525 "typescript" : " next"
2626 },
2727 "dependencies" : {
28- "react" : " ^ 15.3.2 " ,
29- "router-async" : " 0.0.4 "
28+ "react" : " 15.x.x " ,
29+ "router-async" : " 0.1.x "
3030 }
3131}
Original file line number Diff line number Diff line change @@ -12,10 +12,14 @@ export interface State {
1212
1313export default class Middleware extends React . Component < Props , State > {
1414 static propTypes = {
15- children : React . PropTypes . arrayOf ( React . PropTypes . oneOfType ( [
15+ children : React . PropTypes . oneOfType ( [
1616 jsxInstanceOf ( Route ) ,
17- jsxInstanceOf ( Redirect )
18- ] ) ) . isRequired ,
17+ jsxInstanceOf ( Redirect ) ,
18+ React . PropTypes . arrayOf ( React . PropTypes . oneOfType ( [
19+ jsxInstanceOf ( Route ) ,
20+ jsxInstanceOf ( Redirect )
21+ ] ) )
22+ ] ) . isRequired ,
1923 path : React . PropTypes . string . isRequired ,
2024 action : React . PropTypes . func
2125 } ;
Original file line number Diff line number Diff line change @@ -13,11 +13,16 @@ export interface State {
1313
1414export default class RootRoute extends React . Component < Props , State > {
1515 static propTypes = {
16- children : React . PropTypes . arrayOf ( React . PropTypes . oneOfType ( [
16+ children : React . PropTypes . oneOfType ( [
1717 jsxInstanceOf ( Route ) ,
1818 jsxInstanceOf ( Middleware ) ,
19- jsxInstanceOf ( Redirect )
20- ] ) ) . isRequired
19+ jsxInstanceOf ( Redirect ) ,
20+ React . PropTypes . arrayOf ( React . PropTypes . oneOfType ( [
21+ jsxInstanceOf ( Route ) ,
22+ jsxInstanceOf ( Middleware ) ,
23+ jsxInstanceOf ( Redirect )
24+ ] ) )
25+ ] ) . isRequired
2126 } ;
2227 render ( ) {
2328 return React . Children . only ( this . props . children ) ;
Original file line number Diff line number Diff line change @@ -82,23 +82,23 @@ promise@^7.1.1:
8282 dependencies :
8383 asap "~2.0.3"
8484
85- react@^ 15.3.2 :
85+ react@15.x.x :
8686 version "15.3.2"
8787 resolved "https://registry.yarnpkg.com/react/-/react-15.3.2.tgz#a7bccd2fee8af126b0317e222c28d1d54528d09e"
8888 dependencies :
8989 fbjs "^0.8.4"
9090 loose-envify "^1.1.0"
9191 object-assign "^4.1.0"
9292
93- router-async :
94- version "0.0.4 "
95- resolved "https://registry.yarnpkg.com/router-async/-/router-async-0.0.4. tgz#290575273b9ee4206ed6b587221d3a23d5116ef1 "
93+ router-async@0.1.x :
94+ version "0.1.0 "
95+ resolved "https://registry.yarnpkg.com/router-async/-/router-async-0.1.0. tgz#109227c67ab35745fcb974ac52e0c1a41e66ec58 "
9696 dependencies :
9797 path-to-regexp "^1.6.0"
9898
9999typescript@next :
100- version "2.1.0-dev.20161019 "
101- resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.1.0-dev.20161019 .tgz#45c6a32b1b4a00dd87c8e1e3ee3e00b80f61b5c0 "
100+ version "2.1.0-dev.20161024 "
101+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.1.0-dev.20161024 .tgz#8c9bd571ce990a1bc01444e28b5124658145b83a "
102102
103103ua-parser-js@^0.7.9 :
104104 version "0.7.10"
You can’t perform that action at this time.
0 commit comments