Skip to content

Commit 1141ec0

Browse files
committed
make react v15.6 compatible
1 parent 9bf8392 commit 1141ec0

File tree

5 files changed

+66
-17
lines changed

5 files changed

+66
-17
lines changed

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,19 @@
4747
"lodash.camelcase": "^4.3.0",
4848
"mkdirp": "^0.5.1",
4949
"mocha": "^3.2.0",
50-
"react": "15.4.2",
51-
"react-dom": "^15.4.2",
50+
"react": "^15.6.1",
51+
"react-dom": "^15.6.1",
5252
"rimraf": "^2.5.4",
5353
"webpack": "v2.1.0-beta.25"
5454
},
5555
"peerDependencies": {
56-
"react": "^15.0.0",
57-
"react-dom": "^15.0.0"
56+
"react": "^15.0.0-0 || ^16.0.0-0",
57+
"react-dom": "^15.0.0-0 || ^16.0.0-0"
5858
},
5959
"dependencies": {
6060
"capitalize": "^1.0.0",
6161
"emit-lite": "^2.0.0",
62-
"fbjs": "^0.8.0"
62+
"fbjs": "^0.8.0",
63+
"prop-types": "^15.5.7"
6364
}
6465
}

src/LayoutPropTypes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212
'use strict';
1313

14-
var ReactPropTypes = require('React').PropTypes;
14+
var ReactPropTypes = require('prop-types');
1515

1616
/**
1717
* React Native's layout system is based on Flexbox and is powered both

src/TransformPropTypes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212
'use strict';
1313

14-
var ReactPropTypes = require('React').PropTypes;
14+
var ReactPropTypes = require('prop-types');
1515

1616
var TransformPropTypes = {
1717
transform: ReactPropTypes.arrayOf(

src/ViewStylePropTypes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
'use strict';
1313

1414
var LayoutPropTypes = require('LayoutPropTypes');
15-
var ReactPropTypes = require('React').PropTypes;
15+
var ReactPropTypes = require('prop-types');
1616
var ColorPropType = require('ColorPropType');
1717
var TransformPropTypes = require('TransformPropTypes');
1818

yarn.lock

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,6 +1281,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2:
12811281
create-hash "^1.1.0"
12821282
inherits "^2.0.1"
12831283

1284+
create-react-class@^15.6.0:
1285+
version "15.6.0"
1286+
resolved "http://registry.npm.taobao.org/create-react-class/download/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4"
1287+
dependencies:
1288+
fbjs "^0.8.9"
1289+
loose-envify "^1.3.1"
1290+
object-assign "^4.1.1"
1291+
12841292
cross-env@^3.1.4:
12851293
version "3.1.4"
12861294
resolved "http://registry.npm.taobao.org/cross-env/download/cross-env-3.1.4.tgz#56e8bca96f17908a6eb1bc2012ca126f92842130"
@@ -1577,7 +1585,7 @@ extsprintf@1.0.2:
15771585
version "1.0.2"
15781586
resolved "http://registry.npm.taobao.org/extsprintf/download/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
15791587

1580-
fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.4:
1588+
fbjs@^0.8.0:
15811589
version "0.8.5"
15821590
resolved "http://registry.npm.taobao.org/fbjs/download/fbjs-0.8.5.tgz#f69ba8a876096cb1b9bffe4d7c1e71c19d39d008"
15831591
dependencies:
@@ -1589,6 +1597,18 @@ fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.4:
15891597
promise "^7.1.1"
15901598
ua-parser-js "^0.7.9"
15911599

1600+
fbjs@^0.8.9:
1601+
version "0.8.12"
1602+
resolved "http://registry.npm.taobao.org/fbjs/download/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
1603+
dependencies:
1604+
core-js "^1.0.0"
1605+
isomorphic-fetch "^2.1.1"
1606+
loose-envify "^1.0.0"
1607+
object-assign "^4.1.0"
1608+
promise "^7.1.1"
1609+
setimmediate "^1.0.5"
1610+
ua-parser-js "^0.7.9"
1611+
15921612
filename-regex@^2.0.0:
15931613
version "2.0.0"
15941614
resolved "http://registry.npm.taobao.org/filename-regex/download/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
@@ -2077,6 +2097,10 @@ js-tokens@^2.0.0:
20772097
version "2.0.0"
20782098
resolved "http://registry.npm.taobao.org/js-tokens/download/js-tokens-2.0.0.tgz#79903f5563ee778cc1162e6dcf1a0027c97f9cb5"
20792099

2100+
js-tokens@^3.0.0:
2101+
version "3.0.2"
2102+
resolved "http://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
2103+
20802104
jsbn@~0.1.0:
20812105
version "0.1.0"
20822106
resolved "http://registry.npm.taobao.org/jsbn/download/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd"
@@ -2311,6 +2335,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0:
23112335
dependencies:
23122336
js-tokens "^2.0.0"
23132337

2338+
loose-envify@^1.3.1:
2339+
version "1.3.1"
2340+
resolved "http://registry.npm.taobao.org/loose-envify/download/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
2341+
dependencies:
2342+
js-tokens "^3.0.0"
2343+
23142344
lru-cache@2.2.x:
23152345
version "2.2.4"
23162346
resolved "http://registry.npm.taobao.org/lru-cache/download/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
@@ -2532,6 +2562,10 @@ object-assign@4.1.0, object-assign@^4.0.1, object-assign@^4.1.0:
25322562
version "4.1.0"
25332563
resolved "http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
25342564

2565+
object-assign@^4.1.1:
2566+
version "4.1.1"
2567+
resolved "http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
2568+
25352569
object-component@0.0.3:
25362570
version "0.0.3"
25372571
resolved "http://registry.npm.taobao.org/object-component/download/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
@@ -2719,6 +2753,13 @@ promise@^7.1.1:
27192753
dependencies:
27202754
asap "~2.0.3"
27212755

2756+
prop-types@^15.5.10, prop-types@^15.5.7:
2757+
version "15.5.10"
2758+
resolved "http://registry.npm.taobao.org/prop-types/download/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
2759+
dependencies:
2760+
fbjs "^0.8.9"
2761+
loose-envify "^1.3.1"
2762+
27222763
prr@~0.0.0:
27232764
version "0.0.0"
27242765
resolved "http://registry.npm.taobao.org/prr/download/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
@@ -2797,21 +2838,24 @@ rc@~1.1.6:
27972838
minimist "^1.2.0"
27982839
strip-json-comments "~1.0.4"
27992840

2800-
react-dom@^15.4.2:
2801-
version "15.4.2"
2802-
resolved "http://registry.npm.taobao.org/react-dom/download/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f"
2841+
react-dom@^15.6.1:
2842+
version "15.6.1"
2843+
resolved "http://registry.npm.taobao.org/react-dom/download/react-dom-15.6.1.tgz#2cb0ed4191038e53c209eb3a79a23e2a4cf99470"
28032844
dependencies:
2804-
fbjs "^0.8.1"
2845+
fbjs "^0.8.9"
28052846
loose-envify "^1.1.0"
28062847
object-assign "^4.1.0"
2848+
prop-types "^15.5.10"
28072849

2808-
react@15.4.2:
2809-
version "15.4.2"
2810-
resolved "http://registry.npm.taobao.org/react/download/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef"
2850+
react@^15.6.1:
2851+
version "15.6.1"
2852+
resolved "http://registry.npm.taobao.org/react/download/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df"
28112853
dependencies:
2812-
fbjs "^0.8.4"
2854+
create-react-class "^15.6.0"
2855+
fbjs "^0.8.9"
28132856
loose-envify "^1.1.0"
28142857
object-assign "^4.1.0"
2858+
prop-types "^15.5.10"
28152859

28162860
read-pkg-up@^1.0.1:
28172861
version "1.0.1"
@@ -2992,6 +3036,10 @@ set-immediate-shim@^1.0.1:
29923036
version "1.0.1"
29933037
resolved "http://registry.npm.taobao.org/set-immediate-shim/download/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
29943038

3039+
setimmediate@^1.0.5:
3040+
version "1.0.5"
3041+
resolved "http://registry.npm.taobao.org/setimmediate/download/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
3042+
29953043
setprototypeof@1.0.2:
29963044
version "1.0.2"
29973045
resolved "http://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08"

0 commit comments

Comments
 (0)