Merge branch 'master' into gwyneplaine/replace-ert

JedWatson · May 11, 2021 · 8b06236 · 8b06236
2 parents f56aa7f + ca5ba98
commit 8b06236
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "@changesets/cli": "^2.0.3",
     "@changesets/get-github-info": "^0.2.1",
     "@emotion/babel-plugin": "^11.0.0",
-    "@emotion/cache": "^11.0.0",
+    "@emotion/cache": "^11.4.0",
     "@emotion/jest": "^11.1.0",
     "@emotion/react": "^11.1.1",
     "@preconstruct/cli": "^1.0.0",

diff --git a/packages/react-select/CHANGELOG.md b/packages/react-select/CHANGELOG.md
@@ -10,6 +10,12 @@
 
 ---
 
+## 4.3.1
+
+### Patch Changes
+
+- [2c915d10](https://github.com/JedWatson/react-select/commit/2c915d10b5ce7b7f48aa0903fa838f9c294c434d) [#4577](https://github.com/JedWatson/react-select/pull/4577) - Bump @emotion/cache to v11.4.0 which fixes an issue where different versions of Emotion running at the same time causes styles to disappear in production.
+
 ## 4.3.0
 
 ### Minor Changes

diff --git a/packages/react-select/package.json b/packages/react-select/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-select",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "description": "A Select control built with and for ReactJS",
   "main": "dist/react-select.cjs.js",
   "module": "dist/react-select.esm.js",
@@ -11,7 +11,7 @@
   "repository": "https://github.com/JedWatson/react-select/tree/master/packages/react-select",
   "dependencies": {
     "@babel/runtime": "^7.12.0",
-    "@emotion/cache": "^11.0.0",
+    "@emotion/cache": "^11.4.0",
     "@emotion/react": "^11.1.1",
     "@types/react-input-autosize": "^2.2.0",
     "@types/react-transition-group": "^4.4.0",

diff --git a/yarn.lock b/yarn.lock
@@ -1524,10 +1524,10 @@
     "@emotion/utils" "0.11.3"
     "@emotion/weak-memoize" "0.2.5"
 
-"@emotion/cache@^11.0.0", "@emotion/cache@^11.1.3":
-  version "11.1.3"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.1.3.tgz#c7683a9484bcd38d5562f2b9947873cf66829afd"
-  integrity sha512-n4OWinUPJVaP6fXxWZD9OUeQ0lY7DvtmtSuqtRWT0Ofo/sBLCVSgb4/Oa0Q5eFxcwablRKjUXqXtNZVyEwCAuA==
+"@emotion/cache@^11.1.3", "@emotion/cache@^11.4.0":
+  version "11.4.0"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz#293fc9d9a7a38b9aad8e9337e5014366c3b09ac0"
+  integrity sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==
   dependencies:
     "@emotion/memoize" "^0.7.4"
     "@emotion/sheet" "^1.0.0"