Skip to content

Commit

Permalink
Merge pull request #4173 from marmelab/query-string-duplication
Browse files Browse the repository at this point in the history
Fix duplicate query-string package
  • Loading branch information
djhi authored Dec 16, 2019
2 parents 4e91885 + 88f1391 commit 7a3b80f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 22 deletions.
2 changes: 1 addition & 1 deletion packages/ra-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-data-json-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ra-data-simple-rest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
19 changes: 0 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 7a3b80f

Please sign in to comment.