From e468ecc98c5c2e51ef5e390562db7d045e876525 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Sat, 6 Jul 2024 14:39:46 +0530 Subject: [PATCH] [web] Fix duplication emotion instances Something's wrong with yarn's resolution algorithm, but let's leave that be until we migrate off classic. 11.11.4 doesn't have anything we need, so use 11.11.3 that seems to not result in dupes. The warning was gallery.js:16547 You are loading @emotion/react when it is already loaded. Running multiple instances may cause problems. This can happen if multiple versions are used, or if multiple builds of the same version are used. Ref: - https://github.com/ente-io/ente/pull/2372 --- web/packages/next/package.json | 4 ++-- web/yarn.lock | 18 ++---------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/web/packages/next/package.json b/web/packages/next/package.json index 0dfc31b743..0f0d8e5343 100644 --- a/web/packages/next/package.json +++ b/web/packages/next/package.json @@ -3,8 +3,8 @@ "version": "0.0.0", "private": true, "dependencies": { - "@emotion/react": "^11.11", - "@emotion/styled": "^11.11", + "@emotion/react": "11.11.3", + "@emotion/styled": "^11.11.5", "@mui/icons-material": "^5.16", "@mui/material": "^5.16", "comlink": "^4.4", diff --git a/web/yarn.lock b/web/yarn.lock index 52e1beb7e5..69100b9284 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -321,7 +321,7 @@ resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.1.tgz#c1ddb040429c6d21d38cc945fe75c818cfb68e17" integrity sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA== -"@emotion/react@^11.1.1": +"@emotion/react@11.11.3", "@emotion/react@^11.1.1": version "11.11.3" resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.11.3.tgz#96b855dc40a2a55f52a72f518a41db4f69c31a25" integrity sha512-Cnn0kuq4DoONOMcnoVsTOR8E+AdnKFf//6kUWc4LCdnxj31pZWn7rIULd6Y7/Js1PiPHzn7SKCM9vB/jBni8eA== @@ -335,20 +335,6 @@ "@emotion/weak-memoize" "^0.3.1" hoist-non-react-statics "^3.3.1" -"@emotion/react@^11.11": - version "11.11.4" - resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.11.4.tgz#3a829cac25c1f00e126408fab7f891f00ecc3c1d" - integrity sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw== - dependencies: - "@babel/runtime" "^7.18.3" - "@emotion/babel-plugin" "^11.11.0" - "@emotion/cache" "^11.11.0" - "@emotion/serialize" "^1.1.3" - "@emotion/use-insertion-effect-with-fallbacks" "^1.0.1" - "@emotion/utils" "^1.2.1" - "@emotion/weak-memoize" "^0.3.1" - hoist-non-react-statics "^3.3.1" - "@emotion/serialize@^1.0.0": version "1.1.3" resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.3.tgz#84b77bfcfe3b7bb47d326602f640ccfcacd5ffb0" @@ -376,7 +362,7 @@ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.2.tgz#d58e788ee27267a14342303e1abb3d508b6d0fec" integrity sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA== -"@emotion/styled@^11.11": +"@emotion/styled@^11.11.5": version "11.11.5" resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.11.5.tgz#0c5c8febef9d86e8a926e663b2e5488705545dfb" integrity sha512-/ZjjnaNKvuMPxcIiUkf/9SHoG4Q196DRl1w82hQ3WCsjo1IUR8uaGWrC6a87CrYAW0Kb/pK7hk8BnLgLRi9KoQ==