From 8728f92f757e2a37a60d13546426579ab95430dd Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 11 Nov 2018 02:26:40 +0300
Subject: query-string -> qs

Firefox 48 support
---
 vnext/.browserslistrc         |  3 ++-
 vnext/package.json            |  5 +++--
 vnext/src/App.js              |  2 +-
 vnext/src/components/Feeds.js |  2 +-
 vnext/src/components/Post.js  |  2 +-
 vnext/yarn.lock               | 15 +--------------
 6 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/vnext/.browserslistrc b/vnext/.browserslistrc
index 8a747d5e..6bed2f22 100644
--- a/vnext/.browserslistrc
+++ b/vnext/.browserslistrc
@@ -1,2 +1,3 @@
 ie >= 9
-android >= 4.2
\ No newline at end of file
+android >= 4.2
+firefox >= 48
diff --git a/vnext/package.json b/vnext/package.json
index dcf475e4..fb787710 100644
--- a/vnext/package.json
+++ b/vnext/package.json
@@ -70,7 +70,8 @@
       [
         "@babel/preset-env",
         {
-          "useBuiltIns": "usage"
+          "useBuiltIns": "usage",
+          "debug": true
         }
       ],
       "@babel/preset-react"
@@ -81,7 +82,7 @@
     "axios": "^0.18.0",
     "immutability-helper": "^2.8.1",
     "moment": "^2.22.2",
-    "query-string": "^6.2.0",
+    "qs": "^6.5.2",
     "react": "16.6.1",
     "react-content-loader": "^3.2.0",
     "react-cookies": "^0.1.0",
diff --git a/vnext/src/App.js b/vnext/src/App.js
index 5b343c0a..9c6e3a54 100644
--- a/vnext/src/App.js
+++ b/vnext/src/App.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { BrowserRouter as Router, Route, Link, Switch } from 'react-router-dom';
-import * as qs from 'query-string';
+import * as qs from 'qs';
 
 import Icon from './components/Icon';
 import { Discover, Discussions, Blog, Tag, Home } from './components/Feeds';
diff --git a/vnext/src/components/Feeds.js b/vnext/src/components/Feeds.js
index a09cfab2..27d1c074 100644
--- a/vnext/src/components/Feeds.js
+++ b/vnext/src/components/Feeds.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ReactRouterPropTypes from 'react-router-prop-types';
 import { Link } from 'react-router-dom';
-import * as qs from 'query-string';
+import * as qs from 'qs';
 import moment from 'moment';
 
 import Message from './Message';
diff --git a/vnext/src/components/Post.js b/vnext/src/components/Post.js
index 7646d740..555ad9af 100644
--- a/vnext/src/components/Post.js
+++ b/vnext/src/components/Post.js
@@ -3,7 +3,7 @@ import React from 'react';
 import ReactRouterPropTypes from 'react-router-prop-types';
 import { UserType } from './Types';
 
-import * as qs from 'query-string';
+import * as qs from 'qs';
 
 import MessageInput from './MessageInput';
 
diff --git a/vnext/yarn.lock b/vnext/yarn.lock
index a4e61b40..c98b45e3 100644
--- a/vnext/yarn.lock
+++ b/vnext/yarn.lock
@@ -7058,19 +7058,11 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qs@6.5.2, qs@~6.5.2:
+qs@6.5.2, qs@^6.5.2, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-query-string@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.2.0.tgz#468edeb542b7e0538f9f9b1aeb26f034f19c86e1"
-  integrity sha512-5wupExkIt8RYL4h/FE+WTg3JHk62e6fFPWtAZA9J5IWK1PfTfKkMS93HBUHcFpeYi9KsY5pFbh+ldvEyaz5MyA==
-  dependencies:
-    decode-uri-component "^0.2.0"
-    strict-uri-encode "^2.0.0"
-
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -8194,11 +8186,6 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
   integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
-strict-uri-encode@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
-  integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
-
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
-- 
cgit v1.2.3