Update React to 0.14.3

Minimal update is done - deprecation fixes will go in separate
patches. React-DnD is also updated to support React 0.14.3.

Change-Id: I0a798ea5e849a1f2d9cefb67f0f7e1d563a4327a
This commit is contained in:
Vitaly Kramskikh 2015-12-18 20:31:31 +03:00
parent 1bcc3878c2
commit f8b75591e7
4 changed files with 103 additions and 15 deletions

102
npm-shrinkwrap.json generated
View File

@ -6455,8 +6455,8 @@
"from": "raw-loader@0.5.1"
},
"react": {
"version": "0.13.3",
"from": "react@0.13.3",
"version": "0.14.3",
"from": "react@0.14.3",
"dependencies": {
"envify": {
"version": "3.4.0",
@ -6474,6 +6474,10 @@
"version": "0.1.1",
"from": "base62@0.1.1"
},
"esprima-fb": {
"version": "13001.1001.0-dev-harmony-fb",
"from": "esprima-fb@13001.1001.0-dev-harmony-fb"
},
"source-map": {
"version": "0.1.31",
"from": "source-map@0.1.31",
@ -6487,12 +6491,50 @@
}
}
}
},
"fbjs": {
"version": "0.3.2",
"from": "fbjs@^0.3.1",
"dependencies": {
"core-js": {
"version": "1.2.6",
"from": "core-js@^1.0.0"
},
"loose-envify": {
"version": "1.1.0",
"from": "loose-envify@^1.0.0",
"dependencies": {
"js-tokens": {
"version": "1.0.2",
"from": "js-tokens@^1.0.1"
}
}
},
"promise": {
"version": "7.0.4",
"from": "promise@^7.0.3",
"dependencies": {
"asap": {
"version": "2.0.3",
"from": "asap@~2.0.3"
}
}
},
"ua-parser-js": {
"version": "0.7.10",
"from": "ua-parser-js@^0.7.9"
},
"whatwg-fetch": {
"version": "0.9.0",
"from": "whatwg-fetch@^0.9.0"
}
}
}
}
},
"react-dnd": {
"version": "1.1.3",
"from": "react-dnd@1.1.3",
"version": "2.0.2",
"from": "react-dnd@2.0.2",
"dependencies": {
"disposables": {
"version": "1.0.1",
@ -6500,20 +6542,16 @@
},
"dnd-core": {
"version": "1.2.2",
"from": "dnd-core@^1.1.0",
"from": "dnd-core@^1.2.2",
"dependencies": {
"lodash": {
"version": "3.10.1",
"from": "lodash@^3.10.1"
},
"redux": {
"version": "3.0.3",
"version": "3.0.5",
"from": "redux@^3.0.0"
}
}
},
"invariant": {
"version": "2.1.1",
"version": "2.2.0",
"from": "invariant@^2.1.0",
"dependencies": {
"loose-envify": {
@ -6527,6 +6565,10 @@
}
}
}
},
"lodash": {
"version": "3.10.1",
"from": "lodash@^3.10.1"
}
}
},
@ -8394,6 +8436,44 @@
"i18next-client": {
"version": "1.11.1",
"from": "i18next-client@"
},
"react-dom": {
"version": "0.14.3",
"from": "react-dom@0.14.3"
},
"react-dnd-html5-backend": {
"version": "2.0.0",
"from": "react-dnd-html5-backend@",
"dependencies": {
"lodash": {
"version": "3.10.1",
"from": "lodash@^3.10.1"
}
}
},
"react-addons-create-fragment": {
"version": "0.14.3",
"from": "react-addons-create-fragment@"
},
"react-addons-css-transition-group": {
"version": "0.14.3",
"from": "react-addons-css-transition-group@"
},
"react-addons-linked-state-mixin": {
"version": "0.14.3",
"from": "react-addons-linked-state-mixin@"
},
"react-addons-pure-render-mixin": {
"version": "0.14.3",
"from": "react-addons-pure-render-mixin@"
},
"react-addons-test-utils": {
"version": "0.14.3",
"from": "react-addons-test-utils@"
},
"react-addons-transition-group": {
"version": "0.14.3",
"from": "react-addons-transition-group@"
}
}
}

View File

@ -47,8 +47,15 @@
"open-sans-fontface": "1.4.0",
"postcss-loader": "0.5.1",
"raw-loader": "0.5.1",
"react": "0.13.3",
"react-dnd": "1.1.3",
"react": "0.14.3",
"react-addons-create-fragment": "0.14.3",
"react-addons-css-transition-group": "0.14.3",
"react-addons-linked-state-mixin": "0.14.3",
"react-addons-pure-render-mixin": "0.14.3",
"react-addons-transition-group": "0.14.3",
"react-dnd": "2.0.2",
"react-dnd-html5-backend": "2.0.0",
"react-dom": "0.14.3",
"rimraf": "2.2.8",
"run-sequence": "1.0.2",
"style-loader": "0.12.4",
@ -72,6 +79,7 @@
"karma-webpack": "~1.7.0",
"mocha": "~2.3.2",
"nlf": "~1.3.2",
"react-addons-test-utils": "0.14.3",
"selenium-standalone": "~4.4.0",
"sinon": "~1.15.3",
"webpack-dev-server": "1.14.0"

View File

@ -232,7 +232,7 @@ function($, _, i18n, React, utils, models, componentMixins, controls) {
}
}, this);
}
return options;
return React.addons.createFragment(options);
},
handleShowButtonClick: function() {
this.setState({locked: true});

View File

@ -22,7 +22,7 @@ define([
'dispatcher',
'component_mixins',
'react-dnd',
'react-dnd/modules/backends/HTML5'
'react-dnd-html5-backend'
], function(_, i18n, React, utils, layoutComponents, dispatcher, componentMixins, DND, HTML5Backend) {
'use strict';