From b1fead81b43f9715727d8293f051fad834fa8760 Mon Sep 17 00:00:00 2001
From: Billy Janitsch <billy@kensho.com>
Date: Wed, 7 Sep 2022 13:14:47 -0400
Subject: [PATCH 1/2] Support typings for Jest v29

---
 .changeset/brave-scissors-smile.md | 5 +++++
 packages/jest/package.json         | 2 +-
 yarn.lock                          | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/brave-scissors-smile.md

diff --git a/.changeset/brave-scissors-smile.md b/.changeset/brave-scissors-smile.md
new file mode 100644
index 000000000..56404d428
--- /dev/null
+++ b/.changeset/brave-scissors-smile.md
@@ -0,0 +1,5 @@
+---
+'@emotion/jest': minor
+---
+
+Support typings for Jest v29
diff --git a/packages/jest/package.json b/packages/jest/package.json
index 3c5ddad5e..ce9e66501 100644
--- a/packages/jest/package.json
+++ b/packages/jest/package.json
@@ -43,7 +43,7 @@
     "stylis": "4.0.13"
   },
   "peerDependencies": {
-    "@types/jest": "^26.0.14 || ^27.0.0 || ^28.0.0",
+    "@types/jest": "^26.0.14 || ^27.0.0 || ^28.0.0 || ^29.0.0",
     "enzyme-to-json": "^3.2.1"
   },
   "peerDependenciesMeta": {
diff --git a/yarn.lock b/yarn.lock
index 6d41b2aa0..1645aefc1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2482,7 +2482,7 @@ __metadata:
     stylis: 4.0.13
     typescript: ^4.5.5
   peerDependencies:
-    "@types/jest": ^26.0.14 || ^27.0.0 || ^28.0.0
+    "@types/jest": ^26.0.14 || ^27.0.0 || ^28.0.0 || ^29.0.0
     enzyme-to-json: ^3.2.1
   peerDependenciesMeta:
     "@types/jest":

From 7d1630df6bb0221feb71d46dc7881e487626cf3d Mon Sep 17 00:00:00 2001
From: Sam Magura <srmagura@gmail.com>
Date: Wed, 7 Sep 2022 15:29:26 -0400
Subject: [PATCH 2/2] Improve @types/jest changeset

---
 .changeset/brave-scissors-smile.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.changeset/brave-scissors-smile.md b/.changeset/brave-scissors-smile.md
index 56404d428..56cebded5 100644
--- a/.changeset/brave-scissors-smile.md
+++ b/.changeset/brave-scissors-smile.md
@@ -1,5 +1,5 @@
 ---
-'@emotion/jest': minor
+'@emotion/jest': patch
 ---
 
-Support typings for Jest v29
+Fix a dependency conflict when `@emotion/jest` was installed alongside `@types/jest@^29`.