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

Commit d6a5e29

Browse files
codebender828codebender828
authored
Merge pull request #372 from chakra-ui/develop
fix: nuxt module icon registration for @chakra-ui/nuxt
2 parents c262bd3 + 9f57dbc commit d6a5e29

File tree

16 files changed

+1477
-42
lines changed

16 files changed

+1477
-42
lines changed

‎.changeset/config.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
2-
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3-
"changelog": "@changesets/cli/changelog",
2+
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3+
"changelog": [
4+
"@changesets/changelog-github",
5+
{ "repo": "chakra-ui/chakra-ui-vue" }
6+
],
47
"commit": false,
58
"linked": [],
69
"access": "restricted",

‎.github/workflows/test.yml renamed to ‎.github/workflows/pr.yml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
33

4-
name: Build & Test Components
4+
name: PR Workflow
55

66
on:
7-
# Trigger the workflow on push or pull request,
8-
# but only for the master branch
9-
push:
7+
pull_request:
108
branches:
9+
- master
1110
- develop
12-
pull_request:
11+
push:
1312
branches:
1413
- develop
1514

@@ -20,15 +19,24 @@ jobs:
2019
matrix:
2120
node-version: [12.x]
2221
steps:
23-
- uses: actions/checkout@v2
22+
- name: Checkout
23+
uses: actions/checkout@v2
24+
2425
- name: Use Node.js ${{ matrix.node-version }}
2526
uses: actions/setup-node@v1
2627
with:
2728
node-version: ${{ matrix.node-version }}
28-
- run: yarn
29-
- run: yarn bootstrap
30-
- run: yarn lint
31-
- run: yarn build --if-present
32-
- run: yarn test
29+
30+
- name: Install dependencies
31+
run: yarn install --frozen-lockfile && yarn bootstrap
32+
33+
- name: Lint types and code
34+
run: yarn lint
35+
36+
- name: Build packages
37+
run: yarn build
38+
39+
- name: Run tests
40+
run: yarn test
3341
env:
3442
CI: true

‎.github/workflows/release.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ name: Release
55

66
on:
77
push:
8-
branches:
9-
- master
108
paths:
119
- "packages/**"
10+
branches:
11+
- master
1212

1313
jobs:
1414
release:
@@ -28,10 +28,8 @@ jobs:
2828
node-version: 12.x
2929

3030
- name: Install dependencies
31-
run: yarn
31+
run: yarn install --frozen-lockfile && yarn bootstrap
3232

33-
- name: Bootstrap
34-
run: yarn bootstrap
3533

3634
- name: Linting
3735
run: yarn lint
@@ -46,8 +44,8 @@ jobs:
4644

4745
- name: Setup CI Git User
4846
run: |
49-
git config --global user.email "[email protected]"
5047
git config --global user.name "codebender828"
48+
git config --global user.email "[email protected]"
5149
5250
- name: Publish packages
5351
uses: changesets/action@master
@@ -56,4 +54,4 @@ jobs:
5654
commit: "chore(release): version packages"
5755
env:
5856
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
59-
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
57+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"test:core": "jest",
3131
"test:module": "yarn workspace @chakra-ui/nuxt test",
3232
"test": "yarn test:core && yarn test:module",
33-
"release": "changeset publish",
33+
"release": "yarn changeset publish",
3434
"clean": "lerna run clean",
3535
"storybook": "cross-env STORYBOOK_VUE_DEV_TOOLS=1 start-storybook -p 9000",
3636
"storybook:devtools": "vue-devtools",
@@ -83,7 +83,7 @@
8383
"mdx-vue-loader": "^1.0.2",
8484
"node-fetch": "^2.6.0",
8585
"node-sass": "^4.13.1",
86-
"nuxt": "^2.13.3",
86+
"nuxt": "2.14.6",
8787
"portal-vue": "^2.1.6",
8888
"prismjs": "^1.19.0",
8989
"register-service-worker": "^1.6.2",

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

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

3+
## 0.7.3
4+
5+
## 0.7.2
6+
7+
### Patch Changes
8+
9+
- 5db9572: Fix build for nuxt.js
10+
- 5db9572: Export utils
11+
12+
## 0.7.2-next.0
13+
14+
### Patch Changes
15+
16+
- Fix build for nuxt.js
17+
- Export utils
18+
319
## 0.7.1
420

521
### Patch Changes

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"name": "@chakra-ui/vue",
3-
"version": "0.7.1",
3+
"version": "0.7.3",
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-
"unpkg": "dist/umd/index.min.js",
87
"sideEffects": false,
98
"maintainers": [
109
"Jonathan Bakebwa <[email protected]>"

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,10 @@ export { default as defaultTheme } from '@chakra-ui/theme-vue'
124124

125125
// Props objects
126126
export { baseProps as boxProps, pseudoProps as pseudoBoxProps } from './config'
127+
128+
// Internal icons
129+
export { parsePackIcons } from './utils/icons'
130+
export { default as internalIcons } from './lib/internal-icons'
131+
132+
// Directives
133+
export { createServerDirective, createClientDirective } from './directives/chakra.directive'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import merge from 'lodash-es/merge'
1+
import { merge } from 'lodash-es'
22

33
/**
44
* @description Custom parse all Icons provided by user

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

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

3+
## 0.2.3
4+
5+
### Patch Changes
6+
7+
- e7fd349: Fixes registration of internal icons
8+
- @chakra-ui/vue@0.7.3
9+
10+
## 0.2.3-next.0
11+
12+
### Patch Changes
13+
14+
- Fixes registration of internal icons
15+
16+
## 0.2.2
17+
18+
### Patch Changes
19+
20+
- 5db9572: Export utils
21+
- Updated dependencies [5db9572]
22+
- Updated dependencies [5db9572]
23+
- @chakra-ui/vue@0.7.2
24+
25+
## 0.2.2-next.0
26+
27+
### Patch Changes
28+
29+
- Export utils
30+
- Updated dependencies [undefined]
31+
- Updated dependencies [undefined]
32+
- @chakra-ui/vue@0.7.2-next.0
33+
334
## 0.2.1
435

536
### Patch Changes

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
const { resolve } = require('path')
22
const defu = require('defu')
3-
const { defaultTheme } = require('@chakra-ui/vue')
3+
const { defaultTheme, parsePackIcons, internalIcons, createServerDirective } = require('@chakra-ui/vue')
44
const { ChakraLoaderPlugin } = require('chakra-loader')
5-
const { parsePackIcons } = require('@chakra-ui/vue/src/utils/icons')
6-
const internalIcons = require('@chakra-ui/vue/src/lib/internal-icons')
7-
const { createServerDirective } = require('@chakra-ui/vue/src/directives/chakra.directive')
85

96
module.exports = function (moduleOptions) {
107
const { nuxt } = this
@@ -42,7 +39,7 @@ module.exports = function (moduleOptions) {
4239

4340
// Icons
4441
const icons = {
45-
...internalIcons.default,
42+
...internalIcons,
4643
...packIcons,
4744
...(options.icons && options.icons.extend)
4845
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@chakra-ui/nuxt",
3-
"version": "0.2.1",
3+
"version": "0.2.3",
44
"description": "Chakra UI Module for Nuxt.js",
55
"repository": "https://github.com/chakra-ui/chakra-ui-vue",
66
"license": "MIT",
@@ -18,7 +18,7 @@
1818
"test": "jest"
1919
},
2020
"dependencies": {
21-
"@chakra-ui/vue": "^0.7.1",
21+
"@chakra-ui/vue": "^0.7.3",
2222
"chakra-loader": "latest",
2323
"@emotion/css": "^11.0.0"
2424
},

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

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

3+
## 0.2.9
4+
5+
## 0.2.8
6+
37
## 0.2.7
48

59
## 0.2.6

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@chakra-ui/theme-vue",
3-
"version": "0.2.7",
3+
"version": "0.2.9",
44
"description": "Default theme for @chakra-ui/vue default theme object",
55
"author": {
66
"name": "Jonathan Bakebwa",

‎website/CHANGELOG.md

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

3+
## 0.5.4
4+
5+
### Patch Changes
6+
7+
- @chakra-ui/vue@0.7.3
8+
- @chakra-ui/theme-vue@0.2.9
9+
10+
## 0.5.3
11+
12+
### Patch Changes
13+
14+
- Updated dependencies [5db9572]
15+
- Updated dependencies [5db9572]
16+
- @chakra-ui/vue@0.7.2
17+
- @chakra-ui/theme-vue@0.2.8
18+
19+
## 0.5.3-next.1
20+
21+
### Patch Changes
22+
23+
- Updated dependencies [undefined]
24+
- Updated dependencies [undefined]
25+
- @chakra-ui/vue@0.7.2-next.0
26+
327
## 0.5.3-next.0
428

529
### Patch Changes

‎website/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "chakra-ui-docs",
3-
"version": "0.5.3-next.0",
3+
"version": "0.5.4",
44
"description": "Chakra UI Vue documentation site",
55
"private": true,
66
"scripts": {
@@ -26,12 +26,12 @@
2626
}
2727
},
2828
"dependencies": {
29-
"@chakra-ui/theme-vue": "^0.2.7",
30-
"@chakra-ui/vue": "^0.7.0-next.3",
29+
"@chakra-ui/theme-vue": "^0.2.9",
30+
"@chakra-ui/vue": "^0.7.3",
3131
"@emotion/css": "^11.0.0",
3232
"@mdx-js/vue-loader": "^1.6.1",
3333
"@nuxtjs/dotenv": "^1.4.0",
34-
"@nuxtjs/emotion": "^0.0.1",
34+
"@nuxtjs/emotion": "^0.1.0",
3535
"@nuxtjs/now-builder": "^0.17.0",
3636
"@nuxtjs/google-analytics": "^2.4.0",
3737
"@nuxtjs/pwa": "^3.0.0-0",

0 commit comments

Comments
 (0)