From 086af343af4ba4835ae63ae861b54c79c628a969 Mon Sep 17 00:00:00 2001
From: igoradamenko <mail@igoradamenko.com>
Date: Sat, 10 Mar 2018 21:15:50 +0300
Subject: [PATCH] remove axios

---
 web/app/common/fetcher.js | 13 +------------
 web/package-lock.json     | 24 +++++-------------------
 web/package.json          |  1 -
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/web/app/common/fetcher.js b/web/app/common/fetcher.js
index 4f074713..6f31110a 100644
--- a/web/app/common/fetcher.js
+++ b/web/app/common/fetcher.js
@@ -1,7 +1,6 @@
 import 'common/promises';
 
 // TODO: i think we need to use unfetch here instead of heavy axios
-// import axios from 'axios';
 import fetch from 'unfetch';
 
 import { BASE_URL, API_BASE } from './constants';
@@ -10,17 +9,6 @@ import { siteId } from './settings';
 const fetcher = {};
 const methods = ['get', 'post', 'put', 'patch', 'delete', 'head'];
 
-// const { CancelToken } = axios;
-// let cancelHandler = [];
-
-// fetcher.cancel = (mask) => {
-//   cancelHandler.forEach(req => {
-//     if (req.url.includes(mask)) {
-//       req.executor('Operation canceled by the user.');
-//     }
-//   });
-// };
-
 methods.forEach(method => {
   fetcher[method] = data => {
     const {
@@ -31,6 +19,7 @@ methods.forEach(method => {
     } = (typeof data === 'string' ? { url: data } : data);
     const basename = `${BASE_URL}${overriddenApiBase}`;
 
+    // TODO: try to rewrite without promises
     return new Promise((resolve, reject) => {
       const parameters = {
         method: method.toUpperCase(),
diff --git a/web/package-lock.json b/web/package-lock.json
index a97bf84f..c8893239 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -339,15 +339,6 @@
       "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
       "dev": true
     },
-    "axios": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz",
-      "integrity": "sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0=",
-      "requires": {
-        "follow-redirects": "1.4.1",
-        "is-buffer": "1.1.6"
-      }
-    },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -2529,6 +2520,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
       "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "dev": true,
       "requires": {
         "ms": "2.0.0"
       }
@@ -3408,14 +3400,6 @@
         }
       }
     },
-    "follow-redirects": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz",
-      "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==",
-      "requires": {
-        "debug": "3.1.0"
-      }
-    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -5324,7 +5308,8 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
     },
     "is-builtin-module": {
       "version": "1.0.0",
@@ -6210,7 +6195,8 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
     },
     "multicast-dns": {
       "version": "6.2.3",
diff --git a/web/package.json b/web/package.json
index be8a86d2..7668cdeb 100644
--- a/web/package.json
+++ b/web/package.json
@@ -30,7 +30,6 @@
     "webpack-dev-server": "^2.7.1"
   },
   "dependencies": {
-    "axios": "^0.17.1",
     "babel-polyfill": "^6.23.0",
     "bem-react-helper": "^1.1.2",
     "preact": "^8.2.7",