Skip to content

Commit

Permalink
react 16 fix #82
Browse files Browse the repository at this point in the history
  • Loading branch information
wangzuo committed Oct 9, 2017
1 parent 8109945 commit ce112a7
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 31 deletions.
4 changes: 2 additions & 2 deletions example/index.html
Expand Up @@ -9,8 +9,8 @@
<body>
<a href="https://github.com/wangzuo/input-moment"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"></a>
<div id="app"></div>
<script src="//unpkg.com/react@15.4.2/dist/react.js"></script>
<script src="//unpkg.com/react-dom@15.4.2/dist/react-dom.js"></script>
<script crossorigin src="https://unpkg.com/react@16/umd/react.development.js"></script>
<script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.development.js"></script>
<script src="//unpkg.com/moment@2.10.6/min/moment-with-locales.min.js"></script>
<script src="bundle.js"></script>
</body>
Expand Down
15 changes: 8 additions & 7 deletions package.json
Expand Up @@ -6,7 +6,8 @@
"scripts": {
"start": "webpack-dev-server -c --port=8080",
"build-js": "rm -rf lib && babel src --out-dir lib && webpack -p",
"build-css": "lessc --clean-css src/less/input-moment.less dist/input-moment.css",
"build-css":
"lessc --clean-css src/less/input-moment.less dist/input-moment.css",
"build": "npm run build-js && npm run build-css",
"deploy": "rm -rf .publish && npm run build && github-pages-deploy",
"pretest": "npm run build",
Expand All @@ -21,8 +22,8 @@
"license": "ISC",
"peerDependencies": {
"moment": "^2.10.6",
"react": "^0.14.0 || ^15.0.0",
"react-dom": "^0.14.0 || ^15.0.0"
"react": "^15.0.0 || ^16.0.0",
"react-dom": "^15.0.0 || ^16.0.0"
},
"devDependencies": {
"babel-cli": "^6.24.1",
Expand All @@ -40,17 +41,17 @@
"less-loader": "^2.2.1",
"less-plugin-clean-css": "^1.5.1",
"moment": "^2.17.1",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"react-test-renderer": "^15.4.2",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-test-renderer": "^16.0.0",
"style-loader": "^0.13.0",
"webpack": "^1.12.3",
"webpack-dev-server": "^1.14.0"
},
"dependencies": {
"classnames": "^2.2.0",
"lodash": "^4.17.4",
"react-input-slider": "^3.0.0"
"react-input-slider": "^4.0.0"
},
"repository": {
"type": "git",
Expand Down
64 changes: 42 additions & 22 deletions yarn.lock
Expand Up @@ -1677,6 +1677,18 @@ fb-watchman@^2.0.0:
dependencies:
bser "^2.0.0"

fbjs@^0.8.16:
version "0.8.16"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
dependencies:
core-js "^1.0.0"
isomorphic-fetch "^2.1.1"
loose-envify "^1.0.0"
object-assign "^4.1.0"
promise "^7.1.1"
setimmediate "^1.0.5"
ua-parser-js "^0.7.9"

fbjs@^0.8.9:
version "0.8.12"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
Expand Down Expand Up @@ -2947,7 +2959,7 @@ oauth-sign@~0.8.1:
version "0.8.2"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"

object-assign@^4.0.1, object-assign@^4.1.0:
object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"

Expand Down Expand Up @@ -3416,13 +3428,21 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"

prop-types@^15.5.10, prop-types@^15.5.7, prop-types@~15.5.7:
prop-types@^15.5.10:
version "15.5.10"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
dependencies:
fbjs "^0.8.9"
loose-envify "^1.3.1"

prop-types@^15.6.0:
version "15.6.0"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.3.1"
object-assign "^4.1.1"

proxy-addr@~1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3"
Expand Down Expand Up @@ -3493,38 +3513,38 @@ rc@^1.1.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

react-dom@^15.4.2:
version "15.5.4"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.5.4.tgz#ba0c28786fd52ed7e4f2135fe0288d462aef93da"
react-dom@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.0.0.tgz#9cc3079c3dcd70d4c6e01b84aab2a7e34c303f58"
dependencies:
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "~15.5.7"
object-assign "^4.1.1"
prop-types "^15.6.0"

react-input-slider@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/react-input-slider/-/react-input-slider-3.0.0.tgz#4f3be1e661293fe1cb293ad15a5988c495dc0681"
react-input-slider@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/react-input-slider/-/react-input-slider-4.0.0.tgz#6facc16a12ef24104f95fdacde01f18f8e698e1d"
dependencies:
blacklist "^1.1.2"
classnames "^2.2.0"
prop-types "^15.5.10"

react-test-renderer@^15.4.2:
version "15.5.4"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.5.4.tgz#d4ebb23f613d685ea8f5390109c2d20fbf7c83bc"
react-test-renderer@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.0.0.tgz#9fe7b8308f2f71f29fc356d4102086f131c9cb15"
dependencies:
fbjs "^0.8.9"
object-assign "^4.1.0"
fbjs "^0.8.16"
object-assign "^4.1.1"

react@^15.4.2:
version "15.5.4"
resolved "https://registry.yarnpkg.com/react/-/react-15.5.4.tgz#fa83eb01506ab237cdc1c8c3b1cea8de012bf047"
react@^16.0.0:
version "16.0.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.0.0.tgz#ce7df8f1941b036f02b2cca9dbd0cb1f0e855e2d"
dependencies:
fbjs "^0.8.9"
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.7"
object-assign "^4.1.1"
prop-types "^15.6.0"

read-pkg-up@^1.0.1:
version "1.0.1"
Expand Down

0 comments on commit ce112a7

Please sign in to comment.