Skip to content

Commit 8303636

Browse files
author
foisonocean
committed
support react v16
1 parent 7d4d1a7 commit 8303636

File tree

4 files changed

+25
-30
lines changed

4 files changed

+25
-30
lines changed

package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-dynamic-font",
3-
"version": "0.0.6",
3+
"version": "1.0.0",
44
"description": "make your text does not wrap and dynamically adjust the font size",
55
"main": "lib/index.js",
66
"module": "es/index.js",
@@ -38,8 +38,9 @@
3838
},
3939
"homepage": "https://github.com/foisonocean/react-dynamic-font#readme",
4040
"peerDependencies": {
41-
"react": "^0.14.0 || ^15.0.0",
42-
"react-dom": "^0.14.0 || ^15.0.0"
41+
"prop-types": "^15.5.0",
42+
"react": "^16.0.0",
43+
"react-dom": "^16.0.0"
4344
},
4445
"devDependencies": {
4546
"babel-core": "^6.26.0",
@@ -62,9 +63,10 @@
6263
"extract-text-webpack-plugin": "^3.0.1",
6364
"husky": "^0.14.3",
6465
"npm-run-all": "^4.1.1",
65-
"react": "^15.6.2",
66+
"prop-types": "^15.6.0",
67+
"react": "^16.0.0",
6668
"react-css-modules": "^4.7.1",
67-
"react-dom": "^15.6.2",
69+
"react-dom": "^16.0.0",
6870
"react-hot-loader": "^3.1.1",
6971
"rimraf": "^2.6.2",
7072
"rollup": "^0.50.0",

rollup.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import packageInfo from './package.json';
55

66
const baseConfig = {
77
input: 'src/index.js',
8-
external: ['react', 'react-dom'],
8+
external: ['react', 'react-dom', 'prop-types'],
99
plugins: [
1010
babel({
1111
exclude: 'node_modules/**',
@@ -32,6 +32,7 @@ const umdConfig = Object.assign({}, baseConfig, {
3232
globals: {
3333
react: 'React',
3434
'react-dom': 'ReactDOM',
35+
'prop-types': 'PropTypes',
3536
},
3637
output: {
3738
file: packageInfo.umd,

src/ReactDynamicFont.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// eslint-disable-next-line import/no-unresolved, import/extensions
2-
import React, { Component, PropTypes } from 'react';
2+
import React, { Component } from 'react';
3+
import PropTypes from 'prop-types';
34

45
import getNodeWidth from './utils';
56

yarn.lock

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,14 +1417,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
14171417
safe-buffer "^5.0.1"
14181418
sha.js "^2.4.8"
14191419

1420-
create-react-class@^15.6.0:
1421-
version "15.6.2"
1422-
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
1423-
dependencies:
1424-
fbjs "^0.8.9"
1425-
loose-envify "^1.3.1"
1426-
object-assign "^4.1.1"
1427-
14281420
cross-env@^5.1.0:
14291421
version "5.1.0"
14301422
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.0.tgz#1f12d6b3777d5847dcf9cf39fbee3c6a76dd5058"
@@ -2183,7 +2175,7 @@ faye-websocket@~0.11.0:
21832175
dependencies:
21842176
websocket-driver ">=0.5.1"
21852177

2186-
fbjs@^0.8.16, fbjs@^0.8.9:
2178+
fbjs@^0.8.16:
21872179
version "0.8.16"
21882180
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
21892181
dependencies:
@@ -3980,7 +3972,7 @@ promise@^7.1.1:
39803972
dependencies:
39813973
asap "~2.0.3"
39823974

3983-
prop-types@^15.5.10, prop-types@^15.5.4:
3975+
prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.6.0:
39843976
version "15.6.0"
39853977
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
39863978
dependencies:
@@ -4109,14 +4101,14 @@ react-deep-force-update@^2.1.1:
41094101
version "2.1.1"
41104102
resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-2.1.1.tgz#8ea4263cd6455a050b37445b3f08fd839d86e909"
41114103

4112-
react-dom@^15.6.2:
4113-
version "15.6.2"
4114-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
4104+
react-dom@^16.0.0:
4105+
version "16.0.0"
4106+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58"
41154107
dependencies:
4116-
fbjs "^0.8.9"
4108+
fbjs "^0.8.16"
41174109
loose-envify "^1.1.0"
4118-
object-assign "^4.1.0"
4119-
prop-types "^15.5.10"
4110+
object-assign "^4.1.1"
4111+
prop-types "^15.6.0"
41204112

41214113
react-hot-loader@^3.1.1:
41224114
version "3.1.1"
@@ -4134,15 +4126,14 @@ react-proxy@^3.0.0-alpha.0:
41344126
dependencies:
41354127
lodash "^4.6.1"
41364128

4137-
react@^15.6.2:
4138-
version "15.6.2"
4139-
resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
4129+
react@^16.0.0:
4130+
version "16.0.0"
4131+
resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d"
41404132
dependencies:
4141-
create-react-class "^15.6.0"
4142-
fbjs "^0.8.9"
4133+
fbjs "^0.8.16"
41434134
loose-envify "^1.1.0"
4144-
object-assign "^4.1.0"
4145-
prop-types "^15.5.10"
4135+
object-assign "^4.1.1"
4136+
prop-types "^15.6.0"
41464137

41474138
read-pkg-up@^1.0.1:
41484139
version "1.0.1"

0 commit comments

Comments
 (0)