From 88f13913fe5e7e50ed01cb406a29101dd6b9c528 Mon Sep 17 00:00:00 2001
From: Francois Zaninotto <fzaninotto@gmail.com>
Date: Mon, 16 Dec 2019 10:00:08 +0100
Subject: [PATCH] Fix duplicate query-string package

Refs #4081, #1762
---
 packages/ra-core/package.json             |  2 +-
 packages/ra-data-json-server/package.json |  2 +-
 packages/ra-data-simple-rest/package.json |  2 +-
 yarn.lock                                 | 19 -------------------
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/packages/ra-core/package.json b/packages/ra-core/package.json
index 7ed7ff27de0..14dfbbbd5f1 100644
--- a/packages/ra-core/package.json
+++ b/packages/ra-core/package.json
@@ -72,7 +72,7 @@
         "inflection": "~1.12.0",
         "lodash": "~4.17.5",
         "prop-types": "^15.6.1",
-        "query-string": "~6.9.0",
+        "query-string": "^5.1.1",
         "recompose": "~0.26.0",
         "reselect": "~3.0.0"
     }
diff --git a/packages/ra-data-json-server/package.json b/packages/ra-data-json-server/package.json
index 747c9e5cf73..ce93503f89a 100644
--- a/packages/ra-data-json-server/package.json
+++ b/packages/ra-data-json-server/package.json
@@ -25,7 +25,7 @@
         "watch": "rimraf ./lib && tsc --watch"
     },
     "dependencies": {
-        "query-string": "~6.9.0",
+        "query-string": "^5.1.1",
         "ra-core": "^3.0.4"
     },
     "devDependencies": {
diff --git a/packages/ra-data-simple-rest/package.json b/packages/ra-data-simple-rest/package.json
index 9d977cbea34..e40084321af 100644
--- a/packages/ra-data-simple-rest/package.json
+++ b/packages/ra-data-simple-rest/package.json
@@ -25,7 +25,7 @@
         "watch": "rimraf ./lib && tsc --watch"
     },
     "dependencies": {
-        "query-string": "~6.9.0"
+        "query-string": "^5.1.1"
     },
     "devDependencies": {
         "cross-env": "^5.2.0",
diff --git a/yarn.lock b/yarn.lock
index c694ff90f82..55a65838937 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12472,15 +12472,6 @@ query-string@^5.0.1, query-string@^5.1.1:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-query-string@~6.9.0:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.9.0.tgz#1c3b727c370cf00f177c99f328fda2108f8fa3dd"
-  integrity sha512-KG4bhCFYapExLsUHrFt+kQVEegF2agm4cpF/VNc6pZVthIfCc/GK8t8VyNIE3nyXG9DK3Tf2EGkxjR6/uRdYsA==
-  dependencies:
-    decode-uri-component "^0.2.0"
-    split-on-first "^1.0.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"
@@ -14144,11 +14135,6 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-split-on-first@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
-  integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==
-
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -14291,11 +14277,6 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
-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-argv@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"