diff --git a/desktop/.eslintrc.js b/desktop/.eslintrc.js index 102e16212..a07ca7547 100644 --- a/desktop/.eslintrc.js +++ b/desktop/.eslintrc.js @@ -29,6 +29,7 @@ const builtInModules = [ 'immer', '@emotion/styled', '@ant-design/icons', + '@testing-library/react', 'jest', 'ts-jest', ]; diff --git a/desktop/flipper-plugin/package.json b/desktop/flipper-plugin/package.json index e2058eabc..b6b734297 100644 --- a/desktop/flipper-plugin/package.json +++ b/desktop/flipper-plugin/package.json @@ -33,7 +33,6 @@ "peerDependencies": { "@ant-design/icons": "^4.2.2", "@testing-library/dom": "^7.26.3", - "@testing-library/react": "^11.1.0", "antd": "^4.11.2" }, "scripts": { diff --git a/desktop/flipper-ui-core/package.json b/desktop/flipper-ui-core/package.json index 0b0b308e0..9ff1289c0 100644 --- a/desktop/flipper-ui-core/package.json +++ b/desktop/flipper-ui-core/package.json @@ -51,7 +51,6 @@ }, "devDependencies": { "@testing-library/dom": "^8.11.3", - "@testing-library/react": "^12.1.4", "@types/deep-equal": "^1.0.1", "@types/lodash.memoize": "^4.1.7", "@types/react": "^17.0.39", diff --git a/desktop/package.json b/desktop/package.json index fc03c8cfa..d1a02ae21 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -73,6 +73,7 @@ "@typescript-eslint/eslint-plugin": "^5.22.0", "@typescript-eslint/parser": "^5.22.0", "babel-eslint": "^10.1.0", + "@testing-library/react": "^12.1.4", "cross-env": "^7.0.3", "electron": "18.2.0", "eslint": "^7.32.0", diff --git a/desktop/plugins/public/layout/package.json b/desktop/plugins/public/layout/package.json index e1024199e..eb2045e47 100644 --- a/desktop/plugins/public/layout/package.json +++ b/desktop/plugins/public/layout/package.json @@ -13,9 +13,6 @@ "lodash": "^4.17.21", "prism-react-renderer": "^0.1.7" }, - "devDependencies": { - "@testing-library/react": "^11.2.5" - }, "peerDependencies": { "nt-shared": "*" }, diff --git a/desktop/yarn.lock b/desktop/yarn.lock index a49f934f3..cc5f80aeb 100644 --- a/desktop/yarn.lock +++ b/desktop/yarn.lock @@ -3111,9 +3111,9 @@ integrity sha512-70Fy5dKDfoaKq9CaWVaSvheCmQ/M7BxNAlQJfL1qUqX5/cyUZpQvK8nGkGSAUtHs7yokOOlOR6+WlIr6GVJrjw== "@testing-library/dom@^8.0.0": - version "8.10.1" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.10.1.tgz#e24fed92ad51c619cf304c6f1410b4c76b1000c0" - integrity sha512-rab7vpf1uGig5efWwsCOn9j4/doy+W3VBoUyzX7C4y77u0wAckwc7R8nyH6e2rw0rRzKJR+gWPiAg8zhiFbxWQ== + version "8.14.0" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.14.0.tgz#c9830a21006d87b9ef6e1aae306cf49b0283e28e" + integrity sha512-m8FOdUo77iMTwVRCyzWcqxlEIk+GnopbrRI15a0EaLbpZSCinIVI4kSQzWhkShK83GogvEFJSsHF3Ws0z1vrqA== dependencies: "@babel/code-frame" "^7.10.4" "@babel/runtime" "^7.12.5" @@ -3139,13 +3139,13 @@ pretty-format "^27.0.2" "@testing-library/react@^12.1.4": - version "12.1.4" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.4.tgz#09674b117e550af713db3f4ec4c0942aa8bbf2c0" - integrity sha512-jiPKOm7vyUw311Hn/HlNQ9P8/lHNtArAx0PisXyFixDDvfl8DbD6EUdbshK5eqauvBSvzZd19itqQ9j3nferJA== + version "12.1.5" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.5.tgz#bb248f72f02a5ac9d949dea07279095fa577963b" + integrity sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg== dependencies: "@babel/runtime" "^7.12.5" "@testing-library/dom" "^8.0.0" - "@types/react-dom" "*" + "@types/react-dom" "<18.0.0" "@tootallnate/once@1": version "1.1.2" @@ -3555,12 +3555,12 @@ "@types/react" "*" "@types/reactcss" "*" -"@types/react-dom@*": - version "17.0.12" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.12.tgz#f08dfbc3c6d35084ffd3db6f09bdea8913de8494" - integrity sha512-SeJ430ndLI15JtRSHuzotn7AIdUtr8bdk6XW8mMfzjZo3vahRgJGHZqHiI4nAzCHTVG4qC21ObfsHBVUEHcDhg== +"@types/react-dom@<18.0.0": + version "17.0.17" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.17.tgz#2e3743277a793a96a99f1bf87614598289da68a1" + integrity sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg== dependencies: - "@types/react" "*" + "@types/react" "^17" "@types/react-dom@^17.0.12", "@types/react-dom@^17.0.13": version "17.0.13" @@ -3616,6 +3616,15 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/react@^17": + version "17.0.47" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.47.tgz#4ee71aaf4c5a9e290e03aa4d0d313c5d666b3b78" + integrity sha512-mk0BL8zBinf2ozNr3qPnlu1oyVTYq+4V7WA76RgxUAtf0Em/Wbid38KN6n4abEkvO4xMTBWmnP1FtQzgkEiJoA== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + "@types/reactcss@*": version "1.2.6" resolved "https://registry.yarnpkg.com/@types/reactcss/-/reactcss-1.2.6.tgz#133c1e7e896f2726370d1d5a26bf06a30a038bcc"