From 6fe3bcfbfceae21acf38137b71851cd1c4e99bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwenae=CC=88l=20Gallon?= Date: Mon, 1 Aug 2022 12:38:03 +0200 Subject: [PATCH] Fix @babel/parser conflict https://github.com/trivago/prettier-plugin-sort-imports/issues/156 --- package.json | 3 +++ yarn.lock | 14 ++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 5091d8b1c9a7..25f9d698bd7b 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,9 @@ "typescript": "^4.7.3", "webpack": "^5.68.0" }, + "resolutions": { + "@trivago/prettier-plugin-sort-imports/**/@babel/parser": "^7.17.0" + }, "lint-staged": { "*": "prettier --ignore-unknown --write", "*.{ts,tsx}": "eslint --fix" diff --git a/yarn.lock b/yarn.lock index ea9a2bfcb8b7..c827066f4e6f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -526,26 +526,16 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@7.17.8": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240" - integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ== - -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.0": +"@babel/parser@7.17.8", "@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.0", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8", "@babel/parser@^7.18.9": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c" integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw== -"@babel/parser@^7.17.3", "@babel/parser@^7.17.8", "@babel/parser@^7.18.9": +"@babel/parser@^7.18.6": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.9.tgz#f2dde0c682ccc264a9a8595efd030a5cc8fd2539" integrity sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg== -"@babel/parser@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.6.tgz#845338edecad65ebffef058d3be851f1d28a63bc" - integrity sha512-uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw== - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"