Merge pull request #372 from chakra-ui/develop

fix: nuxt module icon registration for @chakra-ui/nuxt

Author: codebender828

.changeset/config.json

@@ -1,6 +1,9 @@
 {
-  "$schema": "https://unpkg.com/@changesets/config@1.1.0/schema.json",
-  "changelog": "@changesets/cli/changelog",
+  "$schema": "https://unpkg.com/@changesets/config@1.4.0/schema.json",
+  "changelog": [
+    "@changesets/changelog-github",
+    { "repo": "chakra-ui/chakra-ui-vue" }
+    ],
   "commit": false,
   "linked": [],
   "access": "restricted",

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

@@ -1,15 +1,14 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: Build & Test Components
+name: PR Workflow
 
 on:
-  # Trigger the workflow on push or pull request,
-  # but only for the master branch
-  push:
+  pull_request:
     branches:
+      - master
       - develop
-  pull_request:
+  push:
     branches:
       - develop
 
@@ -20,15 +19,24 @@ jobs:
       matrix:
         node-version: [12.x]
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
+
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: yarn
-    - run: yarn bootstrap
-    - run: yarn lint
-    - run: yarn build --if-present
-    - run: yarn test
+
+    - name: Install dependencies
+      run: yarn install --frozen-lockfile && yarn bootstrap
+
+    - name: Lint types and code
+      run: yarn lint
+
+    - name: Build packages
+      run: yarn build
+
+    - name: Run tests
+      run: yarn test
       env:
         CI: true

.github/workflows/release.yml

@@ -5,10 +5,10 @@ name: Release
 
 on:
   push:
-    branches:
-      - master
     paths:
       - "packages/**"
+    branches:
+      - master
 
 jobs:
   release:
@@ -28,10 +28,8 @@ jobs:
         node-version: 12.x
 
     - name: Install dependencies
-      run: yarn
+      run: yarn install --frozen-lockfile && yarn bootstrap
 
-    - name: Bootstrap
-      run: yarn bootstrap
 
     - name: Linting
       run: yarn lint
@@ -46,8 +44,8 @@ jobs:
 
     - name: Setup CI Git User
       run: |
-        git config --global user.email "jbakebwa@gmail.com"
         git config --global user.name "codebender828"
+        git config --global user.email "jbakebwa@163.com"
     
     - name: Publish packages
       uses: changesets/action@master
@@ -56,4 +54,4 @@ jobs:
         commit: "chore(release): version packages"
       env:
         NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}    
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

package.json

@@ -30,7 +30,7 @@
     "test:core": "jest",
     "test:module": "yarn workspace @chakra-ui/nuxt test",
     "test": "yarn test:core && yarn test:module",
-    "release": "changeset publish",
+    "release": "yarn changeset publish",
     "clean": "lerna run clean",
     "storybook": "cross-env STORYBOOK_VUE_DEV_TOOLS=1 start-storybook -p 9000",
     "storybook:devtools": "vue-devtools",
@@ -83,7 +83,7 @@
     "mdx-vue-loader": "^1.0.2",
     "node-fetch": "^2.6.0",
     "node-sass": "^4.13.1",
-    "nuxt": "^2.13.3",
+    "nuxt": "2.14.6",
     "portal-vue": "^2.1.6",
     "prismjs": "^1.19.0",
     "register-service-worker": "^1.6.2",

packages/chakra-ui-core/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## 0.7.3
+
+## 0.7.2
+
+### Patch Changes
+
+- 5db9572: Fix build for nuxt.js
+- 5db9572: Export utils
+
+## 0.7.2-next.0
+
+### Patch Changes
+
+- Fix build for nuxt.js
+- Export utils
+
 ## 0.7.1
 
 ### Patch Changes

packages/chakra-ui-core/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@chakra-ui/vue",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Build Accessible and Responsive Vue.js websites and applications with speed ⚡️",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
-  "unpkg": "dist/umd/index.min.js",
   "sideEffects": false,
   "maintainers": [
     "Jonathan Bakebwa <jonas@akkadu-team.com>"

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

@@ -124,3 +124,10 @@ export { default as defaultTheme } from '@chakra-ui/theme-vue'
 
 // Props objects
 export { baseProps as boxProps, pseudoProps as pseudoBoxProps } from './config'
+
+// Internal icons
+export { parsePackIcons } from './utils/icons'
+export { default as internalIcons } from './lib/internal-icons'
+
+// Directives
+export { createServerDirective, createClientDirective } from './directives/chakra.directive'

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

@@ -1,4 +1,4 @@
-import merge from 'lodash-es/merge'
+import { merge } from 'lodash-es'
 
 /**
  * @description Custom parse all Icons provided by user

packages/chakra-ui-nuxt/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Change Log
 
+## 0.2.3
+
+### Patch Changes
+
+- e7fd349: Fixes registration of internal icons
+  - @chakra-ui/vue@0.7.3
+
+## 0.2.3-next.0
+
+### Patch Changes
+
+- Fixes registration of internal icons
+
+## 0.2.2
+
+### Patch Changes
+
+- 5db9572: Export utils
+- Updated dependencies [5db9572]
+- Updated dependencies [5db9572]
+  - @chakra-ui/vue@0.7.2
+
+## 0.2.2-next.0
+
+### Patch Changes
+
+- Export utils
+- Updated dependencies [undefined]
+- Updated dependencies [undefined]
+  - @chakra-ui/vue@0.7.2-next.0
+
 ## 0.2.1
 
 ### Patch Changes

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

@@ -1,10 +1,7 @@
 const { resolve } = require('path')
 const defu = require('defu')
-const { defaultTheme } = require('@chakra-ui/vue')
+const { defaultTheme, parsePackIcons, internalIcons, createServerDirective } = require('@chakra-ui/vue')
 const { ChakraLoaderPlugin } = require('chakra-loader')
-const { parsePackIcons } = require('@chakra-ui/vue/src/utils/icons')
-const internalIcons = require('@chakra-ui/vue/src/lib/internal-icons')
-const { createServerDirective } = require('@chakra-ui/vue/src/directives/chakra.directive')
 
 module.exports = function (moduleOptions) {
   const { nuxt } = this
@@ -42,7 +39,7 @@ module.exports = function (moduleOptions) {
 
   // Icons
   const icons = {
-    ...internalIcons.default,
+    ...internalIcons,
     ...packIcons,
     ...(options.icons && options.icons.extend)
   }