Skip to content

Commit 468338c

Browse files
committed
Upgrade to React 16
1 parent 51b40de commit 468338c

3 files changed

Lines changed: 35 additions & 16 deletions

File tree

node_package/tests/ReactOnRails.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ test('ReactOnRails render returns a virtual DOM element for component', (assert)
2121
ReactOnRails.register({ R1 });
2222

2323
// eslint-disable-next-line no-underscore-dangle
24-
const actual = ReactOnRails.render('R1', {}, 'root')._reactInternalInstance._currentElement.type;
24+
const actual = ReactOnRails.render('R1', {}, 'root')._reactInternalFiber.type;
2525
assert.deepEqual(actual, R1,
2626
'ReactOnRails render should return a virtual DOM element for component');
2727
});

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"flow-bin": "^0.51.1",
3131
"jsdom": "^11.1.0",
3232
"prop-types": "^15.5.10",
33-
"react": "^15.6.1",
34-
"react-dom": "^15.6.1",
33+
"react": "^16.2.0",
34+
"react-dom": "^16.2.0",
3535
"react-transform-hmr": "^1.0.4",
3636
"redux": "^3.7.2",
3737
"release-it": "^2.8.2",

yarn.lock

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1783,6 +1783,18 @@ fast-levenshtein@~2.0.4:
17831783
version "2.0.6"
17841784
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
17851785

1786+
fbjs@^0.8.16:
1787+
version "0.8.16"
1788+
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
1789+
dependencies:
1790+
core-js "^1.0.0"
1791+
isomorphic-fetch "^2.1.1"
1792+
loose-envify "^1.0.0"
1793+
object-assign "^4.1.0"
1794+
promise "^7.1.1"
1795+
setimmediate "^1.0.5"
1796+
ua-parser-js "^0.7.9"
1797+
17861798
fbjs@^0.8.9:
17871799
version "0.8.15"
17881800
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.15.tgz#4f0695fdfcc16c37c0b07facec8cb4c4091685b9"
@@ -3160,6 +3172,14 @@ prop-types@^15.5.10:
31603172
fbjs "^0.8.9"
31613173
loose-envify "^1.3.1"
31623174

3175+
prop-types@^15.6.0:
3176+
version "15.6.0"
3177+
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
3178+
dependencies:
3179+
fbjs "^0.8.16"
3180+
loose-envify "^1.3.1"
3181+
object-assign "^4.1.1"
3182+
31633183
prr@~0.0.0:
31643184
version "0.0.0"
31653185
resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
@@ -3228,14 +3248,14 @@ react-deep-force-update@^1.0.0:
32283248
version "1.1.1"
32293249
resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.1.1.tgz#bcd31478027b64b3339f108921ab520b4313dc2c"
32303250

3231-
react-dom@^15.6.1:
3232-
version "15.6.1"
3233-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.1.tgz#2cb0ed4191038e53c209eb3a79a23e2a4cf99470"
3251+
react-dom@^16.2.0:
3252+
version "16.2.0"
3253+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
32343254
dependencies:
3235-
fbjs "^0.8.9"
3255+
fbjs "^0.8.16"
32363256
loose-envify "^1.1.0"
3237-
object-assign "^4.1.0"
3238-
prop-types "^15.5.10"
3257+
object-assign "^4.1.1"
3258+
prop-types "^15.6.0"
32393259

32403260
react-proxy@^1.1.7:
32413261
version "1.1.8"
@@ -3251,15 +3271,14 @@ react-transform-hmr@^1.0.4:
32513271
global "^4.3.0"
32523272
react-proxy "^1.1.7"
32533273

3254-
react@^15.6.1:
3255-
version "15.6.1"
3256-
resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df"
3274+
react@^16.2.0:
3275+
version "16.2.0"
3276+
resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
32573277
dependencies:
3258-
create-react-class "^15.6.0"
3259-
fbjs "^0.8.9"
3278+
fbjs "^0.8.16"
32603279
loose-envify "^1.1.0"
3261-
object-assign "^4.1.0"
3262-
prop-types "^15.5.10"
3280+
object-assign "^4.1.1"
3281+
prop-types "^15.6.0"
32633282

32643283
read-pkg-up@^2.0.0:
32653284
version "2.0.0"

0 commit comments

Comments
 (0)