Skip to content
This repository was archived by the owner on Sep 20, 2024. It is now read-only.

Commit b2bb75e

Browse files
committed
Merge branch 'develop' of https://github.com/chakra-ui/chakra-ui-vue-next into feat/close-button
2 parents 48f709d + 5b2e1c2 commit b2bb75e

File tree

10 files changed

+21
-22
lines changed

10 files changed

+21
-22
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"@babel/core": "^7.12.9",
3838
"@babel/preset-env": "^7.12.7",
3939
"@babel/preset-typescript": "^7.12.7",
40-
"@chakra-ui/styled-system": "^1.9.0",
41-
"@chakra-ui/utils": "1.4.0",
40+
"@chakra-ui/styled-system": "^1.10.0",
41+
"@chakra-ui/utils": "^1.5.0",
4242
"@changesets/changelog-github": "^0.3.0",
4343
"@changesets/cli": "^2.14.1",
4444
"@commitlint/cli": "^11.0.0",

packages/c-badge/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"watch:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types --watch --incremental"
3838
},
3939
"dependencies": {
40-
"@chakra-ui/utils": "1.4.0",
40+
"@chakra-ui/utils": "^1.5.0",
4141
"@chakra-ui/vue-system": "0.0.1-alpha.0"
4242
},
4343
"devDependencies": {

packages/c-button/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"dependencies": {
3232
"@chakra-ui/c-icon": "0.0.1-alpha.0",
3333
"@chakra-ui/c-spinner": "0.0.1-alpha.0",
34-
"@chakra-ui/utils": "1.4.0",
34+
"@chakra-ui/utils": "^1.5.0",
3535
"@chakra-ui/vue-system": "0.0.1-alpha.0",
3636
"@chakra-ui/vue-utils": "0.0.1-alpha.0"
3737
},

packages/c-color-mode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"watch:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types --watch"
3737
},
3838
"dependencies": {
39-
"@chakra-ui/utils": "1.4.0"
39+
"@chakra-ui/utils": "^1.5.0"
4040
},
4141
"peerDependencies": {
4242
"vue": ">=3.0.5"

packages/c-popper/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"watch:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types --watch --incremental"
3838
},
3939
"dependencies": {
40-
"@chakra-ui/utils": "1.4.0",
40+
"@chakra-ui/utils": "^1.5.0",
4141
"@popperjs/core": "^2.8.4"
4242
},
4343
"devDependencies": {

packages/c-portal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"watch:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types --watch --incremental"
3838
},
3939
"dependencies": {
40-
"@chakra-ui/utils": "1.4.0"
40+
"@chakra-ui/utils": "^1.5.0"
4141
},
4242
"devDependencies": {
4343
"vue": ">=3.0.5"

packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
"@chakra-ui/c-spinner": "0.0.1-alpha.0",
4343
"@chakra-ui/c-theme-provider": "0.0.1-alpha.0",
4444
"@chakra-ui/c-visually-hidden": "0.0.1-alpha.0",
45-
"@chakra-ui/styled-system": "^1.9.0",
46-
"@chakra-ui/utils": "1.4.0",
45+
"@chakra-ui/styled-system": "^1.10.0",
46+
"@chakra-ui/utils": "^1.5.0",
4747
"@chakra-ui/vue-system": "0.0.1-alpha.0",
4848
"@chakra-ui/vue-theme": "0.0.1-alpha.0",
4949
"@chakra-ui/vue-theme-tools": "0.0.1-alpha.0"

packages/system/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
},
3131
"dependencies": {
3232
"@chakra-ui/c-color-mode": "0.0.1-alpha.0",
33-
"@chakra-ui/styled-system": "^1.9.0",
34-
"@chakra-ui/utils": "1.4.0",
33+
"@chakra-ui/styled-system": "^1.10.0",
34+
"@chakra-ui/utils": "^1.5.0",
3535
"@chakra-ui/vue-utils": "0.0.1-alpha.0",
3636
"@emotion/css": "^11.1.3",
3737
"lodash.camelcase": "^4.3.0",

packages/theme-tools/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"build:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types"
2626
},
2727
"dependencies": {
28-
"@chakra-ui/utils": "1.4.0",
28+
"@chakra-ui/utils": "^1.5.0",
2929
"@chakra-ui/vue-system": "0.0.1-alpha.0",
3030
"@types/tinycolor2": "^1.4.2",
3131
"tinycolor2": "^1.4.2"

yarn.lock

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,21 +1054,20 @@
10541054
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
10551055
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
10561056

1057-
"@chakra-ui/styled-system@^1.9.0":
1058-
version "1.9.1"
1059-
resolved "https://registry.yarnpkg.com/@chakra-ui/styled-system/-/styled-system-1.9.1.tgz#4541a3944c64fc2c2705685abe76faaf1591c7f3"
1060-
integrity sha512-LS/1oW2BP1/wY+GbBpoMTdb1ezVx1P32zR52OUn4ANogsDcB/7/DMMj6tuS4yaZEZ9AKliORI+p0CD9P/ETyQA==
1057+
"@chakra-ui/styled-system@^1.10.0":
1058+
version "1.10.0"
1059+
resolved "https://registry.yarnpkg.com/@chakra-ui/styled-system/-/styled-system-1.10.0.tgz#7734c59206c9fe7cada516a4e86411cfe2657934"
1060+
integrity sha512-f+ujP58hMRbClyXy+4d4rrWKVAf7iImNX6fSJMWG3KLfTI+PyVh7VWOtRlkt+sJQHJBUlAHp9IOTBcv9idL8Hg==
10611061
dependencies:
1062-
"@chakra-ui/utils" "1.4.0"
1062+
"@chakra-ui/utils" "1.5.0"
10631063
csstype "^3.0.6"
10641064

1065-
"@chakra-ui/utils@1.4.0":
1066-
version "1.4.0"
1067-
resolved "https://registry.yarnpkg.com/@chakra-ui/utils/-/utils-1.4.0.tgz#4b20c522141d68dc62b5c7be929bb6d1596db190"
1068-
integrity sha512-ND7NIilpncnkzcNBnAySGBFpOXb3urO1X9esSY0+M5zXiq+VSSfK9JuoJd3ilvV4Dbwgzil7hMAELBuHme4uTg==
1065+
"@chakra-ui/utils@1.5.0", "@chakra-ui/utils@^1.5.0":
1066+
version "1.5.0"
1067+
resolved "https://registry.yarnpkg.com/@chakra-ui/utils/-/utils-1.5.0.tgz#8ba5ac1353d85c7fbdfa843c8023d9a2b4a2915d"
1068+
integrity sha512-rHLGzAo7cwIF9LkfEFEqtmgZN4/e1kuu5fVO4DrLJHcOA7c+wibrNK8QaplBefpq+b5bnmmznE4YHpXqG8yiCQ==
10691069
dependencies:
10701070
"@types/lodash.mergewith" "4.6.6"
1071-
"@types/object-assign" "4.0.30"
10721071
css-box-model "1.2.1"
10731072
lodash.mergewith "4.6.2"
10741073

0 commit comments

Comments
 (0)