Merge branch 'develop' into fix/storybook-canvas-layout

codebender828 · web-flow · commit 79eb18851975 · 2022-06-14T00:34:41.000+08:00
diff --git a/.changeset/dull-books-judge.md b/.changeset/dull-books-judge.md
diff --git a/.changeset/empty-dryers-rescue.md b/.changeset/empty-dryers-rescue.md
@@ -6,4 +6,4 @@
 'chakra-ui-docs': minor
 ---
 
-This PR fixes the error in the c-menu-option-group prop and allow the value prop to be passed as an array (#497)
+fix: Include all position values in CToast, fix: import in custom theme code snippet
diff --git a/.changeset/real-cycles-hammer.md b/.changeset/real-cycles-hammer.md
diff --git a/.changeset/smooth-cups-kiss.md b/.changeset/smooth-cups-kiss.md
diff --git a/.changeset/tender-olives-stare.md b/.changeset/tender-olives-stare.md
diff --git a/.changeset/young-eagles-stare.md b/.changeset/young-eagles-stare.md
diff --git a/examples/nuxt-js/CHANGELOG.md b/examples/nuxt-js/CHANGELOG.md
@@ -1,5 +1,16 @@
 # nuxt-js
 
+## 1.1.0
+
+### Minor Changes
+
+- [`5f978f70`](https://github.com/chakra-ui/chakra-ui-vue/commit/5f978f706901715cd42efe82895cb0ff161525d2) [#503](https://github.com/chakra-ui/chakra-ui-vue/pull/503) Thanks [@peoray](https://github.com/peoray)! - This PR fixes the error in the c-menu-option-group prop and allow the value prop to be passed as an array (#497)
+
+### Patch Changes
+
+- Updated dependencies [[`5f978f70`](https://github.com/chakra-ui/chakra-ui-vue/commit/5f978f706901715cd42efe82895cb0ff161525d2), [`c5fe636f`](https://github.com/chakra-ui/chakra-ui-vue/commit/c5fe636fe952f0b9639861f40c85ecade800408c), [`e16f20e2`](https://github.com/chakra-ui/chakra-ui-vue/commit/e16f20e228f9adabfc4fa52c949f52a8c8fbc0f3), [`97d87361`](https://github.com/chakra-ui/chakra-ui-vue/commit/97d87361b4a3262c546a77f1e1c4375e420451d1)]:
+  - @chakra-ui/nuxt@0.5.0
+
 ## 1.0.1
 
 ### Patch Changes
diff --git a/examples/nuxt-js/package.json b/examples/nuxt-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt-js",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "dev": "nuxt",
@@ -9,7 +9,7 @@
     "generate": "nuxt generate"
   },
   "dependencies": {
-    "@chakra-ui/nuxt": "^0.4.2",
+    "@chakra-ui/nuxt": "^0.5.0",
     "@nuxtjs/emotion": "^0.1.0",
     "core-js": "^3.15.1",
     "nuxt": "^2.15.7"
diff --git a/package.json b/package.json
@@ -100,7 +100,6 @@
     "@vue/cli-plugin-eslint": "^3.11.0",
     "@vue/cli-plugin-pwa": "^3.11.0",
     "@vue/cli-plugin-unit-jest": "^3.11.0",
-    "@vue/devtools": "^5.3.3",
     "@vue/eslint-config-standard": "^4.0.0",
     "@vue/test-utils": "1.0.0-beta.29",
     "add": "^2.0.6",
@@ -126,7 +125,7 @@
     "copy-to-clipboard": "^3.3.1",
     "core-js": "^3.15.1",
     "cross-env": "^7.0.2",
-    "defu": "^2.0.4",
+    "defu": "^6.0.0",
     "dotenv-defaults": "^1.1.1",
     "eslint": "^7.12.1",
     "eslint-config-prettier": "^6.10.0",
@@ -165,7 +164,7 @@
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-jsx": "^1.0.3",
     "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-plugin-scss": "^2.1.0",
+    "rollup-plugin-scss": "3",
     "rollup-plugin-terser": "^5.1.2",
     "rollup-plugin-vue": "^5.1.4",
     "sass-loader": "^8.0.2",
@@ -196,5 +195,8 @@
     "styled-system",
     "kittens ;)"
   ],
-  "version": "0.0.0"
+  "version": "0.0.0",
+  "devDependencies": {
+    "sass": "^1.52.3"
+  }
 }
diff --git a/packages/chakra-ui-core/CHANGELOG.md b/packages/chakra-ui-core/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Change Log
 
+## 0.11.0
+
+### Minor Changes
+
+- [`5f978f70`](https://github.com/chakra-ui/chakra-ui-vue/commit/5f978f706901715cd42efe82895cb0ff161525d2) [#503](https://github.com/chakra-ui/chakra-ui-vue/pull/503) Thanks [@peoray](https://github.com/peoray)! - This PR fixes the error in the c-menu-option-group prop and allow the value prop to be passed as an array (#497)
+
+* [`e16f20e2`](https://github.com/chakra-ui/chakra-ui-vue/commit/e16f20e228f9adabfc4fa52c949f52a8c8fbc0f3) [#492](https://github.com/chakra-ui/chakra-ui-vue/pull/492) Thanks [@Pwuts](https://github.com/Pwuts)! - feat(types): add type exports for color mode & theme providers
+
+### Patch Changes
+
+- [`b783840c`](https://github.com/chakra-ui/chakra-ui-vue/commit/b783840c52dbbec5c07d73541321d3338b2ba584) [#502](https://github.com/chakra-ui/chakra-ui-vue/pull/502) Thanks [@t-buss](https://github.com/t-buss)! - Include CGridItem in type definitions
+
+* [`c5fe636f`](https://github.com/chakra-ui/chakra-ui-vue/commit/c5fe636fe952f0b9639861f40c85ecade800408c) [#490](https://github.com/chakra-ui/chakra-ui-vue/pull/490) Thanks [@HerrBertling](https://github.com/HerrBertling)! - fix(select): prevent duplicated ID on wrapper + input
+
+- [`97d87361`](https://github.com/chakra-ui/chakra-ui-vue/commit/97d87361b4a3262c546a77f1e1c4375e420451d1) [#491](https://github.com/chakra-ui/chakra-ui-vue/pull/491) Thanks [@peoray](https://github.com/peoray)! - Fixes change event lsitener
+
+* [`8944b138`](https://github.com/chakra-ui/chakra-ui-vue/commit/8944b13883bd79bef544c3e5a1df88b60e2d2a1f) [#505](https://github.com/chakra-ui/chakra-ui-vue/pull/505) Thanks [@carwack](https://github.com/carwack)! - fix(theme): Responsive styles breaking
+
+* Updated dependencies [[`5f978f70`](https://github.com/chakra-ui/chakra-ui-vue/commit/5f978f706901715cd42efe82895cb0ff161525d2), [`97d87361`](https://github.com/chakra-ui/chakra-ui-vue/commit/97d87361b4a3262c546a77f1e1c4375e420451d1), [`8944b138`](https://github.com/chakra-ui/chakra-ui-vue/commit/8944b13883bd79bef544c3e5a1df88b60e2d2a1f)]:
+  - @chakra-ui/theme-vue@0.4.0
+
 ## 0.10.2
 
 ### Patch Changes
diff --git a/packages/chakra-ui-core/package.json b/packages/chakra-ui-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chakra-ui/vue",
-  "version": "0.10.2",
+  "version": "0.11.0",
   "description": "Build Accessible and Responsive Vue.js websites and applications with speed ⚡️",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@chakra-ui/styled-system": "^1.15.0",
-    "@chakra-ui/theme-vue": "^0.3.2-next.0",
+    "@chakra-ui/theme-vue": "^0.4.0",
     "@popperjs/core": "^2.4.0",
     "animejs": "^3.1.0",
     "aria-hidden": "^1.1.1",
diff --git a/packages/chakra-ui-nuxt/CHANGELOG.md b/packages/chakra-ui-nuxt/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Change Log
 
+## 0.5.0
+
+### Minor Changes
+
+- [`5f978f70`](https://github.com/chakra-ui/chakra-ui-vue/commit/5f978f706901715cd42efe82895cb0ff161525d2) [#503](https://github.com/chakra-ui/chakra-ui-vue/pull/503) Thanks [@peoray](https://github.com/peoray)! - This PR fixes the error in the c-menu-option-group prop and allow the value prop to be passed as an array (#497)
+
+* [`e16f20e2`](https://github.com/chakra-ui/chakra-ui-vue/commit/e16f20e228f9adabfc4fa52c949f52a8c8fbc0f3) [#492](https://github.com/chakra-ui/chakra-ui-vue/pull/492) Thanks [@Pwuts](https://github.com/Pwuts)! - feat(types): add type exports for color mode & theme providers
+
+### Patch Changes
+
+- [`c5fe636f`](https://github.com/chakra-ui/chakra-ui-vue/commit/c5fe636fe952f0b9639861f40c85ecade800408c) [#490](https://github.com/chakra-ui/chakra-ui-vue/pull/490) Thanks [@HerrBertling](https://github.com/HerrBertling)! - fix(select): prevent duplicated ID on wrapper + input
+
+* [`97d87361`](https://github.com/chakra-ui/chakra-ui-vue/commit/97d87361b4a3262c546a77f1e1c4375e420451d1) [#491](https://github.com/chakra-ui/chakra-ui-vue/pull/491) Thanks [@peoray](https://github.com/peoray)! - Fixes change event lsitener
+
+* Updated dependencies [[`b783840c`](https://github.com/chakra-ui/chakra-ui-vue/commit/b783840c52dbbec5c07d73541321d3338b2ba584), [`5f978f70`](https://github.com/chakra-ui/chakra-ui-vue/commit/5f978f706901715cd42efe82895cb0ff161525d2), [`c5fe636f`](https://github.com/chakra-ui/chakra-ui-vue/commit/c5fe636fe952f0b9639861f40c85ecade800408c), [`e16f20e2`](https://github.com/chakra-ui/chakra-ui-vue/commit/e16f20e228f9adabfc4fa52c949f52a8c8fbc0f3), [`97d87361`](https://github.com/chakra-ui/chakra-ui-vue/commit/97d87361b4a3262c546a77f1e1c4375e420451d1), [`8944b138`](https://github.com/chakra-ui/chakra-ui-vue/commit/8944b13883bd79bef544c3e5a1df88b60e2d2a1f)]:
+  - @chakra-ui/vue@0.11.0
+  - @chakra-ui/theme-vue@0.4.0
+
 ## 0.4.2
 
 ### Patch Changes
diff --git a/packages/chakra-ui-nuxt/lib/module.js b/packages/chakra-ui-nuxt/lib/module.js
@@ -1,5 +1,5 @@
 const { resolve } = require('path')
-const defu = require('defu')
+const { defu } = require('defu')
 const { parsePackIcons, internalIcons, createServerDirective } = require('@chakra-ui/vue')
 const defaultTheme = require('@chakra-ui/theme-vue')
 const { ChakraLoaderPlugin } = require('chakra-loader')
diff --git a/packages/chakra-ui-nuxt/package.json b/packages/chakra-ui-nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chakra-ui/nuxt",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Chakra UI Module for Nuxt.js",
   "repository": "https://github.com/chakra-ui/chakra-ui-vue",
   "license": "MIT",
@@ -19,13 +19,14 @@
     "test": "jest"
   },
   "dependencies": {
-    "@chakra-ui/theme-vue": "^0.3.2",
-    "@chakra-ui/vue": "^0.10.2",
+    "@chakra-ui/theme-vue": "^0.4.0",
+    "@chakra-ui/vue": "^0.11.0",
     "@emotion/css": "^11.0.0",
     "chakra-loader": "latest"
   },
   "peerDependencies": {
-    "@nuxtjs/emotion": "^0.1.0"
+    "@nuxtjs/emotion": "^0.1.0",
+    "defu": ">=6.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",
diff --git a/packages/chakra-ui-theme/CHANGELOG.md b/packages/chakra-ui-theme/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## 0.4.0
+
+### Minor Changes
+
+- [`5f978f70`](https://github.com/chakra-ui/chakra-ui-vue/commit/5f978f706901715cd42efe82895cb0ff161525d2) [#503](https://github.com/chakra-ui/chakra-ui-vue/pull/503) Thanks [@peoray](https://github.com/peoray)! - This PR fixes the error in the c-menu-option-group prop and allow the value prop to be passed as an array (#497)
+
+### Patch Changes
+
+- [`97d87361`](https://github.com/chakra-ui/chakra-ui-vue/commit/97d87361b4a3262c546a77f1e1c4375e420451d1) [#491](https://github.com/chakra-ui/chakra-ui-vue/pull/491) Thanks [@peoray](https://github.com/peoray)! - Fixes change event lsitener
+
+* [`8944b138`](https://github.com/chakra-ui/chakra-ui-vue/commit/8944b13883bd79bef544c3e5a1df88b60e2d2a1f) [#505](https://github.com/chakra-ui/chakra-ui-vue/pull/505) Thanks [@carwack](https://github.com/carwack)! - fix(theme): Responsive styles breaking
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/packages/chakra-ui-theme/package.json b/packages/chakra-ui-theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chakra-ui/theme-vue",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Default theme for @chakra-ui/vue default theme object",
   "author": {
     "name": "Jonathan Bakebwa",
diff --git a/website/CHANGELOG.md b/website/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Change Log
 
+## 0.8.0
+
+### Minor Changes
+
+- [`5f978f70`](https://github.com/chakra-ui/chakra-ui-vue/commit/5f978f706901715cd42efe82895cb0ff161525d2) [#503](https://github.com/chakra-ui/chakra-ui-vue/pull/503) Thanks [@peoray](https://github.com/peoray)! - This PR fixes the error in the c-menu-option-group prop and allow the value prop to be passed as an array (#497)
+
+### Patch Changes
+
+- [`97d87361`](https://github.com/chakra-ui/chakra-ui-vue/commit/97d87361b4a3262c546a77f1e1c4375e420451d1) [#491](https://github.com/chakra-ui/chakra-ui-vue/pull/491) Thanks [@peoray](https://github.com/peoray)! - Fixes change event lsitener
+
+* [`8944b138`](https://github.com/chakra-ui/chakra-ui-vue/commit/8944b13883bd79bef544c3e5a1df88b60e2d2a1f) [#505](https://github.com/chakra-ui/chakra-ui-vue/pull/505) Thanks [@carwack](https://github.com/carwack)! - fix(theme): Responsive styles breaking
+
+* Updated dependencies [[`b783840c`](https://github.com/chakra-ui/chakra-ui-vue/commit/b783840c52dbbec5c07d73541321d3338b2ba584), [`5f978f70`](https://github.com/chakra-ui/chakra-ui-vue/commit/5f978f706901715cd42efe82895cb0ff161525d2), [`c5fe636f`](https://github.com/chakra-ui/chakra-ui-vue/commit/c5fe636fe952f0b9639861f40c85ecade800408c), [`e16f20e2`](https://github.com/chakra-ui/chakra-ui-vue/commit/e16f20e228f9adabfc4fa52c949f52a8c8fbc0f3), [`97d87361`](https://github.com/chakra-ui/chakra-ui-vue/commit/97d87361b4a3262c546a77f1e1c4375e420451d1), [`8944b138`](https://github.com/chakra-ui/chakra-ui-vue/commit/8944b13883bd79bef544c3e5a1df88b60e2d2a1f)]:
+  - @chakra-ui/vue@0.11.0
+  - @chakra-ui/nuxt@0.5.0
+  - @chakra-ui/theme-vue@0.4.0
+
 ## 0.7.2
 
 ### Patch Changes
diff --git a/website/package.json b/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chakra-ui-docs",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "Chakra UI Vue documentation site",
   "private": true,
   "scripts": {
@@ -26,9 +26,9 @@
     }
   },
   "dependencies": {
-    "@chakra-ui/nuxt": "^0.4.2",
-    "@chakra-ui/theme-vue": "^0.3.2",
-    "@chakra-ui/vue": "^0.10.2",
+    "@chakra-ui/nuxt": "^0.5.0",
+    "@chakra-ui/theme-vue": "^0.4.0",
+    "@chakra-ui/vue": "^0.11.0",
     "@emotion/css": "^11.0.0",
     "@mdx-js/vue-loader": "^1.6.1",
     "@nuxtjs/dotenv": "^1.4.0",
diff --git a/website/pages/extending-theme.mdx b/website/pages/extending-theme.mdx
@@ -49,7 +49,7 @@ In your `main.js` file, you can then add your custom theme object by passing it
 </c-alert>
 
 ```js
-import Chakra from '@chakra-ui/vue'
+import Chakra, { CThemeProvider } from '@chakra-ui/vue'
 import customTheme from 'custom-theme.js'
 
 Vue.use(Chakra, {
diff --git a/yarn.lock b/yarn.lock
