From dfe551089af74f092d70f501383b7b6775bfcf91 Mon Sep 17 00:00:00 2001
From: geisterfurz007 <geisterfurz007@users.noreply.github.com>
Date: Sun, 22 May 2022 00:13:15 +0200
Subject: [PATCH 1/5] Allow react-test-renderer 18 for storyshots (#17985)

---
 addons/storyshots/storyshots-core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/storyshots/storyshots-core/package.json b/addons/storyshots/storyshots-core/package.json
index b6f2e50837c7..456a7e2ce59a 100644
--- a/addons/storyshots/storyshots-core/package.json
+++ b/addons/storyshots/storyshots-core/package.json
@@ -61,7 +61,7 @@
     "jest-specific-snapshot": "^4.0.0",
     "preact-render-to-string": "^5.1.19",
     "pretty-format": "^26.6.2",
-    "react-test-renderer": "^16.8.0 || ^17.0.0",
+    "react-test-renderer": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "read-pkg-up": "^7.0.1",
     "regenerator-runtime": "^0.13.7",
     "ts-dedent": "^2.0.0"

From 30a2734faef97a7b988aa1220169a4e048e33812 Mon Sep 17 00:00:00 2001
From: geisterfurz007 <michelvonv@me.com>
Date: Mon, 23 May 2022 20:56:09 +0200
Subject: [PATCH 2/5] Update lockfile

---
 yarn.lock | 49 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4168f11cab61..08b78d71e112 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6873,7 +6873,7 @@ __metadata:
     jest-vue-preprocessor: ^1.7.1
     preact-render-to-string: ^5.1.19
     pretty-format: ^26.6.2
-    react-test-renderer: ^16.8.0 || ^17.0.0
+    react-test-renderer: ^16.8.0 || ^17.0.0 || ^18.0.0
     read-pkg-up: ^7.0.1
     regenerator-runtime: ^0.13.7
     rxjs: ^6.6.3
@@ -38088,13 +38088,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:17.0.2, react-is@npm:^16.12.0 || ^17.0.0, react-is@npm:^17.0.1, react-is@npm:^17.0.2":
+"react-is@npm:17.0.2, react-is@npm:^17.0.1, react-is@npm:^17.0.2":
   version: 17.0.2
   resolution: "react-is@npm:17.0.2"
   checksum: 2bdb6b93fbb1820b024b496042cce405c57e2f85e777c9aabd55f9b26d145408f9f74f5934676ffdc46f3dcff656d78413a6e43968e7b3f92eea35b3052e9053
   languageName: node
   linkType: hard
 
+"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.1.0":
+  version: 18.1.0
+  resolution: "react-is@npm:18.1.0"
+  checksum: 558874e4c3bd9805a9294426e090919ee6901be3ab07f80b997c36b5a01a8d691112802e7438d146f6c82fd6495d8c030f276ef05ec3410057f8740a8d723f8c
+  languageName: node
+  linkType: hard
+
 "react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.1, react-is@npm:^16.8.4, react-is@npm:^16.8.6":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
@@ -38417,15 +38424,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-shallow-renderer@npm:^16.13.1":
-  version: 16.14.1
-  resolution: "react-shallow-renderer@npm:16.14.1"
+"react-shallow-renderer@npm:^16.15.0":
+  version: 16.15.0
+  resolution: "react-shallow-renderer@npm:16.15.0"
   dependencies:
     object-assign: ^4.1.1
-    react-is: ^16.12.0 || ^17.0.0
+    react-is: ^16.12.0 || ^17.0.0 || ^18.0.0
   peerDependencies:
-    react: ^16.0.0 || ^17.0.0
-  checksum: b95f7ee2d88cf093e5b370663943ceb9199b8dff4217cb8cbffdf5e60966286f898a3ce7257b3c31bab54d698a3c80e70e92b0a8320bc69bdcf4d565678261c9
+    react: ^16.0.0 || ^17.0.0 || ^18.0.0
+  checksum: c194d741792e86043a4ae272f7353c1cb9412bc649945c4220c6a101a6ea5410cceb3d65d5a4d750f11a24f7426e8eec7977e8a4e3ad5d3ee235ca2b18166fa8
   languageName: node
   linkType: hard
 
@@ -38470,17 +38477,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-test-renderer@npm:^16.8.0 || ^17.0.0":
-  version: 17.0.2
-  resolution: "react-test-renderer@npm:17.0.2"
+"react-test-renderer@npm:^16.8.0 || ^17.0.0 || ^18.0.0":
+  version: 18.1.0
+  resolution: "react-test-renderer@npm:18.1.0"
   dependencies:
-    object-assign: ^4.1.1
-    react-is: ^17.0.2
-    react-shallow-renderer: ^16.13.1
-    scheduler: ^0.20.2
+    react-is: ^18.1.0
+    react-shallow-renderer: ^16.15.0
+    scheduler: ^0.22.0
   peerDependencies:
-    react: 17.0.2
-  checksum: a4ea1e745a87bb9015540d96a3077b614bf88e306a0edd639f8fb849a393fa5104e84eca4349bc4b026f2f0b115a4172d58950d7076316115795266557659276
+    react: ^18.1.0
+  checksum: 6eacd8f1c9200651f981f8a922710da0d8f204c2539f76af029584fcbc17242d461b034d95f5a4f87384fe6deea2a2f8190739795a87ad470c01a0a10cf1bbee
   languageName: node
   linkType: hard
 
@@ -40753,6 +40759,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"scheduler@npm:^0.22.0":
+  version: 0.22.0
+  resolution: "scheduler@npm:0.22.0"
+  dependencies:
+    loose-envify: ^1.1.0
+  checksum: db3ee5927e66048c97ab3565ee91d7ca5036e75f9600953c6ab2f6fb80938df95d72be8ac077329c2f3f1411d4d88e31cc9f83440540e5d4a881f6d84b0ed6a6
+  languageName: node
+  linkType: hard
+
 "schema-utils@npm:2.7.0":
   version: 2.7.0
   resolution: "schema-utils@npm:2.7.0"

From 8f0d3a214dc9fd953b15cdad7456b6979de93c11 Mon Sep 17 00:00:00 2001
From: geisterfurz007 <michelvonv@me.com>
Date: Mon, 6 Jun 2022 17:27:07 +0200
Subject: [PATCH 3/5] Force react-test-renderer 17 for monorepo

---
 package.json |  1 +
 yarn.lock    | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c1c7debbca86..9e88e6c45c6d 100644
--- a/package.json
+++ b/package.json
@@ -273,6 +273,7 @@
     "prettier": ">=2.2.1 <=2.3.0",
     "prompts": "^2.4.0",
     "raf": "^3.4.1",
+    "react-test-renderer": "^17.0.0",
     "read-pkg-up": "^7.0.1",
     "regenerator-runtime": "^0.13.7",
     "remark": "^13.0.0",
diff --git a/yarn.lock b/yarn.lock
index 08b78d71e112..7e1ec8b56bb3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8588,6 +8588,7 @@ __metadata:
     prompts: ^2.4.0
     puppeteer: ^2.1.1
     raf: ^3.4.1
+    react-test-renderer: ^17.0.0
     read-pkg-up: ^7.0.1
     regenerator-runtime: ^0.13.7
     remark: ^13.0.0
@@ -38424,7 +38425,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-shallow-renderer@npm:^16.15.0":
+"react-shallow-renderer@npm:^16.13.1, react-shallow-renderer@npm:^16.15.0":
   version: 16.15.0
   resolution: "react-shallow-renderer@npm:16.15.0"
   dependencies:
@@ -38490,6 +38491,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-test-renderer@npm:^17.0.0":
+  version: 17.0.2
+  resolution: "react-test-renderer@npm:17.0.2"
+  dependencies:
+    object-assign: ^4.1.1
+    react-is: ^17.0.2
+    react-shallow-renderer: ^16.13.1
+    scheduler: ^0.20.2
+  peerDependencies:
+    react: 17.0.2
+  checksum: a4ea1e745a87bb9015540d96a3077b614bf88e306a0edd639f8fb849a393fa5104e84eca4349bc4b026f2f0b115a4172d58950d7076316115795266557659276
+  languageName: node
+  linkType: hard
+
 "react-textarea-autosize@npm:^8.3.0":
   version: 8.3.3
   resolution: "react-textarea-autosize@npm:8.3.3"

From 43db757cbfb8a47e9b46ae7c6d3512b95b77e315 Mon Sep 17 00:00:00 2001
From: geisterfurz007 <michelvonv@me.com>
Date: Mon, 6 Jun 2022 18:06:34 +0200
Subject: [PATCH 4/5] Use yarn resolution property

---
 package.json |  2 +-
 yarn.lock    | 43 +++----------------------------------------
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index 9e88e6c45c6d..8bef9e31e32b 100644
--- a/package.json
+++ b/package.json
@@ -100,6 +100,7 @@
   "resolutions": {
     "boxen": "^5.1.2",
     "eslint": "^7.17.0",
+    "react-test-renderer": "^17.0.0",
     "serialize-javascript": "^3.1.0"
   },
   "devDependencies": {
@@ -273,7 +274,6 @@
     "prettier": ">=2.2.1 <=2.3.0",
     "prompts": "^2.4.0",
     "raf": "^3.4.1",
-    "react-test-renderer": "^17.0.0",
     "read-pkg-up": "^7.0.1",
     "regenerator-runtime": "^0.13.7",
     "remark": "^13.0.0",
diff --git a/yarn.lock b/yarn.lock
index 7e1ec8b56bb3..a976c58c62c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8588,7 +8588,6 @@ __metadata:
     prompts: ^2.4.0
     puppeteer: ^2.1.1
     raf: ^3.4.1
-    react-test-renderer: ^17.0.0
     read-pkg-up: ^7.0.1
     regenerator-runtime: ^0.13.7
     remark: ^13.0.0
@@ -38096,14 +38095,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0, react-is@npm:^18.1.0":
+"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0":
   version: 18.1.0
   resolution: "react-is@npm:18.1.0"
   checksum: 558874e4c3bd9805a9294426e090919ee6901be3ab07f80b997c36b5a01a8d691112802e7438d146f6c82fd6495d8c030f276ef05ec3410057f8740a8d723f8c
   languageName: node
   linkType: hard
 
-"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.1, react-is@npm:^16.8.4, react-is@npm:^16.8.6":
+"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.1, react-is@npm:^16.8.4":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
   checksum: 33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1
@@ -38425,7 +38424,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-shallow-renderer@npm:^16.13.1, react-shallow-renderer@npm:^16.15.0":
+"react-shallow-renderer@npm:^16.13.1":
   version: 16.15.0
   resolution: "react-shallow-renderer@npm:16.15.0"
   dependencies:
@@ -38464,33 +38463,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-test-renderer@npm:^16.0.0-0, react-test-renderer@npm:^16.2.0":
-  version: 16.14.0
-  resolution: "react-test-renderer@npm:16.14.0"
-  dependencies:
-    object-assign: ^4.1.1
-    prop-types: ^15.6.2
-    react-is: ^16.8.6
-    scheduler: ^0.19.1
-  peerDependencies:
-    react: ^16.14.0
-  checksum: 119e3ce5509c3443393ca750e39dd4ac9ee9ddfaafca58c9067b477447edc2badb75660b9fea7e9ddef012e37bbba427681cf6f8d3fde61b8054655a133bfbf5
-  languageName: node
-  linkType: hard
-
-"react-test-renderer@npm:^16.8.0 || ^17.0.0 || ^18.0.0":
-  version: 18.1.0
-  resolution: "react-test-renderer@npm:18.1.0"
-  dependencies:
-    react-is: ^18.1.0
-    react-shallow-renderer: ^16.15.0
-    scheduler: ^0.22.0
-  peerDependencies:
-    react: ^18.1.0
-  checksum: 6eacd8f1c9200651f981f8a922710da0d8f204c2539f76af029584fcbc17242d461b034d95f5a4f87384fe6deea2a2f8190739795a87ad470c01a0a10cf1bbee
-  languageName: node
-  linkType: hard
-
 "react-test-renderer@npm:^17.0.0":
   version: 17.0.2
   resolution: "react-test-renderer@npm:17.0.2"
@@ -40774,15 +40746,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scheduler@npm:^0.22.0":
-  version: 0.22.0
-  resolution: "scheduler@npm:0.22.0"
-  dependencies:
-    loose-envify: ^1.1.0
-  checksum: db3ee5927e66048c97ab3565ee91d7ca5036e75f9600953c6ab2f6fb80938df95d72be8ac077329c2f3f1411d4d88e31cc9f83440540e5d4a881f6d84b0ed6a6
-  languageName: node
-  linkType: hard
-
 "schema-utils@npm:2.7.0":
   version: 2.7.0
   resolution: "schema-utils@npm:2.7.0"

From c917a208ec465514eef7726b758355cbeb19ce9a Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Wed, 6 Jul 2022 18:55:38 +0200
Subject: [PATCH 5/5] fix version

---
 .../storyshots/storyshots-core/package.json   |  1 +
 package.json                                  |  1 -
 yarn.lock                                     | 39 +++++--------------
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/addons/storyshots/storyshots-core/package.json b/addons/storyshots/storyshots-core/package.json
index 456a7e2ce59a..cb6287dad04c 100644
--- a/addons/storyshots/storyshots-core/package.json
+++ b/addons/storyshots/storyshots-core/package.json
@@ -80,6 +80,7 @@
     "enzyme-to-json": "^3.6.1",
     "jest-preset-angular": "^8.3.2",
     "jest-vue-preprocessor": "^1.7.1",
+    "react-test-renderer": "^16",
     "rxjs": "^6.6.3",
     "vue-jest": "^5.0.0-alpha.8"
   },
diff --git a/package.json b/package.json
index 7247b4a38435..8695fe63253f 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,6 @@
   "resolutions": {
     "boxen": "^5.1.2",
     "eslint": "^7.17.0",
-    "react-test-renderer": "^17.0.0",
     "serialize-javascript": "^3.1.0"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 5b95d2b3934f..df9030f1545f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6885,7 +6885,7 @@ __metadata:
     jest-vue-preprocessor: ^1.7.1
     preact-render-to-string: ^5.1.19
     pretty-format: ^26.6.2
-    react-test-renderer: ^16.8.0 || ^17.0.0 || ^18.0.0
+    react-test-renderer: ^16
     read-pkg-up: ^7.0.1
     regenerator-runtime: ^0.13.7
     rxjs: ^6.6.3
@@ -38282,14 +38282,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^16.12.0 || ^17.0.0 || ^18.0.0":
-  version: 18.1.0
-  resolution: "react-is@npm:18.1.0"
-  checksum: 558874e4c3bd9805a9294426e090919ee6901be3ab07f80b997c36b5a01a8d691112802e7438d146f6c82fd6495d8c030f276ef05ec3410057f8740a8d723f8c
-  languageName: node
-  linkType: hard
-
-"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.1, react-is@npm:^16.8.4":
+"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.1, react-is@npm:^16.8.4, react-is@npm:^16.8.6":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
   checksum: 33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1
@@ -38611,18 +38604,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-shallow-renderer@npm:^16.13.1":
-  version: 16.15.0
-  resolution: "react-shallow-renderer@npm:16.15.0"
-  dependencies:
-    object-assign: ^4.1.1
-    react-is: ^16.12.0 || ^17.0.0 || ^18.0.0
-  peerDependencies:
-    react: ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: c194d741792e86043a4ae272f7353c1cb9412bc649945c4220c6a101a6ea5410cceb3d65d5a4d750f11a24f7426e8eec7977e8a4e3ad5d3ee235ca2b18166fa8
-  languageName: node
-  linkType: hard
-
 "react-sizeme@npm:^3.0.1":
   version: 3.0.2
   resolution: "react-sizeme@npm:3.0.2"
@@ -38665,17 +38646,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-test-renderer@npm:^17.0.0":
-  version: 17.0.2
-  resolution: "react-test-renderer@npm:17.0.2"
+"react-test-renderer@npm:^16, react-test-renderer@npm:^16.0.0-0, react-test-renderer@npm:^16.2.0":
+  version: 16.14.0
+  resolution: "react-test-renderer@npm:16.14.0"
   dependencies:
     object-assign: ^4.1.1
-    react-is: ^17.0.2
-    react-shallow-renderer: ^16.13.1
-    scheduler: ^0.20.2
+    prop-types: ^15.6.2
+    react-is: ^16.8.6
+    scheduler: ^0.19.1
   peerDependencies:
-    react: 17.0.2
-  checksum: a4ea1e745a87bb9015540d96a3077b614bf88e306a0edd639f8fb849a393fa5104e84eca4349bc4b026f2f0b115a4172d58950d7076316115795266557659276
+    react: ^16.14.0
+  checksum: 119e3ce5509c3443393ca750e39dd4ac9ee9ddfaafca58c9067b477447edc2badb75660b9fea7e9ddef012e37bbba427681cf6f8d3fde61b8054655a133bfbf5
   languageName: node
   linkType: hard