File tree Expand file tree Collapse file tree 6 files changed +12
-12
lines changed
react-server-integration-tests Expand file tree Collapse file tree 6 files changed +12
-12
lines changed Original file line number Diff line number Diff line change 10
10
"lodash" : " ^4.16.4" ,
11
11
"mkdirp" : " ^0.5.1" ,
12
12
"q" : " 1.4.1" ,
13
- "react" : " ~0.14.2" ,
14
- "react-dom" : " ~0.14.2" ,
13
+ "react" : " ~0.14.2 || ^15.1.0 " ,
14
+ "react-dom" : " ~0.14.2 || ^15.1.0 " ,
15
15
"react-server" : " ^0.4.13" ,
16
16
"react-server-cli" : " ^0.4.13" ,
17
17
"rimraf" : " ^2.5.4" ,
Original file line number Diff line number Diff line change 15
15
"dependencies" : {
16
16
"lodash" : " ^4.16.4" ,
17
17
"q" : " 1.4.1" ,
18
- "react" : " ~0.14.2" ,
19
- "react-dom" : " ~0.14.2" ,
18
+ "react" : " ~0.14.2 || ^15.1.0 " ,
19
+ "react-dom" : " ~0.14.2 || ^15.1.0 " ,
20
20
"react-server" : " ^0.4.13" ,
21
21
"react-server-cli" : " ^0.4.13" ,
22
22
"react-server-data-bundle-cache" : " ^0.4.13" ,
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ export default class IndexPage {
5
5
getElements ( ) {
6
6
return < div >
7
7
< h1 > Entrypoints:</ h1 >
8
- < ul > { _ . map ( entrypoints , ( val , key ) => < li >
8
+ < ul > { _ . map ( entrypoints , ( val , key ) => < li key = { key } >
9
9
< a href = { val . entry } > { val . description || key } </ a >
10
10
</ li > ) } </ ul >
11
11
< h2 > Homepage Aliases:</ h2 >
Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ class FBL extends React.Component {
102
102
render ( ) {
103
103
return < Link path = { LINK ( this . props . row ) } frameback = { true } { ...this . props . link } >
104
104
< span className = { this . state . available ?'available' :'not-available' } > FB</ span > {
105
- this . props . children ?[ '/' , ...this . props . children ] :[ ]
105
+ this . props . children ?[ '/' , ...React . Children . toArray ( this . props . children ) ] :[ ]
106
106
}
107
107
</ Link >
108
108
}
Original file line number Diff line number Diff line change 16
16
"babel-plugin-transform-runtime" : " ^6.15.0" ,
17
17
"babel-runtime" : " ^6.18.0" ,
18
18
"highlight.js" : " ^9.5.0" ,
19
- "react" : " ~0.14.2" ,
20
- "react-dom" : " ~0.14.2" ,
19
+ "react" : " ~0.14.2 || ^15.1.0 " ,
20
+ "react-dom" : " ~0.14.2 || ^15.1.0 " ,
21
21
"react-server" : " ^0.4.13" ,
22
22
"react-server-cli" : " ^0.4.13" ,
23
23
"react-server-data-bundle-cache" : " ^0.4.13" ,
Original file line number Diff line number Diff line change 37
37
"winston" : " 2.2.0"
38
38
},
39
39
"peerDependencies" : {
40
- "react" : " ~0.14.2" ,
41
- "react-dom" : " ~0.14.2" ,
40
+ "react" : " ~0.14.2 || ^15.1.0 " ,
41
+ "react-dom" : " ~0.14.2 || ^15.1.0 " ,
42
42
"superagent" : " 1.8.4"
43
43
},
44
44
"devDependencies" : {
58
58
"gulp-istanbul" : " ^1.1.1" ,
59
59
"gulp-if" : " ^2.0.1" ,
60
60
"gulp-eslint" : " ^3.0.1" ,
61
- "react" : " ~0.14.2" ,
61
+ "react" : " ~0.14.2 || ^15.1.0" ,
62
+ "react-dom" : " ~0.14.2 || ^15.1.0" ,
62
63
"superagent" : " 1.8.4" ,
63
- "react-dom" : " ~0.14.2" ,
64
64
"eslint-plugin-react" : " ^6.4.1" ,
65
65
"babel-eslint" : " ^7.0.0" ,
66
66
"eslint" : " ^3.8.1" ,
You can’t perform that action at this time.
0 commit comments