Skip to content

Commit

Permalink
React v16 + update of some dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
SemaiCZE committed Dec 9, 2017
1 parent cca2da4 commit 10847ea
Show file tree
Hide file tree
Showing 7 changed files with 131 additions and 362 deletions.
21 changes: 10 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
},
"dependencies": {
"admin-lte": "2.3.11",
"ajv": "5.5.1",
"ajv-keywords": "2.1.1",
"babel-plugin-react-intl": "^2.1.3",
"bluebird": "^3.3.5",
"browser-cookies": "^1.0.8",
Expand All @@ -53,31 +55,28 @@
"moment": "^2.18.1",
"pretty-ms": "^2.1.0",
"prop-types": "^15.5.8",
"react": "^15.5.4",
"react-ace": "^4.2.1",
"react-bootstrap": "^0.31.2",
"react-codemirror": "^0.3.0",
"react": "^16.2.0",
"react-ace": "5.8.0",
"react-bootstrap": "0.31.5",
"react-collapse": "^4.0.2",
"react-copy-to-clipboard": "^5.0.1",
"react-datetime": "^2.8.10",
"react-dom": "^15.5.4",
"react-dom": "^16.2.0",
"react-dropzone": "^3.5.3",
"react-fontawesome": "^1.1.0",
"react-height": "^3.0.0",
"react-helmet": "^5.0.3",
"react-immutable-proptypes": "^2.1.0",
"react-intl": "^2.1.3",
"react-motion": "^0.5.0",
"react-intl": "2.4.0",
"react-motion": "^0.5.2",
"react-redux": "^5.0.4",
"react-remarkable": "^1.1.2",
"react-responsive": "^1.1.3",
"react-router": "^3.0.0",
"react-router": "3.2.0",
"react-router-bootstrap": "^0.23.3",
"react-router-redux": "^4.0.8",
"react-rte": "^0.11.0",
"react-table": "^6.0.0",
"react-throttle": "^0.3.0",
"react-toggle": "^3.0.1",
"react-toggle": "4.0.2",
"redux": "^3.5.1",
"redux-actions": "^2.0.3",
"redux-form": "7.2.0",
Expand Down
5 changes: 0 additions & 5 deletions src/components/forms/EditExerciseForm/EditExerciseForm.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import { canUseDOM } from 'exenv';
import { reduxForm, Field, FieldArray, touch } from 'redux-form';
import {
injectIntl,
Expand All @@ -22,10 +21,6 @@ import { LocalizedExerciseName } from '../../helpers/LocalizedNames';
import { validateExercise } from '../../../redux/modules/exercises';
import withLinks from '../../../hoc/withLinks';

if (canUseDOM) {
require('codemirror/mode/yaml/yaml');
}

const messages = defineMessages({
easy: {
id: 'app.editExerciseForm.easy',
Expand Down
5 changes: 0 additions & 5 deletions src/components/forms/EditPipelineForm/EditPipelineForm.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { canUseDOM } from 'exenv';
import { connect } from 'react-redux';
import { reduxForm, Field, touch, formValueSelector } from 'redux-form';
import { FormattedMessage } from 'react-intl';
Expand All @@ -21,10 +20,6 @@ import { extractVariables } from '../../../helpers/boxes';
import { fetchSupplementaryFilesForPipeline } from '../../../redux/modules/pipelineFiles';
import { createGetPipelineFiles } from '../../../redux/selectors/pipelineFiles';

if (canUseDOM) {
require('codemirror/mode/yaml/yaml');
}

class EditPipelineForm extends Component {
componentDidMount = () => this.props.loadAsync();
componentWillReceiveProps = props => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import React from 'react';
import PropTypes from 'prop-types';
import { canUseDOM } from 'exenv';
import { reduxForm, Field } from 'redux-form';
import { FormattedMessage } from 'react-intl';
import { Alert } from 'react-bootstrap';

import { SourceCodeField } from '../Fields';
import SubmitButton from '../SubmitButton';

if (canUseDOM) {
require('codemirror/mode/yaml/yaml');
}

const EditScoreConfigForm = ({
anyTouched,
submitting,
Expand Down
85 changes: 0 additions & 85 deletions src/components/forms/Fields/RichTextAreaField.js

This file was deleted.

5 changes: 2 additions & 3 deletions src/components/forms/OnOffCheckbox/OnOffCheckbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const OnOffCheckbox = ({
disabled,
checked,
...props
}) => (
}) =>
<ControlLabel
htmlFor={name}
className={classNames({
Expand All @@ -38,8 +38,7 @@ const OnOffCheckbox = ({
<span className={styles.labelText}>
{children}
</span>
</ControlLabel>
);
</ControlLabel>;

OnOffCheckbox.propTypes = {
checked: PropTypes.bool,
Expand Down
Loading

0 comments on commit 10847ea

Please sign in to comment.