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

Commit dbbc408

Browse files
Merge pull request #32 from chakra-ui/chore/upgrade-system-package
chore: upgrade system package
2 parents 299ea64 + adc953d commit dbbc408

File tree

36 files changed

+206
-6638
lines changed

36 files changed

+206
-6638
lines changed

_templates/generator/component/package.json.ejs.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ to: packages/<%=h.changeCase.paramCase(name)%>/package.json
3939
"watch:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types --watch --incremental"
4040
},
4141
"dependencies": {
42-
"@chakra-ui/styled-system": "^1.4.1",
42+
"@chakra-ui/styled-system": "^1.9.0",
4343
"@chakra-ui/vue-system": "*",
4444
"@chakra-ui/vue-utils": "*"
4545
},

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"vue-router": "4.0.0-beta.10"
103103
},
104104
"dependencies": {
105-
"@chakra-ui/styled-system": "^1.4.1",
105+
"@chakra-ui/styled-system": "^1.9.0",
106106
"@emotion/css": "^11.1.3",
107107
"@emotion/server": "^11.0.0",
108108
"@popperjs/core": "^2.8.4",

packages/c-alert/package.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "@chakra-ui/c-alert",
33
"version": "1.0.0",
44
"main": "dist/cjs/index.js",
5-
65
"module": "dist/esm/index.js",
76
"types": "dist/types/index.d.ts",
87
"typings": "dist/types/index.d.ts",
@@ -24,9 +23,16 @@
2423
"watch:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types --watch --incremental"
2524
},
2625
"dependencies": {
27-
"@chakra-ui/styled-system": "^1.4.1",
2826
"@chakra-ui/vue-system": "*",
2927
"@chakra-ui/vue-utils": "*",
3028
"@chakra-ui/c-icon": "*"
29+
},
30+
"devDependencies": {
31+
"@chakra-ui/vue-system": "*",
32+
"vue": "^3.0.5"
33+
},
34+
"peerDependencies": {
35+
"@chakra-ui/vue-system": "*",
36+
"vue": "^3.0.5"
3137
}
3238
}

packages/c-alert/src/alert.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
StylesProvider,
1010
DOMElements,
1111
} from '@chakra-ui/vue-system'
12-
import { SystemStyleObject } from '@chakra-ui/styled-system'
12+
import { SystemStyleObject } from '@chakra-ui/vue-system'
1313
import { createContext } from '@chakra-ui/vue-utils'
1414
import { CIcon } from '@chakra-ui/c-icon'
1515

packages/c-alert/tests/__snapshots__/c-alert.test.ts.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
exports[`should render all children 1`] = `
44
<DocumentFragment>
55
<div
6-
class="chakra-alert css-wtzaz1"
6+
class="chakra-alert css-mt4tyf"
77
data-testid="alert"
88
role="alert"
99
>
1010
<svg
11-
class="alert__icon chakra-icon css-139yi2r"
11+
class="alert__icon chakra-icon css-1bwzgwf"
1212
focusable="false"
1313
viewBox="0 0 24 24"
1414
>
@@ -48,12 +48,12 @@ exports[`should render all children 1`] = `
4848
4949
</svg>
5050
<div
51-
class="chakra-alert__title css-14esyki"
51+
class="chakra-alert__title css-1x7s9vs"
5252
>
5353
Info alert
5454
</div>
5555
<div
56-
class="chakra-alert__description css-5le3e4"
56+
class="chakra-alert__description css-1xfoiaz"
5757
>
5858
Something just happened
5959
</div>
@@ -64,7 +64,7 @@ exports[`should render all children 1`] = `
6464
exports[`should render properly 1`] = `
6565
<DocumentFragment>
6666
<div
67-
class="chakra-alert css-15689h3"
67+
class="chakra-alert css-e32ira"
6868
role="alert"
6969
/>
7070
</DocumentFragment>

packages/c-badge/package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,15 @@
3535
"watch:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types --watch --incremental"
3636
},
3737
"dependencies": {
38-
"@chakra-ui/styled-system": "^1.4.1",
3938
"@chakra-ui/vue-system": "*",
4039
"@chakra-ui/vue-utils": "*"
4140
},
41+
"devDependencies": {
42+
"@chakra-ui/vue-system": "*",
43+
"vue": "^3.0.5"
44+
},
4245
"peerDependencies": {
43-
"vue": ">=3.0.5"
46+
"@chakra-ui/vue-system": "*",
47+
"vue": "^3.0.5"
4448
}
4549
}

packages/c-badge/tests/__snapshots__/c-badge.test.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`should render properly 1`] = `
44
<DocumentFragment>
55
<div
6-
class="css-2q4iwi"
6+
class="css-1f1oimr"
77
>
88
New !
99
</div>

packages/c-button/package.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,17 @@
2323
"watch:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types --watch --incremental"
2424
},
2525
"dependencies": {
26-
"@chakra-ui/styled-system": "^1.4.1",
2726
"@chakra-ui/vue-system": "*",
2827
"@chakra-ui/vue-utils": "*",
2928
"@chakra-ui/c-icon": "*",
3029
"@chakra-ui/c-spinner": "*"
30+
},
31+
"devDependencies": {
32+
"@chakra-ui/vue-system": "*",
33+
"vue": "^3.0.5"
34+
},
35+
"peerDependencies": {
36+
"@chakra-ui/vue-system": "*",
37+
"vue": "^3.0.5"
3138
}
3239
}

packages/c-button/src/button.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import { defineComponent, PropType, computed, cloneVNode, h } from 'vue'
2-
import { chakra, useStyleConfig, ThemingProps } from '@chakra-ui/vue-system'
3-
import { SystemStyleObject } from '@chakra-ui/styled-system'
2+
import {
3+
chakra,
4+
useStyleConfig,
5+
ThemingProps,
6+
SystemStyleObject,
7+
} from '@chakra-ui/vue-system'
48
import { dataAttr, filterUndefined, mergeWith } from '@chakra-ui/vue-utils'
59
import { useButtonGroup } from './button-group'
610
import { CIcon } from '@chakra-ui/c-icon'
@@ -114,7 +118,9 @@ const CButton = defineComponent({
114118
label: 'button',
115119
}),
116120
{
117-
disabled: props.isDisabled || props.isLoading,
121+
...((props.isDisabled || props.isLoading) && {
122+
disabled: props.isDisabled || props.isLoading,
123+
}),
118124
type: props.as === 'button' ? undefined : props.type,
119125
dataActive: dataAttr(props.isActive),
120126
dataLoading: dataAttr(props.isLoading),

packages/c-button/tests/__snapshots__/c-button-group.test.ts.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
exports[`should render properly 1`] = `
44
<DocumentFragment>
55
<div
6-
class="chakra-button__group css-p4lcqj"
6+
class="chakra-button__group css-v5zn0n"
77
role="group"
88
>
99
<button
10-
class="chakra-button css-byqix5"
10+
class="chakra-button css-1bczd7i"
1111
>
1212
<!---->
1313
<!---->
1414
Save
1515
<!---->
1616
</button>
1717
<button
18-
class="chakra-button css-1twjehy"
18+
class="chakra-button css-1rwqev2"
1919
>
2020
<!---->
2121
<!---->

0 commit comments

Comments
 (0)