Merge pull request #474 from chakra-ui/develop

chore: `@chakra-ui/[email protected]`, `@chakra-ui/nuxt` release candidate

Author: codebender828

.all-contributorsrc

@@ -265,12 +265,40 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "abelnnieva",
+      "name": "Abel N. Nieva",
+      "avatar_url": "https://avatars.githubusercontent.com/u/931497?v=4",
+      "profile": "https://github.com/abelnnieva",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "simpletrontdip",
+      "name": "Lê Thông",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20158564?v=4",
+      "profile": "https://github.com/simpletrontdip",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Pwuts",
+      "name": "Reinier van der Leer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12185583?v=4",
+      "profile": "https://pwuts.nl/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
   "projectName": "chakra-ui-vue",
   "projectOwner": "chakra-ui",
   "repoType": "github",
   "repoHost": "https://github.com",
-  "skipCi": true
+  "skipCi": true,
+  "commitConvention": "none"
 }

.changeset/healthy-clocks-train.md

@@ -0,0 +1,6 @@
+---
+"@chakra-ui/vue": patch
+"@chakra-ui/nuxt": patch
+---
+
+fix(menu): update MenuOption defaultValue prop to inner value

.changeset/large-bananas-allow.md

@@ -0,0 +1,8 @@
+---
+'@chakra-ui/vue': minor
+'@chakra-ui/nuxt': minor
+'@chakra-ui/theme-vue': minor
+'chakra-ui-docs': minor
+---
+
+Backport v1 Theme API to v0.x

.storybook/config.js

@@ -2,7 +2,7 @@ import { configure, addDecorator, addParameters } from '@storybook/vue';
 import Vue from 'vue'
 import VueLive from 'vue-live'
 import Lorem from 'vue-lorem-ipsum'
-import Chakra from '../packages/chakra-ui-core/src'
+import Chakra, { mode } from '../packages/chakra-ui-core/src'
 import Canvas from './components/Canvas.vue'
 import storyBookTheme from './theme'
 
@@ -31,6 +31,15 @@ import {
 } from 'feather-icons-paths'
 
 Vue.use(Chakra, {
+  extendTheme: {
+    baseStyles: {
+      // CButton: ({ colorMode, theme }) => ({
+      //   bg: mode('tomato', 'hotpink'),
+      //   borderRadius: "lg",
+      //   shadow: 'xl'
+      // })
+    }
+  },
   icons: {
     iconSet: {
       feAnchor,
@@ -60,7 +69,7 @@ Vue.use(Chakra, {
         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'
       }
-    }
+    },
   }
 })
 

README.md

@@ -224,6 +224,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/MaySoMusician"><img src="https://avatars.githubusercontent.com/u/34566290?v=4?s=50" width="50px;" alt=""/><br /><sub><b>MaySoMusician</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=MaySoMusician" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/MWFIAE"><img src="https://avatars.githubusercontent.com/u/6072971?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Martin</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=MWFIAE" title="Code">💻</a> <a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=MWFIAE" title="Tests">⚠️</a></td>
     <td align="center"><a href="http://linkedin.com/in/ejiro-asiuwhu"><img src="https://avatars.githubusercontent.com/u/45228014?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Ejiro Asiuwhu</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=ejirocodes" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/abelnnieva"><img src="https://avatars.githubusercontent.com/u/931497?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Abel N. Nieva</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=abelnnieva" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/simpletrontdip"><img src="https://avatars.githubusercontent.com/u/20158564?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Lê Thông</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=simpletrontdip" title="Code">💻</a></td>
+    <td align="center"><a href="https://pwuts.nl/"><img src="https://avatars.githubusercontent.com/u/12185583?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Reinier van der Leer</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=Pwuts" title="Code">💻</a></td>
   </tr>
 </table>
 

bundlesize.config.json

@@ -1,7 +1,7 @@
 {
   "files": [
     {
-      "path": "./packages/chakra-ui-core/dist/umd/*.js",
+      "path": "./packages/chakra-ui-core/dist/cjs/*.js",
       "maxSize": "85kB"
     },
     {

config/.env.defaults

@@ -1,2 +1 @@
 BASE_URL=http://localhost:3000
-MIXPANEL_TOKEN=91ec73fd1b8e164d6cfbae6bf1a3e7d1

jest.config.js

@@ -20,7 +20,8 @@ module.exports = {
     breadstick: require.resolve('./tests/test-utils/module-mock.js')
   },
   snapshotSerializers: [
-    'jest-serializer-vue'
+    'jest-serializer-vue',
+    '@emotion/jest/serializer'
   ],
   testMatch: [
     '**/**/*.test.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'

package.json

@@ -44,9 +44,12 @@
     "docs-dev": "yarn workspace chakra-ui-docs dev",
     "docs-build": "yarn workspace chakra-ui-docs build",
     "docs-serve": "yarn workspace chakra-ui-docs nuxt start",
-    "evalbundle": "bundlesize"
+    "evalbundle": "bundlesize",
+    "contributors:add": "all-contributors add",
+    "contributors:generate": "all-contributors generate"
   },
   "dependencies": {
+    "@chakra-ui/styled-system": "^1.12.1",
     "@emotion/css": "^11.0.0",
     "@mdx-js/vue-loader": "^1.6.1",
     "@nuxtjs/dotenv": "^1.4.0",
@@ -61,7 +64,6 @@
     "@storybook/storybook-deployer": "^2.8.1",
     "@storybook/theming": "^5.2.8",
     "@storybook/vue": "^5.3.3",
-    "@styled-system/css": "^5.0.23",
     "aria-hidden": "^1.1.1",
     "breadstick": "^0.2.14",
     "can-use-dom": "^0.1.0",
@@ -85,13 +87,11 @@
     "mdx-vue": "^1.0.2",
     "mdx-vue-loader": "^1.0.2",
     "node-fetch": "^2.6.0",
-    "node-sass": "^4.13.1",
     "nuxt": "2.14.6",
     "portal-vue": "^2.1.6",
     "prismjs": "^1.19.0",
     "register-service-worker": "^1.6.2",
     "sass-loader": "^8.0.2",
-    "styled-system": "^5.1.2",
     "v-scroll-lock": "^1.1.0",
     "vue": "^2.6.11",
     "vue-error-boundary": "^1.0.3",
@@ -107,9 +107,10 @@
     "@babel/cli": "^7.8.4",
     "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
+    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
     "@babel/plugin-transform-modules-commonjs": "^7.7.4",
     "@babel/plugin-transform-parameters": "^7.7.4",
-    "@babel/preset-env": "^7.9.5",
+    "@babel/preset-env": "^7.15.0",
     "@babel/runtime-corejs2": "^7.8.7",
     "@changesets/changelog-github": "^0.2.7",
     "@changesets/cli": "^2.7.1",
@@ -118,6 +119,7 @@
     "@commitlint/config-conventional": "^8.2.0",
     "@emotion/babel-plugin": "^11.1.2",
     "@emotion/eslint-plugin": "^11.0.0",
+    "@emotion/jest": "^11.3.0",
     "@nuxtjs/eslint-config": "^3.0.0",
     "@nuxtjs/eslint-module": "^1.0.0",
     "@nuxtjs/google-analytics": "^2.4.0",
@@ -137,6 +139,7 @@
     "@vue/eslint-config-standard": "^4.0.0",
     "@vue/test-utils": "1.0.0-beta.29",
     "add": "^2.0.6",
+    "all-contributors-cli": "^6.20.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.1.0",
     "babel-helper-vue-jsx-merge-props": "^2.0.3",
@@ -169,7 +172,6 @@
     "rollup-plugin-scss": "^2.1.0",
     "rollup-plugin-terser": "^5.1.2",
     "rollup-plugin-vue": "^5.1.4",
-    "styled-system": "^5.1.2",
     "v-scroll-lock": "^1.1.0",
     "vue-loader": "^15.7.1",
     "vue-lorem-ipsum": "^0.0.1",

packages/chakra-ui-core/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.9.4
+
+### Patch Changes
+
+- fix: syncs core and nuxt packages
+
 ## 0.9.3
 
 ### Patch Changes

packages/chakra-ui-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chakra-ui/vue",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "Build Accessible and Responsive Vue.js websites and applications with speed ⚡️",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -21,7 +21,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "yarn clean && rollup -c && rollup -c --environment MINIFY",
+    "build": "yarn clean && rollup -c --environment MINIFY",
     "dev": "rollup --config rollup.dev.config.js --watch",
     "test": "echo testing ...",
     "clean": "rimraf ./dist"
@@ -36,8 +36,8 @@
     "max-overall-size": "85KB"
   },
   "dependencies": {
+    "@chakra-ui/styled-system": "^1.12.1",
     "@popperjs/core": "^2.4.0",
-    "@styled-system/css": "^5.0.23",
     "animejs": "^3.1.0",
     "aria-hidden": "^1.1.1",
     "breadstick": "^0.2.14",
@@ -46,14 +46,14 @@
     "focus-trap-vue": "^0.0.4",
     "lodash-es": "^4.17.15",
     "portal-vue": "^2.1.6",
-    "styled-system": "^5.1.2",
     "v-scroll-lock": "^1.1.0"
   },
   "peerDependencies": {
     "@emotion/css": "^11.0.0",
     "vue": "^2.6.10"
   },
   "devDependencies": {
+    "@fortawesome/fontawesome-common-types": "^0.2.36",
     "rimraf": "^3.0.2"
   },
   "keywords": [

packages/chakra-ui-core/rollup.config.js

@@ -95,24 +95,26 @@ const entries = {
  * Configurations
  */
 export default () => {
-  const config = [{
-    input: entries,
-    output: {
-      dir: 'dist/esm/',
-      format: 'esm',
-      banner: bannerTxt
-    },
-    ...commons
-  },
-  {
-    input: entries,
-    output: {
-      dir: 'dist/cjs/',
-      format: 'cjs',
-      exports: 'named',
-      banner: bannerTxt
+  const config = [
+    {
+      input: entries,
+      output: {
+        dir: 'dist/esm/',
+        format: 'esm',
+        banner: bannerTxt
+      },
+      ...commons
     },
-    ...commons
-  }]
+    {
+      input: entries,
+      output: {
+        dir: 'dist/cjs/',
+        format: 'cjs',
+        exports: 'named',
+        banner: bannerTxt
+      },
+      ...commons
+    }
+  ]
   return config
 }