update superagent

Author: mbasso

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-http-request",
-  "version": "1.0.4",
+  "version": "2.0.0-alpha.1",
   "description": "React component exposes network request functionality",
   "main": "lib/index.js",
   "scripts": {
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "prop-types": "^15.6.0",
-    "superagent": "1.7.2"
+    "superagent": "^4.1.0"
   },
   "devDependencies": {
     "babel-cli": "6.5.1",

src/index.js

@@ -2,26 +2,62 @@ import React from 'react';
 import request from 'superagent';
 import PropTypes from 'prop-types';
 
-class Request extends React.Component {
+export default class Request extends React.Component {
 
   static defaultProps = {
     method: 'get',
+  };
+
+  static propTypes = {
+    children: PropTypes.func,
+    method: PropTypes.string.isRequired,
+    type: PropTypes.string,
+    accept: PropTypes.string,
+    url: PropTypes.string.isRequired,
+    timeout: PropTypes.number,
+    verbose: PropTypes.bool,
+    query: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.object,
+    ]),
+    send: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.object,
+    ]),
+    headers: PropTypes.object,
+    auth: PropTypes.object,
+    withCredentials: PropTypes.bool,
+    buffer: PropTypes.bool,
+    attach: PropTypes.array,
+    fields: PropTypes.array,
+    onRequest: PropTypes.func,
+  };
+
+  request = null;
+
+  state = {
+    error: null,
+    result: null,
+    loading: true,
+  };
+
+  componentDidMount() {
+    this.performRequest(this.props);
   }
 
-  constructor(props) {
-    super(props);
-    this.request = null;
-    this.state = {
-      error: null,
-      result: null,
-      loading: true,
-    };
+  componentWillReceiveProps(...params) {
+    this.willReceiveProps(...params);
   }
 
-  componentWillMount() {
-    this.performRequest(this.props);
+  UNSAFE_componentWillReceiveProps(...params) {
+    this.willReceiveProps(...params);
   }
-  componentWillReceiveProps(nextProps) {
+
+  componentWillUnmount() {
+    this.request.abort();
+  }
+
+  willReceiveProps = nextProps => {
     if (JSON.stringify(this.props) === JSON.stringify(nextProps)) {
       return;
     }
@@ -36,10 +72,6 @@ class Request extends React.Component {
     this.performRequest(nextProps);
   }
 
-  componentWillUnmount() {
-    this.request.abort();
-  }
-
   performRequest(props) {
     let { method } = props;
     if (method === 'delete') {
@@ -102,17 +134,21 @@ class Request extends React.Component {
     }
 
     this.request
-      .end((error, result) => {
-        if (error || !result.ok) {
-          this.printLog(props, error);
-        } else {
-          this.printLog(props, result);
-        }
+      .then(result => {
+        this.printLog(props, result);
         this.setState({
-          error,
+          error: null,
           result,
           loading: false,
         });
+      })
+      .catch(error => {
+        this.printLog(props, error);
+        this.setState({
+          error,
+          result: null,
+          loading: false,
+        });
       });
   }
 
@@ -126,30 +162,3 @@ class Request extends React.Component {
     return this.props.children(this.state);
   }
 }
-
-Request.propTypes = {
-  children: PropTypes.func,
-  method: PropTypes.string.isRequired,
-  type: PropTypes.string,
-  accept: PropTypes.string,
-  url: PropTypes.string.isRequired,
-  timeout: PropTypes.number,
-  verbose: PropTypes.bool,
-  query: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.object,
-  ]),
-  send: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.object,
-  ]),
-  headers: PropTypes.object,
-  auth: PropTypes.object,
-  withCredentials: PropTypes.bool,
-  buffer: PropTypes.bool,
-  attach: PropTypes.array,
-  fields: PropTypes.array,
-  onRequest: PropTypes.func,
-};
-
-export default Request;