Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3a30d23

Browse files
Merge pull request #840 from BookOfGreg/prepare-for-2.4.2
Prepare for 2.4.2
2 parents cac3e15 + 47c65b1 commit 3a30d23

File tree

7 files changed

+17759
-21068
lines changed

7 files changed

+17759
-21068
lines changed

‎VERSIONS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
99

1010
| Gem | React.js |
1111
|----------|----------|
12-
| master | 16.0.0 |
12+
| master | 16.1.1 |
13+
| 2.4.2 | 16.1.1 |
1314
| 2.4.1 | 16.0.0 |
1415
| 2.4.0 | 16.0.0 |
1516
| 2.3.1 | 15.6.2 | Updated Addons

‎lib/assets/react-source/development/react-server.js

Lines changed: 2408 additions & 3435 deletions
Large diffs are not rendered by default.

‎lib/assets/react-source/development/react.js

Lines changed: 15304 additions & 17571 deletions
Large diffs are not rendered by default.

‎lib/assets/react-source/production/react-server.js

Lines changed: 18 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/assets/react-source/production/react.js

Lines changed: 20 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/react/rails/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ module React
22
module Rails
33
# If you change this, make sure to update VERSIONS.md
44
# and republish the UJS by updating package.json and `bundle exec rake ujs:publish`
5-
VERSION = '2.4.1'
5+
VERSION = '2.4.2'
66
end
77
end

‎react-builds/yarn.lock

Lines changed: 6 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,7 @@ core-util-is@~1.0.0:
282282
version "1.0.2"
283283
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
284284

285-
<<<<<<< HEAD
286285
create-react-class@^15.6.2:
287-
=======
288-
create-react-class@^15.6.0, create-react-class@^15.6.2:
289-
>>>>>>> master
290286
version "15.6.2"
291287
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
292288
dependencies:
@@ -409,11 +405,7 @@ extsprintf@1.0.2:
409405
version "1.0.2"
410406
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
411407

412-
<<<<<<< HEAD
413408
fbjs@^0.8.16, fbjs@^0.8.9:
414-
=======
415-
fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
416-
>>>>>>> master
417409
version "0.8.16"
418410
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
419411
dependencies:
@@ -589,8 +581,8 @@ ieee754@^1.1.4:
589581
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
590582

591583
immutability-helper@^2.4.0:
592-
version "2.4.0"
593-
resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.4.0.tgz#00d421e2957c17f0f0781475f05ffd837e73458d"
584+
version "2.5.0"
585+
resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-2.5.0.tgz#01ea7204334997c645bdfa7eb22e8b84c970946e"
594586
dependencies:
595587
invariant "^2.2.0"
596588

@@ -1024,11 +1016,7 @@ promise@^7.1.1:
10241016
dependencies:
10251017
asap "~2.0.3"
10261018

1027-
<<<<<<< HEAD
10281019
prop-types@^15.6.0:
1029-
=======
1030-
prop-types@^15.5.10, prop-types@^15.6.0:
1031-
>>>>>>> master
10321020
version "15.6.0"
10331021
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
10341022
dependencies:
@@ -1076,44 +1064,9 @@ rc@^1.1.7:
10761064
minimist "^1.2.0"
10771065
strip-json-comments "~2.0.1"
10781066

1079-
<<<<<<< HEAD
10801067
react-dom@^16.0.0:
1081-
version "16.0.0"
1082-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58"
1083-
=======
1084-
react-addons-create-fragment@^15.3.0:
1085-
version "15.6.2"
1086-
resolved "https://registry.yarnpkg.com/react-addons-create-fragment/-/react-addons-create-fragment-15.6.2.tgz#a394de7c2c7becd6b5475ba1b97ac472ce7c74f8"
1087-
dependencies:
1088-
fbjs "^0.8.4"
1089-
loose-envify "^1.3.1"
1090-
object-assign "^4.1.0"
1091-
1092-
react-addons-linked-state-mixin@^15.3.0:
1093-
version "15.6.2"
1094-
resolved "https://registry.yarnpkg.com/react-addons-linked-state-mixin/-/react-addons-linked-state-mixin-15.6.2.tgz#0d47b71370b715b376dee02e468fc74188a24608"
1095-
dependencies:
1096-
fbjs "^0.8.4"
1097-
object-assign "^4.1.0"
1098-
1099-
react-addons-perf@^15.3.0:
1100-
version "15.4.2"
1101-
resolved "https://registry.yarnpkg.com/react-addons-perf/-/react-addons-perf-15.4.2.tgz#110bdcf5c459c4f77cb85ed634bcd3397536383b"
1102-
dependencies:
1103-
fbjs "^0.8.4"
1104-
object-assign "^4.1.0"
1105-
1106-
react-addons-pure-render-mixin@^15.3.0:
1107-
version "15.6.2"
1108-
resolved "https://registry.yarnpkg.com/react-addons-pure-render-mixin/-/react-addons-pure-render-mixin-15.6.2.tgz#6b83f40b6b36ee40735cbd6125eb3f13ce1cddc9"
1109-
dependencies:
1110-
fbjs "^0.8.4"
1111-
object-assign "^4.1.0"
1112-
1113-
react-dom@^15.3.0:
1114-
version "15.6.2"
1115-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
1116-
>>>>>>> master
1068+
version "16.1.1"
1069+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.1.tgz#b2e331b6d752faf1a2d31399969399a41d8d45f8"
11171070
dependencies:
11181071
fbjs "^0.8.16"
11191072
loose-envify "^1.1.0"
@@ -1129,8 +1082,8 @@ react-transition-group@1.1.1:
11291082
warning "^3.0.0"
11301083

11311084
react@^16.0.0:
1132-
version "16.0.0"
1133-
resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d"
1085+
version "16.1.1"
1086+
resolved "https://registry.yarnpkg.com/react/-/react-16.1.1.tgz#d5c4ef795507e3012282dd51261ff9c0e824fe1f"
11341087
dependencies:
11351088
fbjs "^0.8.16"
11361089
loose-envify "^1.1.0"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /