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

Commit c460c48

Browse files
codebender828codebender828
authored
Merge branch 'develop' into all-contributors/add-carwack
2 parents 4092711 + 5e8de84 commit c460c48

Some content is hidden

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

95 files changed

+563
-161
lines changed

‎.changeset/config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"changelog": [
44
"@changesets/changelog-github",
55
{ "repo": "chakra-ui/chakra-ui-vue" }
6-
],
6+
],
77
"commit": false,
88
"linked": [],
9-
"access": "restricted",
9+
"access": "public",
1010
"baseBranch": "master",
1111
"updateInternalDependencies": "patch"
1212
}

‎.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
uses: changesets/action@master
5252
with:
5353
publish: yarn release
54+
title: "chore(release): version packages"
5455
commit: "chore(release): version packages"
5556
env:
5657
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ lerna-debug.log
3636
config/.env
3737
packages/chakra-ui-nuxt/.github
3838
packages/chakra-ui-docs/static/sw.js
39-
website/static/sw.js
39+
website/static/sw.js
40+
.npmrc

‎package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@
108108
"@babel/plugin-transform-parameters": "^7.7.4",
109109
"@babel/preset-env": "^7.9.5",
110110
"@babel/runtime-corejs2": "^7.8.7",
111+
"@changesets/changelog-github": "^0.2.7",
111112
"@changesets/cli": "^2.7.1",
113+
"@changesets/get-github-info": "^0.4.4",
112114
"@commitlint/cli": "^8.2.0",
113115
"@commitlint/config-conventional": "^8.2.0",
114116
"@emotion/babel-plugin": "^11.1.2",
@@ -131,6 +133,7 @@
131133
"@vue/devtools": "^5.3.3",
132134
"@vue/eslint-config-standard": "^4.0.0",
133135
"@vue/test-utils": "1.0.0-beta.29",
136+
"add": "^2.0.6",
134137
"babel-core": "7.0.0-bridge.0",
135138
"babel-eslint": "^10.1.0",
136139
"babel-helper-vue-jsx-merge-props": "^2.0.3",
@@ -167,7 +170,8 @@
167170
"v-scroll-lock": "^1.1.0",
168171
"vue-loader": "^15.7.1",
169172
"vue-lorem-ipsum": "^0.0.1",
170-
"watch": "^1.0.2"
173+
"watch": "^1.0.2",
174+
"yarn": "^1.22.10"
171175
},
172176
"keywords": [
173177
"vue",

‎packages/chakra-ui-core/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Change Log
22

3+
## 0.7.4
4+
5+
### Patch Changes
6+
7+
- [`951906a`](https://github.com/chakra-ui/chakra-ui-vue/commit/951906a61deabdcf1d3f04b7f8f9fdeaad1f3841) [#375](https://github.com/chakra-ui/chakra-ui-vue/pull/375) Thanks [@codebender828](https://github.com/codebender828)! - Added support for Feather Icons to Nuxt.js
8+
9+
* fix(nuxt): nuxt module icon parsing
10+
311
## 0.7.3
412

513
## 0.7.2

‎packages/chakra-ui-core/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"name": "@chakra-ui/vue",
3-
"version": "0.7.3",
3+
"version": "0.7.4",
44
"description": "Build Accessible and Responsive Vue.js websites and applications with speed ⚡️",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",
7+
"types": "types/index.d.ts",
78
"sideEffects": false,
89
"maintainers": [
910
"Jonathan Bakebwa <jonas@akkadu-team.com>"
@@ -27,7 +28,8 @@
2728
},
2829
"files": [
2930
"dist",
30-
"src"
31+
"src",
32+
"types"
3133
],
3234
"bundle-phobia": {
3335
"max-size": "85KB",

‎packages/chakra-ui-core/src/CAccordion/CAccordion.stories.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ storiesOf('UI | Accordion', module)
3232
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
3333
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
3434
commodo consequat.
35+
</CAccordionPanel>
3536
</CAccordionItem>
3637
</CAccordion>
3738
`

‎packages/chakra-ui-core/src/CTransition/Transition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ const CAnimateHeight = {
486486
height: [this.initialHeight || 0, this.finalHeight || height],
487487
easing: this.enterEasing,
488488
duration: this.duration,
489-
complete
489+
complete: () => { el.style.height = this.finalHeight || 'auto' }
490490
})
491491
})
492492
},

‎packages/chakra-ui-core/src/Chakra/index.js

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,9 @@ import { createClientDirective } from '../directives'
66
import defaultTheme from '../../../chakra-ui-theme/src'
77
import useToast from '../CToast'
88

9-
/**
10-
* @typedef {Object} Theme Chakra UI Theme object
11-
* @property {Object} breakpoints
12-
* @property {Object} zIndices
13-
* @property {Object} radii
14-
* @property {Object} opacity
15-
* @property {Object} borders
16-
* @property {Object} colors
17-
* @property {Object} borderWidths
18-
* @property {Object} sizes
19-
* @property {Object} shadows
20-
* @property {Object} space
21-
* @property {Object} fontSizes
22-
* @property {Object} fonts
23-
* @property {Object} fontWeights
24-
* @property {Object} lineHeights
25-
* @property {Object} letterSpacings
26-
*/
27-
28-
/**
29-
* @typedef {Object} Options
30-
* @property {Theme} theme
31-
* @property {Theme} extendTheme
32-
* @property {Object} icons
33-
* @property {Object} icons.extend
34-
* @property {String} icons.iconPack
35-
* @property {Object} icons.iconSet
36-
*
37-
*/
38-
399
/**
4010
* Chakra-ui Component library plugin
41-
* @type {Chakra}
11+
* @type {import("../../types").default}
4212
*/
4313
const Chakra = {
4414
/**

‎packages/chakra-ui-core/src/utils/icons.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { merge } from 'lodash-es'
55
* @param {Object} iconSet - Registered Icons object
66
* @returns {Object}
77
*/
8-
const parseIcons = (iconSet) => {
8+
const parseIcons = (iconSet = {}) => {
99
const parseIcon = (iconObject) => {
1010
const { icon } = iconObject
1111
// Is library icon
@@ -43,7 +43,7 @@ const parseIcons = (iconSet) => {
4343
export const parsePackIcons = (iconSet) => {
4444
// TODO: Add support for other icon libraries
4545
// - Material Icons
46-
// - Tailwind Icons
46+
// - Tailwind Icons (Hero icons)
4747
const packIcons = parseIcons(iconSet)
4848
return packIcons
4949
}

‎packages/chakra-ui-core/types/chakra.d.ts

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import { PluginObject } from "vue"
2+
3+
export type Theme = {
4+
breakpoints: any
5+
zIndices: any
6+
radii: any
7+
opacity: any
8+
borders: any
9+
colors: any
10+
borderWidths: any
11+
sizes: any
12+
shadows: any
13+
space: any
14+
fontSizes: any
15+
fonts: any
16+
fontWeights: any
17+
lineHeights: any
18+
letterSpacings: any
19+
}
20+
21+
export type Options = {
22+
theme: Theme
23+
extendTheme: Theme
24+
icons: {
25+
extend: any
26+
iconPack: string
27+
iconSet: any
28+
}
29+
}
30+
31+
export type Chakra = PluginObject<Options>
32+
33+
declare let chakra: Chakra
34+
export default chakra

‎packages/chakra-ui-core/types/component.d.ts

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
import Vue from 'vue'
2+
3+
export class CAccordion extends Vue {}
4+
export class CAccordionHeader extends Vue {}
5+
export class CAccordionIcon extends Vue {}
6+
export class CAccordionItem extends Vue {}
7+
export class CAccordionPanel extends Vue {}
8+
export class CAlert extends Vue {}
9+
export class CAlertDescription extends Vue {}
10+
export class CAlertDialog extends Vue {}
11+
export class CAlertDialogBody extends Vue {}
12+
export class CAlertDialogCloseButton extends Vue {}
13+
export class CAlertDialogContent extends Vue {}
14+
export class CAlertDialogFooter extends Vue {}
15+
export class CAlertDialogHeader extends Vue {}
16+
export class CAlertDialogOverlay extends Vue {}
17+
export class CAlertIcon extends Vue {}
18+
export class CAlertTitle extends Vue {}
19+
export class CAnimateHeight extends Vue {}
20+
export class CAspectRatioBox extends Vue {}
21+
export class CAvatar extends Vue {}
22+
export class CAvatarBadge extends Vue {}
23+
export class CAvatarGroup extends Vue {}
24+
export class CBadge extends Vue {}
25+
export class CBox extends Vue {}
26+
export class CBreadcrumb extends Vue {}
27+
export class CBreadcrumbItem extends Vue {}
28+
export class CBreadcrumbLink extends Vue {}
29+
export class CBreadcrumbSeparator extends Vue {}
30+
export class CButton extends Vue {}
31+
export class CButtonGroup extends Vue {}
32+
export class CCheckbox extends Vue {}
33+
export class CCheckboxGroup extends Vue {}
34+
export class CCircularProgress extends Vue {}
35+
export class CCircularProgressLabel extends Vue {}
36+
export class CCloseButton extends Vue {}
37+
export class CCode extends Vue {}
38+
export class CCollapse extends Vue {}
39+
export class CColorModeProvider extends Vue {}
40+
export class CControlBox extends Vue {}
41+
export class CDarkMode extends Vue {}
42+
export class CDivider extends Vue {}
43+
export class CDrawer extends Vue {}
44+
export class CDrawerBody extends Vue {}
45+
export class CDrawerCloseButton extends Vue {}
46+
export class CDrawerContent extends Vue {}
47+
export class CDrawerFooter extends Vue {}
48+
export class CDrawerHeader extends Vue {}
49+
export class CDrawerOverlay extends Vue {}
50+
export class CEditable extends Vue {}
51+
export class CEditableInput extends Vue {}
52+
export class CEditablePreview extends Vue {}
53+
export class CFade extends Vue {}
54+
export class CFlex extends Vue {}
55+
export class CFormControl extends Vue {}
56+
export class CFormErrorMessage extends Vue {}
57+
export class CFormHelperText extends Vue {}
58+
export class CFormLabel extends Vue {}
59+
export class CFragment extends Vue {}
60+
export class CGrid extends Vue {}
61+
export class CHeading extends Vue {}
62+
export class CIcon extends Vue {}
63+
export class CIconButton extends Vue {}
64+
export class CImage extends Vue {}
65+
export class CInput extends Vue {}
66+
export class CInputAddon extends Vue {}
67+
export class CInputElement extends Vue {}
68+
export class CInputGroup extends Vue {}
69+
export class CInputLeftAddon extends Vue {}
70+
export class CInputLeftElement extends Vue {}
71+
export class CInputRightAddon extends Vue {}
72+
export class CInputRightElement extends Vue {}
73+
export class CLightMode extends Vue {}
74+
export class CLink extends Vue {}
75+
export class CList extends Vue {}
76+
export class CListIcon extends Vue {}
77+
export class CListItem extends Vue {}
78+
export class CMenu extends Vue {}
79+
export class CMenuButton extends Vue {}
80+
export class CMenuDivider extends Vue {}
81+
export class CMenuGroup extends Vue {}
82+
export class CMenuItem extends Vue {}
83+
export class CMenuItemOption extends Vue {}
84+
export class CMenuList extends Vue {}
85+
export class CMenuOptionGroup extends Vue {}
86+
export class CModal extends Vue {}
87+
export class CModalBody extends Vue {}
88+
export class CModalCloseButton extends Vue {}
89+
export class CModalContent extends Vue {}
90+
export class CModalFooter extends Vue {}
91+
export class CModalHeader extends Vue {}
92+
export class CModalOverlay extends Vue {}
93+
export class CNumberDecrementStepper extends Vue {}
94+
export class CNumberIncrementStepper extends Vue {}
95+
export class CNumberInput extends Vue {}
96+
export class CNumberInputField extends Vue {}
97+
export class CNumberInputStepper extends Vue {}
98+
export class CPopover extends Vue {}
99+
export class CPopoverArrow extends Vue {}
100+
export class CPopoverBody extends Vue {}
101+
export class CPopoverCloseButton extends Vue {}
102+
export class CPopoverContent extends Vue {}
103+
export class CPopoverFooter extends Vue {}
104+
export class CPopoverHeader extends Vue {}
105+
export class CPopoverTrigger extends Vue {}
106+
export class CPopper extends Vue {}
107+
export class CPopperArrow extends Vue {}
108+
export class CPortal extends Vue {}
109+
export class CProgress extends Vue {}
110+
export class CProgressLabel extends Vue {}
111+
export class CPseudoBox extends Vue {}
112+
export class CRadio extends Vue {}
113+
export class CRadioButtonGroup extends Vue {}
114+
export class CRadioGroup extends Vue {}
115+
export class CReset extends Vue {}
116+
export class CRevealHeight extends Vue {}
117+
export class CScale extends Vue {}
118+
export class CSelect extends Vue {}
119+
export class CSimpleGrid extends Vue {}
120+
export class CSlide extends Vue {}
121+
export class CSlideIn extends Vue {}
122+
export class CSlider extends Vue {}
123+
export class CSliderFilledTrack extends Vue {}
124+
export class CSliderThumb extends Vue {}
125+
export class CSliderTrack extends Vue {}
126+
export class CSpinner extends Vue {}
127+
export class CStack extends Vue {}
128+
export class CStat extends Vue {}
129+
export class CStatArrow extends Vue {}
130+
export class CStatGroup extends Vue {}
131+
export class CStatHelperText extends Vue {}
132+
export class CStatLabel extends Vue {}
133+
export class CStatNumber extends Vue {}
134+
export class CSwitch extends Vue {}
135+
export class CTab extends Vue {}
136+
export class CTabList extends Vue {}
137+
export class CTabPanel extends Vue {}
138+
export class CTabPanels extends Vue {}
139+
export class CTabs extends Vue {}
140+
export class CTag extends Vue {}
141+
export class CTagCloseButton extends Vue {}
142+
export class CTagIcon extends Vue {}
143+
export class CTagLabel extends Vue {}
144+
export class CText extends Vue {}
145+
export class CTextarea extends Vue {}
146+
export class CThemeProvider extends Vue {}
147+
export class CTooltip extends Vue {}
148+
export class CVisuallyHidden extends Vue {}

‎packages/chakra-ui-core/types/index.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import Chakra from "./chakra"
2+
3+
export * from './component'
4+
export default Chakra

‎packages/chakra-ui-nuxt/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Change Log
22

3+
## 0.2.4
4+
5+
### Patch Changes
6+
7+
- [`951906a`](https://github.com/chakra-ui/chakra-ui-vue/commit/951906a61deabdcf1d3f04b7f8f9fdeaad1f3841) [#375](https://github.com/chakra-ui/chakra-ui-vue/pull/375) Thanks [@codebender828](https://github.com/codebender828)! - Added support for Feather Icons to Nuxt.js
8+
9+
* fix(nuxt): nuxt module icon parsing
10+
11+
* Updated dependencies [[`951906a`](https://github.com/chakra-ui/chakra-ui-vue/commit/951906a61deabdcf1d3f04b7f8f9fdeaad1f3841)]:
12+
- @chakra-ui/vue@0.7.4
13+
314
## 0.2.3
415

516
### Patch Changes

‎packages/chakra-ui-nuxt/lib/module.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module.exports = function (moduleOptions) {
1919

2020
// Resolve icons
2121
let packIcons = {}
22-
if (options.icons && options.icons.iconPack) {
22+
if (options.icons) {
2323
packIcons = parsePackIcons(options.icons.iconSet)
2424
}
2525

0 commit comments

Comments
 (0)