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

Commit 16bf3f0

Browse files
carwackcarwack
committed
Merge branch 'develop' into docs/update-landing-page
2 parents a83923c + 562ee83 commit 16bf3f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1248
-6994
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ to: packages/<%=h.changeCase.paramCase(name)%>/package.json
2929
},
3030
"sideEffects": false,
3131
"scripts": {
32-
"build": "concurrently yarn:build:*",
32+
"build": "rimraf ./dist && concurrently yarn:build:*",
3333
"build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts,.tsx -d dist/esm --source-maps",
3434
"build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts,.tsx -d dist/cjs --source-maps",
3535
"build:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types",
@@ -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
},

‎_templates/generator/module/package.json.ejs.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ to: packages/<%=h.changeCase.paramCase(name)%>/package.json
1717
"author": "Jonathan Bakebwa [email protected]",
1818
"license": "MIT",
1919
"scripts": {
20-
"build": "concurrently yarn:build:*",
20+
"build": "rimraf ./dist && concurrently yarn:build:*",
2121
"build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts,.tsx -d dist/esm --source-maps",
2222
"build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts,.tsx -d dist/cjs --source-maps",
2323
"watch": "concurrently yarn:watch:*",

‎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-accordion/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Jonathan Bakebwa [email protected]",
1414
"license": "MIT",
1515
"scripts": {
16-
"build": "concurrently yarn:build:*",
16+
"build": "rimraf ./dist && concurrently yarn:build:*",
1717
"build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts,.tsx -d dist/esm --source-maps",
1818
"build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts,.tsx -d dist/cjs --source-maps",
1919
"build:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types"

‎packages/c-alert/package.json

Lines changed: 9 additions & 3 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",
@@ -14,7 +13,7 @@
1413
"author": "Jonathan Bakebwa [email protected]",
1514
"license": "MIT",
1615
"scripts": {
17-
"build": "concurrently yarn:build:*",
16+
"build": "rimraf ./dist && concurrently yarn:build:*",
1817
"build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts,.tsx -d dist/esm --source-maps",
1918
"build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts,.tsx -d dist/cjs --source-maps",
2019
"build:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types",
@@ -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: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,31 @@
11
import { h, defineComponent, PropType, computed } from 'vue'
22
import {
33
chakra,
4-
ColorScheme,
5-
DeepComponentThemeConfig,
64
ThemingProps,
75
useMultiStyleConfig,
86
useStyles,
97
StylesProvider,
108
DOMElements,
9+
SystemStyleObject,
1110
} from '@chakra-ui/vue-system'
12-
import { SystemStyleObject } from '@chakra-ui/styled-system'
1311
import { createContext } from '@chakra-ui/vue-utils'
1412
import { CIcon } from '@chakra-ui/c-icon'
1513

1614
const STATUSES = {
1715
info: {
18-
colorScheme: 'blue' as ColorScheme,
16+
colorScheme: 'blue',
1917
icon: 'info',
2018
},
2119
success: {
22-
colorScheme: 'green' as ColorScheme,
20+
colorScheme: 'green',
2321
icon: 'check-circle',
2422
},
2523
warning: {
26-
colorScheme: 'orange' as ColorScheme,
24+
colorScheme: 'orange',
2725
icon: 'warning-alt',
2826
},
2927
error: {
30-
colorScheme: 'red' as ColorScheme,
28+
colorScheme: 'red',
3129
icon: 'warning',
3230
},
3331
}
@@ -63,18 +61,18 @@ export const CAlert = defineComponent({
6361
default: 'info',
6462
},
6563
colorScheme: {
66-
type: [String] as PropType<ColorScheme>,
64+
type: [String] as PropType<string>,
6765
},
6866
styleConfig: {
69-
type: [Object] as PropType<DeepComponentThemeConfig>,
67+
type: [Object] as PropType<any>,
7068
},
7169
variant: {
7270
type: [String] as PropType<AlertVariant>,
7371
default: 'solid',
7472
},
7573
},
7674
setup(props, { slots, attrs }) {
77-
const colorScheme: ColorScheme =
75+
const colorScheme: string =
7876
props.colorScheme || STATUSES[props.status].colorScheme
7977

8078
const themingProps: ThemingProps = {

‎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: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"sideEffects": false,
2727
"scripts": {
28-
"build": "concurrently yarn:build:*",
28+
"build": "rimraf ./dist && concurrently yarn:build:*",
2929
"build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts,.tsx -d dist/esm --source-maps",
3030
"build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts,.tsx -d dist/cjs --source-maps",
3131
"build:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types",
@@ -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: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Jonathan Bakebwa [email protected]",
1414
"license": "MIT",
1515
"scripts": {
16-
"build": "concurrently yarn:build:*",
16+
"build": "rimraf ./dist && concurrently yarn:build:*",
1717
"build:esm": "cross-env BABEL_ENV=esm babel src --root-mode upward --extensions .ts,.tsx,.tsx -d dist/esm --source-maps",
1818
"build:cjs": "cross-env BABEL_ENV=cjs babel src --root-mode upward --extensions .ts,.tsx,.tsx -d dist/cjs --source-maps",
1919
"build:types": "cross-env tsc --emitDeclarationOnly --declaration --declarationDir dist/types",
@@ -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
}

0 commit comments

Comments
 (0)