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

Commit a0361a5

Browse files
Merge pull request #371 from chakra-ui/fix/nuxt-icons
fix(nuxt): register internal icons
2 parents bd321c4 + d95852f commit a0361a5

File tree

7 files changed

+50
-20
lines changed

7 files changed

+50
-20
lines changed

.changeset/eight-tables-vanish.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@chakra-ui/nuxt': patch
3+
---
4+
5+
Fixes registration of internal icons

.changeset/pre.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"mode": "pre",
3+
"tag": "next",
4+
"initialVersions": {
5+
"@chakra-ui/vue": "0.7.2",
6+
"@chakra-ui/nuxt": "0.2.2",
7+
"@chakra-ui/theme-vue": "0.2.8",
8+
"chakra-ui-docs": "0.5.3"
9+
},
10+
"changesets": [
11+
"eight-tables-vanish"
12+
]
13+
}
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}}

packages/chakra-ui-nuxt/CHANGELOG.md

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

3+
## 0.2.3-next.0
4+
5+
### Patch Changes
6+
7+
- Fixes registration of internal icons
8+
39
## 0.2.2
410

511
### Patch Changes

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

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

4040
// Icons
4141
const icons = {
42-
...internalIcons.default,
42+
...internalIcons,
4343
...packIcons,
4444
...(options.icons && options.icons.extend)
4545
}

packages/chakra-ui-nuxt/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/nuxt",
3-
"version": "0.2.2",
3+
"version": "0.2.3-next.0",
44
"description": "Chakra UI Module for Nuxt.js",
55
"repository": "https://github.com/chakra-ui/chakra-ui-vue",
66
"license": "MIT",

0 commit comments

Comments
 (0)