Merge branch 'develop' into all-contributors/add-carwack

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",

.eslintrc.js

@@ -3,7 +3,10 @@ module.exports = {
   env: {
     node: true
   },
-  plugins: ['testing-library'],
+  plugins: [
+    'testing-library',
+    '@emotion'
+  ],
   extends: [
     'plugin:vue/essential',
     '@vue/standard',
@@ -28,7 +31,8 @@ module.exports = {
         ]
       }
     ],
-    'template-curly-spacing': 0
+    'template-curly-spacing': 0,
+    '@emotion/pkg-renaming': 'error'
   },
   parserOptions: {
     parser: 'babel-eslint'

.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

@@ -1,61 +1,57 @@
 # 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: Release
 
 on:
   push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    paths:
+      - "packages/**"
+    branches:
+      - master
 
 jobs:
-  build:
+  release:
+    name: Release
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [12.x]
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+    - name: Checkout Repo
+      uses: actions/checkout@master
       with:
-        node-version: ${{ matrix.node-version }}
-    - run: yarn
-    - run: yarn bootstrap
-    - run: yarn lint
-    - run: yarn build --if-present
-    - run: yarn test
+        # This makes Actions fetch all Git history
+        # so that Changesets can generate changelogs with the correct commits
+        fetch-depth: 0
+
+    - name: Use Node.js 12.x
+      uses: actions/setup-node@master
+      with:
+        node-version: 12.x
+
+    - name: Install dependencies
+      run: yarn install --frozen-lockfile && yarn bootstrap
+
+
+    - name: Linting
+      run: yarn lint
+
+    - name: Building packages
+      run: yarn build
+
+    - name: Testing components
+      run: yarn test
       env:
         CI: true
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v1
-      - name: Setup Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12
-      - name: Install Dependencies
-        run: yarn
-      - name: Create Release Pull Request
-        uses: changesets/action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-          registry-url: https://registry.npmjs.org/
-      - run: yarn
-      - run: yarn build
-      - run: yarn publish-ci
-        env:
-          NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
+    - name: Setup CI Git User
+      run: |
+        git config --global user.name "codebender828"
+        git config --global user.email "jbakebwa@163.com"
+    
+    - name: Publish packages
+      uses: changesets/action@master
+      with:
+        publish: yarn release
+        commit: "chore(release): version packages"
+      env:
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitignore

@@ -35,4 +35,5 @@ lerna-debug.log
 .now
 config/.env
 packages/chakra-ui-nuxt/.github
-packages/chakra-ui-docs/static/sw.js
+packages/chakra-ui-docs/static/sw.js
+website/static/sw.js

.npmrc

@@ -7,59 +7,59 @@ import Canvas from './components/Canvas.vue'
 import storyBookTheme from './theme'
 
 import {
-  faBraille,
-  faAnchor,
-  faPlus,
-  faCoffee,
-  faAmbulance,
-  faCalendar,
-  faCar,
-  faCaretLeft,
-  faBolt,
-  faUserSlash,
-  faCheckCircle,
-  faCog,
-  faLock,
-  faEye,
-  faEyeSlash } from '@fortawesome/free-solid-svg-icons'
-
-import {
-  faChevronCircleUp,
-  faSearch,
-  faTimesCircle } from '@fortawesome/pro-light-svg-icons'
-
-import {
-  faGithub
-} from '@fortawesome/free-brands-svg-icons'
-
-import {
-  faDiscord
-} from '@fortawesome/free-brands-svg-icons'
+  feAnchor,
+  fePlus,
+  feShoppingBag,
+  feCalendar,
+  feShoppingCart,
+  feChevronLeft,
+  feStar,
+  feUserMinus,
+  feCheckCircle,
+  feSettings,
+  feLock,
+  feEye,
+  feSearch,
+  feEyeOff,
+  feGithub,
+  feAirplay,
+  feCloudRain,
+  feUploadCloud,
+  feMap,
+  feSend,
+  feServer
+} from 'feather-icons-paths'
 
 Vue.use(Chakra, {
   icons: {
-    iconPack: 'fa',
     iconSet: {
-      faBraille,
-      faAnchor,
-      faPlus,
-      faCoffee,
-      faAmbulance,
-      faCalendar,
-      faCar,
-      faCaretLeft,
-      faBolt,
-      faUserSlash,
-      faChevronCircleUp,
-      faSearch,
-      faTimesCircle,
-      faGithub,
-      faDiscord,
-      faCheckCircle,
-      faCog,
-      faLock,
-      faEye,
-      faEyeSlash
+      feAnchor,
+      fePlus,
+      feShoppingBag,
+      feCalendar,
+      feShoppingCart,
+      feChevronLeft,
+      feStar,
+      feUserMinus,
+      feCheckCircle,
+      feSettings,
+      feLock,
+      feEye,
+      feSearch,
+      feEyeOff,
+      feGithub,
+      feAirplay,
+      feCloudRain,
+      feUploadCloud,
+      feMap,
+      feSend,
+      feServer
+    },
+    extend: {
+      discord: {
+        path: `<path fill="currentColor" d="M297.216 243.2c0 15.616-11.52 28.416-26.112 28.416-14.336 0-26.112-12.8-26.112-28.416s11.52-28.416 26.112-28.416c14.592 0 26.112 12.8 26.112 28.416zm-119.552-28.416c-14.592 0-26.112 12.8-26.112 28.416s11.776 28.416 26.112 28.416c14.592 0 26.112-12.8 26.112-28.416.256-15.616-11.52-28.416-26.112-28.416zM448 52.736V512c-64.494-56.994-43.868-38.128-118.784-107.776l13.568 47.36H52.48C23.552 451.584 0 428.032 0 398.848V52.736C0 23.552 23.552 0 52.48 0h343.04C424.448 0 448 23.552 448 52.736zm-72.96 242.688c0-82.432-36.864-149.248-36.864-149.248-36.864-27.648-71.936-26.88-71.936-26.88l-3.584 4.096c43.52 13.312 63.744 32.512 63.744 32.512-60.811-33.329-132.244-33.335-191.232-7.424-9.472 4.352-15.104 7.424-15.104 7.424s21.248-20.224 67.328-33.536l-2.56-3.072s-35.072-.768-71.936 26.88c0 0-36.864 66.816-36.864 149.248 0 0 21.504 37.12 78.08 38.912 0 0 9.472-11.52 17.152-21.248-32.512-9.728-44.8-30.208-44.8-30.208 3.766 2.636 9.976 6.053 10.496 6.4 43.21 24.198 104.588 32.126 159.744 8.96 8.96-3.328 18.944-8.192 29.44-15.104 0 0-12.8 20.992-46.336 30.464 7.68 9.728 16.896 20.736 16.896 20.736 56.576-1.792 78.336-38.912 78.336-38.912z" fa-key="3" fill="currentColor"></path>`,
+        viewBox: '0 0 496 512'
+      }
     }
   }
 })

.storybook/config.js

@@ -54,18 +54,18 @@ Head over here => https://vue.chakra-ui.com
   - [Storybook Components](#storybook-components)
   - [Development for Contributing:](#development-for-contributing)
     - [Related](#related)
-- [Contributors ✨](#contributors)
+- [Contributors ✨](#contributors-)
 
 ## Installation
 
 ```bash
-yarn add @chakra-ui/vue emotion
+yarn add @chakra-ui/vue @emotion/css
 ```
 
 or
 
 ```bash
-npm install @chakra-ui/vue emotion
+npm install @chakra-ui/vue @emotion/css
 ```
 
 <a id="nuxt-usage"></a>
@@ -74,7 +74,7 @@ npm install @chakra-ui/vue emotion
 > If you're using Nuxt, you need to install `@nuxtjs/emotion` package as well to server-side render your styles.
 
 ```bash
-yarn add @chakra-ui/vue emotion @nuxtjs/emotion
+yarn add @chakra-ui/vue @emotion/css @nuxtjs/emotion
 ```
 
 ## Usage
@@ -170,7 +170,7 @@ Interested in contributing? See our [open issues](https://github.com/chakra-ui/c
 
 ```bash
 yarn install
-yarn bootstrap
+yarn build && yarn bootstrap
 yarn dev
 ```