diff --git a/.all-contributorsrc b/.all-contributorsrc
index 7538ae38..9fdb3c5b 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -265,6 +265,33 @@
"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,
@@ -272,5 +299,6 @@
"projectOwner": "chakra-ui",
"repoType": "github",
"repoHost": "https://github.com",
- "skipCi": true
+ "skipCi": true,
+ "commitConvention": "none"
}
diff --git a/.changeset/healthy-clocks-train.md b/.changeset/healthy-clocks-train.md
new file mode 100644
index 00000000..4b253010
--- /dev/null
+++ b/.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
diff --git a/.changeset/large-bananas-allow.md b/.changeset/large-bananas-allow.md
new file mode 100644
index 00000000..bd8ab9fa
--- /dev/null
+++ b/.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
diff --git a/.storybook/config.js b/.storybook/config.js
index e69abe31..2dedea4c 100644
--- a/.storybook/config.js
+++ b/.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: ``,
viewBox: '0 0 496 512'
}
- }
+ },
}
})
diff --git a/README.md b/README.md
index 7d6bce70..cbd0495a 100644
--- a/README.md
+++ b/README.md
@@ -224,6 +224,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
MaySoMusician
💻 |
Martin
💻 ⚠️ |
Ejiro Asiuwhu
📖 |
+ 
Abel N. Nieva
💻 |
+
+
+ 
Lê Thông
💻 |
+ 
Reinier van der Leer
💻 |
diff --git a/bundlesize.config.json b/bundlesize.config.json
index 3706dcec..547ff2b1 100644
--- a/bundlesize.config.json
+++ b/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"
},
{
diff --git a/config/.env.defaults b/config/.env.defaults
index 307fffcd..108b00b6 100644
--- a/config/.env.defaults
+++ b/config/.env.defaults
@@ -1,2 +1 @@
BASE_URL=http://localhost:3000
-MIXPANEL_TOKEN=91ec73fd1b8e164d6cfbae6bf1a3e7d1
\ No newline at end of file
diff --git a/jest.config.js b/jest.config.js
index d2c950c2..bf0bf284 100644
--- a/jest.config.js
+++ b/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)'
diff --git a/package.json b/package.json
index 5ef7dd33..e5470a37 100644
--- a/package.json
+++ b/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",
diff --git a/packages/chakra-ui-core/CHANGELOG.md b/packages/chakra-ui-core/CHANGELOG.md
index fd4de2e9..1ececedb 100644
--- a/packages/chakra-ui-core/CHANGELOG.md
+++ b/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
diff --git a/packages/chakra-ui-core/package.json b/packages/chakra-ui-core/package.json
index 8c6d0084..ebf41def 100644
--- a/packages/chakra-ui-core/package.json
+++ b/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,7 +46,6 @@
"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": {
@@ -54,6 +53,7 @@
"vue": "^2.6.10"
},
"devDependencies": {
+ "@fortawesome/fontawesome-common-types": "^0.2.36",
"rimraf": "^3.0.2"
},
"keywords": [
diff --git a/packages/chakra-ui-core/rollup.config.js b/packages/chakra-ui-core/rollup.config.js
index 4bf4077b..1c4a61c0 100644
--- a/packages/chakra-ui-core/rollup.config.js
+++ b/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
}
diff --git a/packages/chakra-ui-core/src/CAccordion/tests/__snapshots__/CAccordion.test.js.snap b/packages/chakra-ui-core/src/CAccordion/tests/__snapshots__/CAccordion.test.js.snap
index 986172f8..e2621928 100644
--- a/packages/chakra-ui-core/src/CAccordion/tests/__snapshots__/CAccordion.test.js.snap
+++ b/packages/chakra-ui-core/src/CAccordion/tests/__snapshots__/CAccordion.test.js.snap
@@ -2,25 +2,111 @@
exports[`should render correctly 1`] = `
-