From ccea9058ef96785632eb76322a8a8174ea1b1206 Mon Sep 17 00:00:00 2001 From: Michel Weststrate Date: Thu, 3 Feb 2022 04:19:07 -0800 Subject: [PATCH] Fix build failure on OSS master (#3394) Summary: Pull Request resolved: https://github.com/facebook/flipper/pull/3394 This diff caused OSS builds failing due to a FB plugin that requires emotion, instead of using it as peer dep. This introduced a duplicate dep, which doesn't get installed in OSS, causing patch-package for that package to fail. Changed it to a peer dep and removed the patch. Reviewed By: aigoncharov Differential Revision: D33975202 fbshipit-source-id: 1e82964988e944a28ecb46a10127ad9e13f743f7 --- ...@emotion+react++@emotion+cache+11.6.0.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 desktop/patches/@emotion+react++@emotion+cache+11.6.0.patch diff --git a/desktop/patches/@emotion+react++@emotion+cache+11.6.0.patch b/desktop/patches/@emotion+react++@emotion+cache+11.6.0.patch deleted file mode 100644 index 024326fc8..000000000 --- a/desktop/patches/@emotion+react++@emotion+cache+11.6.0.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/node_modules/@emotion/react/node_modules/@emotion/cache/dist/emotion-cache.cjs.dev.js b/node_modules/@emotion/react/node_modules/@emotion/cache/dist/emotion-cache.cjs.dev.js -index b1ad6ac..e577f28 100644 ---- a/node_modules/@emotion/react/node_modules/@emotion/cache/dist/emotion-cache.cjs.dev.js -+++ b/node_modules/@emotion/react/node_modules/@emotion/cache/dist/emotion-cache.cjs.dev.js -@@ -158,9 +158,10 @@ var createUnsafeSelectorsAlarm = function createUnsafeSelectorsAlarm(cache) { - return; - } - -- unsafePseudoClasses.forEach(function (unsafePseudoClass) { -- console.error("The pseudo class \"" + unsafePseudoClass + "\" is potentially unsafe when doing server-side rendering. Try changing it to \"" + unsafePseudoClass.split('-child')[0] + "-of-type\"."); -- }); -+ // messes up unit tests, and we don't do SSR! -+ // unsafePseudoClasses.forEach(function (unsafePseudoClass) { -+ // console.error("The pseudo class \"" + unsafePseudoClass + "\" is potentially unsafe when doing server-side rendering. Try changing it to \"" + unsafePseudoClass.split('-child')[0] + "-of-type\"."); -+ // }); - } - }; - };