Skip to content

Commit

Permalink
Merge pull request #368 from cosmology-tech/fix/react-peer-dep-interc…
Browse files Browse the repository at this point in the history 
…hain

fix(react): move interchain ui to peerDependency to avoid css conflicts
  • Loading branch information
@liujun93
liujun93 authored Nov 24, 2023
2 parents 3442ebf + 581c976 commit e15c5dd
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 40 deletions.
2 changes: 1 addition & 1 deletion packages/docs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@cosmos-kit/core": "^2.7.7",
"@emotion/react": "^11.10.6",
"@emotion/styled": "^11.10.6",
"@interchain-ui/react": "1.13.4",
"@interchain-ui/react": "^1.13.17",
"chain-registry": "^1.20.0",
"chakra-react-select": "^4.6.0",
"cosmos-kit": "^2.5.12",
Expand Down
2 changes: 1 addition & 1 deletion packages/example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@cosmos-kit/station": "^2.4.7",
"@cosmos-kit/vectis": "^2.4.7",
"@cosmos-kit/web3auth": "^2.4.7",
"@interchain-ui/react": "1.13.4",
"@interchain-ui/react": "^1.13.17",
"@radix-ui/react-dropdown-menu": "^2.0.5",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-slot": "^1.0.2",
Expand Down
3 changes: 1 addition & 2 deletions packages/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,13 @@
"@chain-registry/types": "0.17.0",
"@cosmos-kit/core": "^2.7.7",
"@cosmos-kit/react-lite": "^2.5.9",
"@interchain-ui/react": "1.13.4",
"@react-icons/all-files": "^4.1.0"
},
"resolutions": {
"@types/react": "^18"
},
"peerDependencies": {
"@interchain-ui/react": "1.13.4",
"@interchain-ui/react": "^1.13.17",
"react": "^18",
"react-dom": "^18"
},
Expand Down
66 changes: 30 additions & 36 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2747,10 +2747,10 @@
dependencies:
tslib "^2.4.0"

"@formkit/auto-animate@1.0.0-beta.6":
version "1.0.0-beta.6"
resolved "https://registry.yarnpkg.com/@formkit/auto-animate/-/auto-animate-1.0.0-beta.6.tgz#ed7f8bc47d774a7764756646e9e3432e8be51cb3"
integrity sha512-PVDhLAlr+B4Xb7e+1wozBUWmXa6BFU8xUPR/W/E+TsQhPS1qkAdAsJ25keEnFrcePSnXHrOsh3tiFbEToOzV9w==
"@formkit/auto-animate@^0.8.1":
version "0.8.1"
resolved "https://registry.yarnpkg.com/@formkit/auto-animate/-/auto-animate-0.8.1.tgz#bcaba2969609ca3a7453eacd42b383a2739dfa35"
integrity sha512-0/Z2cuNXWVVIG/l0SpcHAWFhGdvLJ8DRvEfRWvmojtmRWfEy+LWNwgDazbZqY0qQYtkHcoEK3jBLkhiZaB/4Ig==

"@gar/promisify@^1.1.3":
version "1.1.3"
Expand Down Expand Up @@ -2800,20 +2800,19 @@
dependencies:
browser-headers "^0.4.1"

"@interchain-ui/[email protected].4":
version "1.13.4"
resolved "https://registry.yarnpkg.com/@interchain-ui/react/-/react-1.13.4.tgz#af0aa0640f8dea0f7a2a9efbb0cce8ba35ce7675"
integrity sha512-pB6qQjNsitoT4guZK7g4eRPPruUdVrWByIDLrE0WlRaLGja3DvyJroxALUsTh4KQpSQdWHTX2nd9baejCasiAg==
"@interchain-ui/react@^1.13.17":
version "1.13.17"
resolved "https://registry.yarnpkg.com/@interchain-ui/react/-/react-1.13.17.tgz#6585d256aefbe322e93de93eebf637a45c9c51ec"
integrity sha512-51/2Rd8vfizPETC7q+3FWv5v6sYZwQJfjbEE3qn9nvFPqJ4Ai/YgHkf2Ft9RM0DphDOFFUfb4nsDldY11N+uPA==
dependencies:
"@fastify/deepmerge" "^1.3.0"
"@floating-ui/dom" "^1.5.2"
"@floating-ui/react" "^0.26.0"
"@formkit/auto-animate" "1.0.0-beta.6"
"@formkit/auto-animate" "^0.8.1"
"@react-aria/utils" "^3.21.1"
"@vanilla-extract/css" "^1.12.0"
"@vanilla-extract/css-utils" "^0.1.3"
"@vanilla-extract/dynamic" "^2.0.3"
"@vanilla-extract/recipes" "^0.4.0"
"@vanilla-extract/css" "^1.14.0"
"@vanilla-extract/dynamic" "^2.1.0"
"@vanilla-extract/recipes" "^0.5.1"
animejs "^3.2.1"
bignumber.js "^9.1.1"
client-only "^0.0.1"
Expand Down Expand Up @@ -6228,32 +6227,27 @@
resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==

"@vanilla-extract/css-utils@^0.1.3":
version "0.1.3"
resolved "https://registry.yarnpkg.com/@vanilla-extract/css-utils/-/css-utils-0.1.3.tgz#cadeb6bc563547b20e9b903647d8b334d3a79ef8"
integrity sha512-PZAcHROlgtCUGI2y0JntdNwvPwCNyeVnkQu6KTYKdmxBbK3w72XJUmLFYapfaFfgami4I9CTLnrJTPdtmS3gpw==

"@vanilla-extract/css@^1.12.0":
version "1.13.0"
resolved "https://registry.yarnpkg.com/@vanilla-extract/css/-/css-1.13.0.tgz#85f521d428f55b0e9599675033caba81194cc6c0"
integrity sha512-JFFBXhnJrPlGqHBabagXqo5ghXw9mtV270ycIGyLDZG8NAK5eRwAYkMowAxuzK7wZSm67GnETWYB7b0AUmyttg==
"@vanilla-extract/css@^1.14.0":
version "1.14.0"
resolved "https://registry.yarnpkg.com/@vanilla-extract/css/-/css-1.14.0.tgz#45fab9c04d893e3e363cf2cde7559d21233b7f63"
integrity sha512-rYfm7JciWZ8PFzBM/HDiE2GLnKI3xJ6/vdmVJ5BSgcCZ5CxRlM9Cjqclni9lGzF3eMOijnUhCd/KV8TOzyzbMA==
dependencies:
"@emotion/hash" "^0.9.0"
"@vanilla-extract/private" "^1.0.3"
ahocorasick "1.0.2"
chalk "^4.1.1"
css-what "^6.1.0"
cssesc "^3.0.0"
csstype "^3.0.7"
deep-object-diff "^1.1.9"
deepmerge "^4.2.2"
media-query-parser "^2.0.2"
modern-ahocorasick "^1.0.0"
outdent "^0.8.0"

"@vanilla-extract/dynamic@^2.0.3":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@vanilla-extract/dynamic/-/dynamic-2.0.3.tgz#44b4e018cbdfb6af3d27e73c78b38617dfe419ad"
integrity sha512-Rglfw2gXAYiBzAQ4jgUG7rBgE2c88e/zcG27ZVoIqMHVq56wf2C1katGMm1yFMNBgzqM7oBNYzz4YOMzznydkg==
"@vanilla-extract/dynamic@^2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@vanilla-extract/dynamic/-/dynamic-2.1.0.tgz#316d3bd4adfd5f5c9fb080445c41d55abe3b463c"
integrity sha512-8zl0IgBYRtgD1h+56Zu13wHTiMTJSVEa4F7RWX9vTB/5Xe2KtjoiqApy/szHPVFA56c+ex6A4GpCQjT1bKXbYw==
dependencies:
"@vanilla-extract/private" "^1.0.3"

Expand All @@ -6262,10 +6256,10 @@
resolved "https://registry.yarnpkg.com/@vanilla-extract/private/-/private-1.0.3.tgz#7ec72bc2ff6fe51f9d650f962e8d1989b073690f"
integrity sha512-17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ==

"@vanilla-extract/recipes@^0.4.0":
version "0.4.0"
resolved "https://registry.yarnpkg.com/@vanilla-extract/recipes/-/recipes-0.4.0.tgz#7bb2edb0757b6f40c244d72569da7f74d6afa427"
integrity sha512-gFgB7BofUYbtbxINHK6DhMv1JDFDXp/YI/Xm+cqKar+1I/2dfxPepeDxSexL6YB4ftfeaDw8Kn5zydMvHcGOEQ==
"@vanilla-extract/recipes@^0.5.1":
version "0.5.1"
resolved "https://registry.yarnpkg.com/@vanilla-extract/recipes/-/recipes-0.5.1.tgz#617d1a0375af60835341770397810317d2f61998"
integrity sha512-7dCuBgPQQ/89siQ0w2lkfjgkmToPUUDzFlHf5DRmt9ykiiycfA52tmPJ2RI/mr7jXi7U/vEN2aGP9QJSXEpGlA==

"@walletconnect/[email protected]":
version "2.10.4"
Expand Down Expand Up @@ -6694,11 +6688,6 @@ aggregate-error@^3.0.0:
clean-stack "^2.0.0"
indent-string "^4.0.0"

[email protected]:
version "1.0.2"
resolved "https://registry.yarnpkg.com/ahocorasick/-/ahocorasick-1.0.2.tgz#9eee93aef9d02bfb476d9b648d9b7a40ef2fd500"
integrity sha512-hCOfMzbFx5IDutmWLAt6MZwOUjIfSM9G9FyVxytmE4Rs/5YDPWQrD/+IR1w+FweD9H2oOZEnv36TmkjhNURBVA==

ajv-formats@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
Expand Down Expand Up @@ -12909,6 +12898,11 @@ mobx@^6.1.7:
resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.10.2.tgz#96e123deef140750360ca9a5b02a8b91fbffd4d9"
integrity sha512-B1UGC3ieK3boCjnMEcZSwxqRDMdzX65H/8zOHbuTY8ZhvrIjTUoLRR2TP2bPqIgYRfb3+dUigu8yMZufNjn0LQ==

modern-ahocorasick@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/modern-ahocorasick/-/modern-ahocorasick-1.0.1.tgz#dec373444f51b5458ac05216a8ec376e126dd283"
integrity sha512-yoe+JbhTClckZ67b2itRtistFKf8yPYelHLc7e5xAwtNAXxM6wJTUx2C7QeVSJFDzKT7bCIFyBVybPMKvmB9AA==

modify-values@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
Expand Down

0 comments on commit e15c5dd

Please sign in to comment.