From a3197e803a1d2f18e2fe83e3299ab1b22a05929c Mon Sep 17 00:00:00 2001 From: MICHAEL JACKSON Date: Fri, 14 Apr 2017 21:01:23 -0700 Subject: [PATCH] Update to React 15.5 --- client/App.test.js | 12 ++++++------ client/NumberTextInput.js | 12 +++++++++--- client/Stats.js | 5 +++-- client/WindowSize.js | 3 ++- client/index.js | 10 +++++----- package.json | 5 +++-- yarn.lock | 30 +++++++++++++++++++++++++++--- 7 files changed, 55 insertions(+), 22 deletions(-) diff --git a/client/App.test.js b/client/App.test.js index b84af98..76d121e 100644 --- a/client/App.test.js +++ b/client/App.test.js @@ -1,8 +1,8 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import App from './App'; +import React from 'react' +import ReactDOM from 'react-dom' +import App from './App' it('renders without crashing', () => { - const div = document.createElement('div'); - ReactDOM.render(, div); -}); + const div = document.createElement('div') + ReactDOM.render(, div) +}) diff --git a/client/NumberTextInput.js b/client/NumberTextInput.js index a026790..9541d0e 100644 --- a/client/NumberTextInput.js +++ b/client/NumberTextInput.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import React from 'react' +import PropTypes from 'prop-types' import { parseNumber, formatNumber } from './NumberUtils' class NumberTextInput extends React.Component { @@ -15,8 +16,13 @@ class NumberTextInput extends React.Component { formatNumber } - componentWillMount = () => + state = { + value: null + } + + componentWillMount() { this.setState({ value: this.props.value }) + } handleChange = (event) => { const value = this.props.parseNumber(event.target.value) @@ -27,7 +33,7 @@ class NumberTextInput extends React.Component { }) } - render = () => { + render() { const { value } = this.state const { parseNumber, formatNumber, ...props } = this.props // eslint-disable-line no-unused-vars const displayValue = formatNumber(value) diff --git a/client/Stats.js b/client/Stats.js index 19d4730..9f30cf0 100644 --- a/client/Stats.js +++ b/client/Stats.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import React from 'react' +import PropTypes from 'prop-types' import formatBytes from 'pretty-bytes' import formatDate from 'date-fns/format' import parseDate from 'date-fns/parse' @@ -35,7 +36,7 @@ class Stats extends React.Component { updateMinRequests = (value) => { this.setState({ minRequests: value }) } - + render() { const { minRequests } = this.state const stats = this.props.serverData.cloudflareStats diff --git a/client/WindowSize.js b/client/WindowSize.js index 004d604..7279396 100644 --- a/client/WindowSize.js +++ b/client/WindowSize.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import React from 'react' +import PropTypes from 'prop-types' import { addEvent, removeEvent } from './DOMUtils' const ResizeEvent = 'resize' diff --git a/client/index.js b/client/index.js index 54c5ef1..f66d1fc 100644 --- a/client/index.js +++ b/client/index.js @@ -1,9 +1,9 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import App from './App'; -import './index.css'; +import React from 'react' +import ReactDOM from 'react-dom' +import App from './App' +import './index.css' ReactDOM.render( , document.getElementById('root') -); +) diff --git a/package.json b/package.json index 5c5985b..03d3e12 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,9 @@ "morgan": "^1.8.1", "on-finished": "^2.3.0", "pretty-bytes": "^3", - "react": "^15.4.2", - "react-dom": "^15.4.2", + "prop-types": "^15.5.8", + "react": "^15.5.4", + "react-dom": "^15.5.4", "react-motion": "^0.4.7", "react-router-dom": "^4.0.0", "redis": "^2.7.1", diff --git a/yarn.lock b/yarn.lock index 4b59848..393794c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2169,7 +2169,7 @@ fb-watchman@^1.8.0, fb-watchman@^1.9.0: dependencies: bser "1.0.2" -fbjs@^0.8.1, fbjs@^0.8.4: +fbjs@^0.8.1, fbjs@^0.8.4, fbjs@^0.8.9: version "0.8.11" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.11.tgz#340b590b8a2278a01ef7467c07a16da9b753db24" dependencies: @@ -4295,6 +4295,12 @@ promise@7.1.1, promise@^7.1.1: dependencies: asap "~2.0.3" +prop-types@^15.5.7, prop-types@^15.5.8, prop-types@~15.5.7: + version "15.5.8" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394" + dependencies: + fbjs "^0.8.9" + proxy-addr@~1.1.3: version "1.1.4" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3" @@ -4401,7 +4407,7 @@ react-dev-utils@^0.5.2: sockjs-client "1.0.1" strip-ansi "3.0.1" -react-dom@^15.0.2, react-dom@^15.4.2: +react-dom@^15.0.2: version "15.4.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f" dependencies: @@ -4409,6 +4415,15 @@ react-dom@^15.0.2, react-dom@^15.4.2: loose-envify "^1.1.0" object-assign "^4.1.0" +react-dom@^15.5.4: + version "15.5.4" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.5.4.tgz#ba0c28786fd52ed7e4f2135fe0288d462aef93da" + dependencies: + fbjs "^0.8.9" + loose-envify "^1.1.0" + object-assign "^4.1.0" + prop-types "~15.5.7" + react-motion@^0.4.7: version "0.4.7" resolved "https://registry.yarnpkg.com/react-motion/-/react-motion-0.4.7.tgz#f77331ec7920bdb0d0cfc37eb6ffa10571bf42c7" @@ -4433,7 +4448,7 @@ react-router@^4.0.0: path-to-regexp "^1.5.3" warning "^3.0.0" -react@^15.0.2, react@^15.4.2: +react@^15.0.2: version "15.4.2" resolved "https://registry.yarnpkg.com/react/-/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef" dependencies: @@ -4441,6 +4456,15 @@ react@^15.0.2, react@^15.4.2: loose-envify "^1.1.0" object-assign "^4.1.0" +react@^15.5.4: + version "15.5.4" + resolved "https://registry.yarnpkg.com/react/-/react-15.5.4.tgz#fa83eb01506ab237cdc1c8c3b1cea8de012bf047" + dependencies: + fbjs "^0.8.9" + loose-envify "^1.1.0" + object-assign "^4.1.0" + prop-types "^15.5.7" + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"