Skip to content

Commit b0b75c6

Browse files
authored
Use @emtion/react as peer dependency. (#144)
Fixes Conflicting @emotion/react #141
1 parent 1be3dfc commit b0b75c6

File tree

4 files changed

+65
-55
lines changed

4 files changed

+65
-55
lines changed

example/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"serve": "vite preview"
88
},
99
"dependencies": {
10+
"@emotion/react": "^11.9.3",
1011
"@hookform/devtools": "file:..",
1112
"@reach/router": "^1.3.4",
1213
"loglevel": "^1.7.1",

example/yarn.lock

Lines changed: 60 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,34 @@
244244
source-map "^0.5.7"
245245
stylis "^4.0.3"
246246

247-
"@emotion/cache@^11.1.3":
248-
version "11.1.3"
249-
resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.1.3.tgz#c7683a9484bcd38d5562f2b9947873cf66829afd"
250-
integrity sha512-n4OWinUPJVaP6fXxWZD9OUeQ0lY7DvtmtSuqtRWT0Ofo/sBLCVSgb4/Oa0Q5eFxcwablRKjUXqXtNZVyEwCAuA==
247+
"@emotion/babel-plugin@^11.7.1":
248+
version "11.9.2"
249+
resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz#723b6d394c89fb2ef782229d92ba95a740576e95"
250+
integrity sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw==
251+
dependencies:
252+
"@babel/helper-module-imports" "^7.12.13"
253+
"@babel/plugin-syntax-jsx" "^7.12.13"
254+
"@babel/runtime" "^7.13.10"
255+
"@emotion/hash" "^0.8.0"
256+
"@emotion/memoize" "^0.7.5"
257+
"@emotion/serialize" "^1.0.2"
258+
babel-plugin-macros "^2.6.1"
259+
convert-source-map "^1.5.0"
260+
escape-string-regexp "^4.0.0"
261+
find-root "^1.1.0"
262+
source-map "^0.5.7"
263+
stylis "4.0.13"
264+
265+
"@emotion/cache@^11.9.3":
266+
version "11.9.3"
267+
resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.9.3.tgz#96638449f6929fd18062cfe04d79b29b44c0d6cb"
268+
integrity sha512-0dgkI/JKlCXa+lEXviaMtGBL0ynpx4osh7rjOXE71q9bIF8G+XhJgvi+wDu0B0IdCVx37BffiwXlN9I3UuzFvg==
251269
dependencies:
252270
"@emotion/memoize" "^0.7.4"
253-
"@emotion/sheet" "^1.0.0"
271+
"@emotion/sheet" "^1.1.1"
254272
"@emotion/utils" "^1.0.0"
255273
"@emotion/weak-memoize" "^0.2.5"
256-
stylis "^4.0.3"
274+
stylis "4.0.13"
257275

258276
"@emotion/hash@^0.8.0":
259277
version "0.8.0"
@@ -272,20 +290,20 @@
272290
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
273291
integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
274292

275-
"@emotion/react@^11.1.5":
276-
version "11.1.5"
277-
resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.1.5.tgz#15e78f9822894cdc296e6f4e0688bac8120dfe66"
278-
integrity sha512-xfnZ9NJEv9SU9K2sxXM06lzjK245xSeHRpUh67eARBm3PBHjjKIZlfWZ7UQvD0Obvw6ZKjlC79uHrlzFYpOB/Q==
293+
"@emotion/react@^11.9.3":
294+
version "11.9.3"
295+
resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.9.3.tgz#f4f4f34444f6654a2e550f5dab4f2d360c101df9"
296+
integrity sha512-g9Q1GcTOlzOEjqwuLF/Zd9LC+4FljjPjDfxSM7KmEakm+hsHXk+bYZ2q+/hTJzr0OUNkujo72pXLQvXj6H+GJQ==
279297
dependencies:
280-
"@babel/runtime" "^7.7.2"
281-
"@emotion/cache" "^11.1.3"
282-
"@emotion/serialize" "^1.0.0"
283-
"@emotion/sheet" "^1.0.1"
284-
"@emotion/utils" "^1.0.0"
298+
"@babel/runtime" "^7.13.10"
299+
"@emotion/babel-plugin" "^11.7.1"
300+
"@emotion/cache" "^11.9.3"
301+
"@emotion/serialize" "^1.0.4"
302+
"@emotion/utils" "^1.1.0"
285303
"@emotion/weak-memoize" "^0.2.5"
286304
hoist-non-react-statics "^3.3.1"
287305

288-
"@emotion/serialize@^1.0.0", "@emotion/serialize@^1.0.2":
306+
"@emotion/serialize@^1.0.2":
289307
version "1.0.2"
290308
resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.2.tgz#77cb21a0571c9f68eb66087754a65fa97bfcd965"
291309
integrity sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==
@@ -296,10 +314,21 @@
296314
"@emotion/utils" "^1.0.0"
297315
csstype "^3.0.2"
298316

299-
"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.1":
300-
version "1.0.1"
301-
resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698"
302-
integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==
317+
"@emotion/serialize@^1.0.4":
318+
version "1.0.4"
319+
resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.4.tgz#ff31fd11bb07999611199c2229e152faadc21a3c"
320+
integrity sha512-1JHamSpH8PIfFwAMryO2bNka+y8+KA5yga5Ocf2d7ZEiJjb7xlLW7aknBGZqJLajuLOvJ+72vN+IBSwPlXD1Pg==
321+
dependencies:
322+
"@emotion/hash" "^0.8.0"
323+
"@emotion/memoize" "^0.7.4"
324+
"@emotion/unitless" "^0.7.5"
325+
"@emotion/utils" "^1.0.0"
326+
csstype "^3.0.2"
327+
328+
"@emotion/sheet@^1.1.1":
329+
version "1.1.1"
330+
resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.1.tgz#015756e2a9a3c7c5f11d8ec22966a8dbfbfac787"
331+
integrity sha512-J3YPccVRMiTZxYAY0IOq3kd+hUP8idY8Kz6B/Cyo+JuXq52Ek+zbPbSQUrVQp95aJ+lsAW7DPL1P2Z+U1jGkKA==
303332

304333
"@emotion/styled@^11.3.0":
305334
version "11.3.0"
@@ -322,15 +351,19 @@
322351
resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
323352
integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
324353

354+
"@emotion/utils@^1.1.0":
355+
version "1.1.0"
356+
resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.1.0.tgz#86b0b297f3f1a0f2bdb08eeac9a2f49afd40d0cf"
357+
integrity sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ==
358+
325359
"@emotion/weak-memoize@^0.2.5":
326360
version "0.2.5"
327361
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
328362
integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
329363

330364
"@hookform/devtools@file:..":
331-
version "3.0.2"
365+
version "4.1.0"
332366
dependencies:
333-
"@emotion/react" "^11.1.5"
334367
"@emotion/styled" "^11.3.0"
335368
"@types/lodash" "^4.14.168"
336369
little-state-machine "^4.1.0"
@@ -816,6 +849,11 @@ source-map@^0.6.1:
816849
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
817850
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
818851

852+
stylis@4.0.13:
853+
version "4.0.13"
854+
resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
855+
integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
856+
819857
stylis@^4.0.3:
820858
version "4.0.10"
821859
resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
},
5959
"homepage": "https://react-hook-form.com",
6060
"dependencies": {
61-
"@emotion/react": "^11.1.5",
6261
"@emotion/styled": "^11.3.0",
6362
"@types/lodash": "^4.14.168",
6463
"little-state-machine": "^4.1.0",
@@ -107,6 +106,7 @@
107106
"typescript": "^4.2.4"
108107
},
109108
"peerDependencies": {
109+
"@emotion/react": ">=11.0.0",
110110
"react": ">=17.0.2",
111111
"react-dom": ">=17.0.2",
112112
"react-hook-form": "^7.13.0"

yarn.lock

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,17 +1511,6 @@
15111511
"@emotion/utils" "0.11.3"
15121512
"@emotion/weak-memoize" "0.2.5"
15131513

1514-
"@emotion/cache@^11.1.3":
1515-
version "11.1.3"
1516-
resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.1.3.tgz#c7683a9484bcd38d5562f2b9947873cf66829afd"
1517-
integrity sha512-n4OWinUPJVaP6fXxWZD9OUeQ0lY7DvtmtSuqtRWT0Ofo/sBLCVSgb4/Oa0Q5eFxcwablRKjUXqXtNZVyEwCAuA==
1518-
dependencies:
1519-
"@emotion/memoize" "^0.7.4"
1520-
"@emotion/sheet" "^1.0.0"
1521-
"@emotion/utils" "^1.0.0"
1522-
"@emotion/weak-memoize" "^0.2.5"
1523-
stylis "^4.0.3"
1524-
15251514
"@emotion/core@^10.1.1":
15261515
version "10.1.1"
15271516
resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"
@@ -1577,19 +1566,6 @@
15771566
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
15781567
integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
15791568

1580-
"@emotion/react@^11.1.5":
1581-
version "11.1.5"
1582-
resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.1.5.tgz#15e78f9822894cdc296e6f4e0688bac8120dfe66"
1583-
integrity sha512-xfnZ9NJEv9SU9K2sxXM06lzjK245xSeHRpUh67eARBm3PBHjjKIZlfWZ7UQvD0Obvw6ZKjlC79uHrlzFYpOB/Q==
1584-
dependencies:
1585-
"@babel/runtime" "^7.7.2"
1586-
"@emotion/cache" "^11.1.3"
1587-
"@emotion/serialize" "^1.0.0"
1588-
"@emotion/sheet" "^1.0.1"
1589-
"@emotion/utils" "^1.0.0"
1590-
"@emotion/weak-memoize" "^0.2.5"
1591-
hoist-non-react-statics "^3.3.1"
1592-
15931569
"@emotion/serialize@^0.11.15", "@emotion/serialize@^0.11.16":
15941570
version "0.11.16"
15951571
resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz#dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad"
@@ -1601,7 +1577,7 @@
16011577
"@emotion/utils" "0.11.3"
16021578
csstype "^2.5.7"
16031579

1604-
"@emotion/serialize@^1.0.0", "@emotion/serialize@^1.0.2":
1580+
"@emotion/serialize@^1.0.2":
16051581
version "1.0.2"
16061582
resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.2.tgz#77cb21a0571c9f68eb66087754a65fa97bfcd965"
16071583
integrity sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==
@@ -1617,11 +1593,6 @@
16171593
resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5"
16181594
integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==
16191595

1620-
"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.1":
1621-
version "1.0.1"
1622-
resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698"
1623-
integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==
1624-
16251596
"@emotion/styled-base@^10.0.27":
16261597
version "10.0.31"
16271598
resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a"
@@ -1671,7 +1642,7 @@
16711642
resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
16721643
integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
16731644

1674-
"@emotion/weak-memoize@0.2.5", "@emotion/weak-memoize@^0.2.5":
1645+
"@emotion/weak-memoize@0.2.5":
16751646
version "0.2.5"
16761647
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
16771648
integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
@@ -7050,7 +7021,7 @@ hmac-drbg@^1.0.1:
70507021
minimalistic-assert "^1.0.0"
70517022
minimalistic-crypto-utils "^1.0.1"
70527023

7053-
hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1:
7024+
hoist-non-react-statics@^3.3.0:
70547025
version "3.3.2"
70557026
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
70567027
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==

0 commit comments

Comments
 (0)