File tree Expand file tree Collapse file tree 5 files changed +33
-12
lines changed
Expand file tree Collapse file tree 5 files changed +33
-12
lines changed Original file line number Diff line number Diff line change 66 "start" : " npm run karma -- start" ,
77 "test" : " npm run karma -- start --single-run" ,
88 "karma" : " cross-env ANIMATED_TEST=true babel-node -- ./node_modules/.bin/karma" ,
9- "prebuild" : " rimraf ./dist && mkdirp ./dist && rimraf ./lib && mkdirp ./lib" ,
9+ "prebuild" : " rimraf ./dist ./lib && mkdirp ./dist ./lib" ,
10+ "build:cjs-legacy" : " babel src -d lib/legacy" ,
1011 "build:cjs" : " babel src -d lib" ,
1112 "build:umd" : " webpack src dist/react-web-animated.js" ,
1213 "build:min" : " webpack -p src dist/react-web-animated.min.js" ,
13- "build" : " npm run build:cjs && npm run build:umd && npm run build:min" ,
14+ "build" : " npm run build:cjs && npm run build:umd && npm run build:min && npm run build:cjs-legacy " ,
1415 "prepublish" : " npm run build"
1516 },
1617 "main" : " lib/index.js" ,
4344 "karma-webpack" : " ^2.0.2" ,
4445 "mkdirp" : " ^0.5.1" ,
4546 "mocha" : " ^3.2.0" ,
46- "react" : " ^ 15.3 .2" ,
47- "react-dom" : " ^15.3 .2" ,
47+ "react" : " 15.4 .2" ,
48+ "react-dom" : " ^15.4 .2" ,
4849 "rimraf" : " ^2.5.4" ,
4950 "webpack" : " v2.1.0-beta.25"
5051 },
Original file line number Diff line number Diff line change @@ -21,7 +21,9 @@ var SpringConfig = require('SpringConfig');
2121var ViewStylePropTypes = require ( 'ViewStylePropTypes' ) ;
2222var NativeAnimatedHelper = require ( 'NativeAnimatedHelper' ) ;
2323
24- var findNodeHandle = require ( 'react/lib/findNodeHandle' ) ;
24+ var findNodeHandle = require ( 'react-dom/lib/findDOMNode' ) ;
25+ // var findNodeHandle = require('react/lib/findNodeHandle');
26+
2527var flattenStyle = require ( 'flattenStyle' ) ;
2628var invariant = require ( 'fbjs/lib/invariant' ) ;
2729var requestAnimationFrame = require ( 'fbjs/lib/requestAnimationFrame' ) ;
Original file line number Diff line number Diff line change 22import { isArray , capitalize , reduce } from 'lodash' ;
33import invariant from 'fbjs/lib/invariant' ;
44import { findDOMNode } from 'react-dom' ;
5- import CSSPropertyOperations from 'react/lib/CSSPropertyOperations' ;
5+
6+ import CSSPropertyOperations from 'react-dom/lib/CSSPropertyOperations' ;
7+ // import CSSPropertyOperations from 'react/lib/CSSPropertyOperations';
68
79const prefix = ( prop ) => {
810 if ( typeof window === 'undefined' ) { return prop ; }
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ const { env } = process;
77process . env . NODE_ENV = env . NODE_ENV || 'development' ;
88
99const isTesting = ! ! env . ANIMATED_TEST ;
10+ const reactVersion = + ( env . REACT_VERSION || 15.4 ) ;
1011const PROJECT_PATH = __dirname ;
1112const inProject = ( ...args ) => resolve ( PROJECT_PATH , ...args ) ;
1213const inSrc = inProject . bind ( null , 'src' ) ;
@@ -47,7 +48,10 @@ export default {
4748 resolve : {
4849 modules : [ srcDir , 'node_modules' ] ,
4950 extensions : [ '.js' ] ,
50- alias : { React : 'react' } ,
51+ alias : {
52+ React : 'react' ,
53+ // 'react-dom/lib': reactVersion >= 15.4 ? 'react-dom/lib' : 'react/lib',
54+ } ,
5155 } ,
5256 devtool : 'source-map' ,
5357 externals : isTesting ? { } : {
Original file line number Diff line number Diff line change @@ -1572,7 +1572,7 @@ extsprintf@1.0.2:
15721572 version "1.0.2"
15731573 resolved "http://registry.npm.taobao.org/extsprintf/download/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
15741574
1575- fbjs@^0.8.0, fbjs@^0.8.4 :
1575+ fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8. 4 :
15761576 version "0.8.5"
15771577 resolved "http://registry.npm.taobao.org/fbjs/download/fbjs-0.8.5.tgz#f69ba8a876096cb1b9bffe4d7c1e71c19d39d008"
15781578 dependencies :
@@ -2788,17 +2788,29 @@ rc@~1.1.6:
27882788 minimist "^1.2.0"
27892789 strip-json-comments "~1.0.4"
27902790
2791- react :
2791+ react-dom@^15.4.2 :
2792+ version "15.4.2"
2793+ resolved "http://registry.npm.taobao.org/react-dom/download/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f"
2794+ dependencies :
2795+ fbjs "^0.8.1"
2796+ loose-envify "^1.1.0"
2797+ object-assign "^4.1.0"
2798+
2799+ react@15.3@15.3.2 :
27922800 version "15.3.2"
27932801 resolved "http://registry.npm.taobao.org/react/download/react-15.3.2.tgz#a7bccd2fee8af126b0317e222c28d1d54528d09e"
27942802 dependencies :
27952803 fbjs "^0.8.4"
27962804 loose-envify "^1.1.0"
27972805 object-assign "^4.1.0"
27982806
2799- react-dom :
2800- version "15.3.2"
2801- resolved "http://registry.npm.taobao.org/react-dom/download/react-dom-15.3.2.tgz#c46b0aa5380d7b838e7a59c4a7beff2ed315531f"
2807+ react@15.4.2 :
2808+ version "15.4.2"
2809+ resolved "http://registry.npm.taobao.org/react/download/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef"
2810+ dependencies :
2811+ fbjs "^0.8.4"
2812+ loose-envify "^1.1.0"
2813+ object-assign "^4.1.0"
28022814
28032815read-pkg-up@^1.0.1 :
28042816 version "1.0.1"
You can’t perform that action at this time.
0 commit comments