mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2025-02-17 00:21:20 -05:00
Update to React 16, and dependent packages
The Splash page renders with this commit.
This commit is contained in:
parent
61c2bb148a
commit
34f39b1c0b
6 changed files with 15 additions and 16 deletions
16
package.json
16
package.json
|
@ -55,8 +55,8 @@
|
|||
"exenv": "1.2.0",
|
||||
"fastly": "1.2.1",
|
||||
"file-loader": "0.8.4",
|
||||
"formsy-react": "0.19.5",
|
||||
"formsy-react-components": "0.11.1",
|
||||
"formsy-react": "1.1.4",
|
||||
"formsy-react-components": "1.0.0-beta.3",
|
||||
"git-bundle-sha": "0.0.2",
|
||||
"glob": "5.0.15",
|
||||
"google-libphonenumber": "1.0.21",
|
||||
|
@ -80,15 +80,15 @@
|
|||
"postcss-loader": "2.0.10",
|
||||
"prop-types": "15.6.0",
|
||||
"raven-js": "3.0.4",
|
||||
"react": "15.5.4",
|
||||
"react-dom": "15.5.4",
|
||||
"react-intl": "2.1.2",
|
||||
"react": "16.2.0",
|
||||
"react-dom": "16.2.0",
|
||||
"react-intl": "2.4.0",
|
||||
"react-modal": "3.1.11",
|
||||
"react-onclickoutside": "6.7.1",
|
||||
"react-redux": "4.4.5",
|
||||
"react-redux": "5.0.7",
|
||||
"react-responsive": "3.0.0",
|
||||
"react-slick": "0.12.2",
|
||||
"react-telephone-input": "3.8.6",
|
||||
"react-slick": "0.20.0",
|
||||
"react-telephone-input": "4.3.4",
|
||||
"redux": "3.5.2",
|
||||
"redux-thunk": "2.0.1",
|
||||
"sass-lint": "1.5.1",
|
||||
|
|
|
@ -2,8 +2,7 @@ const classNames = require('classnames');
|
|||
const defaults = require('lodash.defaults');
|
||||
const PropTypes = require('prop-types');
|
||||
const React = require('react');
|
||||
const Slider = require('react-slick');
|
||||
|
||||
const Slider = require('react-slick').default;
|
||||
const Thumbnail = require('../thumbnail/thumbnail.jsx');
|
||||
|
||||
const frameless = require('../../lib/frameless.js');
|
||||
|
|
|
@ -5,7 +5,7 @@ const classNames = require('classnames');
|
|||
const defaults = require('lodash.defaults');
|
||||
const PropTypes = require('prop-types');
|
||||
const React = require('react');
|
||||
const Slider = require('react-slick');
|
||||
const Slider = require('react-slick').default;
|
||||
|
||||
const Thumbnail = require('../thumbnail/thumbnail.jsx');
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ class Form extends React.Component {
|
|||
}
|
||||
render () {
|
||||
return (
|
||||
<Formsy.Form
|
||||
<Formsy.default
|
||||
className={classNames('form', this.props.className)}
|
||||
ref={form => {
|
||||
this.formsy = form;
|
||||
|
@ -36,13 +36,13 @@ class Form extends React.Component {
|
|||
{...this.props}
|
||||
>
|
||||
{React.Children.map(this.props.children, child => {
|
||||
if (!child) return child;
|
||||
if (!child) return null;
|
||||
if (child.props.name === 'all') {
|
||||
return React.cloneElement(child, {value: this.state.allValues});
|
||||
}
|
||||
return child;
|
||||
})}
|
||||
</Formsy.Form>
|
||||
</Formsy.default>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,4 +25,4 @@ GeneralError.propTypes = {
|
|||
showError: PropTypes.func
|
||||
};
|
||||
|
||||
module.exports = Formsy.HOC(GeneralError);
|
||||
module.exports = Formsy.withFormsy(GeneralError);
|
||||
|
|
|
@ -2,7 +2,7 @@ const classNames = require('classnames');
|
|||
const defaults = require('lodash.defaults');
|
||||
const PropTypes = require('prop-types');
|
||||
const React = require('react');
|
||||
const Slider = require('react-slick');
|
||||
const Slider = require('react-slick').default;
|
||||
|
||||
const Thumbnail = require('../thumbnail/thumbnail.jsx');
|
||||
|
||||
|
|
Loading…
Reference in a new issue