Skip to content
This repository was archived by the owner on Sep 20, 2024. It is now read-only.

Commit c401a75

Browse files
codebender828codebender828
authored
Merge pull request #361 from chakra-ui/chore/upgrade-emotion
chore: upgrade emotion to @emotion/css and @emotion/server v11
2 parents 0ba5ecb + 8cb0daf commit c401a75

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+739
-267
lines changed

‎.changeset/four-rabbits-warn.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@chakra-ui/vue': patch
3+
'@chakra-ui/nuxt': patch
4+
---
5+
6+
Upgraded to @nuxtjs/emotion@^0.1.0

‎.changeset/pre.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"mode": "pre",
3+
"tag": "next",
4+
"initialVersions": {
5+
"@chakra-ui/vue": "0.6.6",
6+
"@chakra-ui/nuxt": "0.1.0",
7+
"@chakra-ui/theme-vue": "0.2.7",
8+
"chakra-ui-docs": "0.5.2"
9+
},
10+
"changesets": [
11+
"four-rabbits-warn",
12+
"smooth-glasses-know",
13+
"two-kangaroos-shop",
14+
"warm-birds-arrive"
15+
]
16+
}

‎.changeset/smooth-glasses-know.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@chakra-ui/vue': patch
3+
'@chakra-ui/nuxt': patch
4+
---
5+
6+
Added support for feather-icons to Chakr aUI Vue

‎.changeset/two-kangaroos-shop.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@chakra-ui/vue': patch
3+
---
4+
5+
Removes UMD builds for Chakra UI Vue

‎.changeset/warm-birds-arrive.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@chakra-ui/vue': minor
3+
'@chakra-ui/nuxt': minor
4+
---
5+
6+
Upgraded `emotion` dependencies to namespaced `@emotion/css` packages

‎.eslintrc.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ module.exports = {
33
env: {
44
node: true
55
},
6-
plugins: ['testing-library'],
6+
plugins: [
7+
'testing-library',
8+
'@emotion'
9+
],
710
extends: [
811
'plugin:vue/essential',
912
'@vue/standard',
@@ -28,7 +31,8 @@ module.exports = {
2831
]
2932
}
3033
],
31-
'template-curly-spacing': 0
34+
'template-curly-spacing': 0,
35+
'@emotion/pkg-renaming': 'error'
3236
},
3337
parserOptions: {
3438
parser: 'babel-eslint'

‎.npmrc

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.storybook/config.js

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -7,59 +7,59 @@ import Canvas from './components/Canvas.vue'
77
import storyBookTheme from './theme'
88

99
import {
10-
faBraille,
11-
faAnchor,
12-
faPlus,
13-
faCoffee,
14-
faAmbulance,
15-
faCalendar,
16-
faCar,
17-
faCaretLeft,
18-
faBolt,
19-
faUserSlash,
20-
faCheckCircle,
21-
faCog,
22-
faLock,
23-
faEye,
24-
faEyeSlash } from '@fortawesome/free-solid-svg-icons'
25-
26-
import {
27-
faChevronCircleUp,
28-
faSearch,
29-
faTimesCircle } from '@fortawesome/pro-light-svg-icons'
30-
31-
import {
32-
faGithub
33-
} from '@fortawesome/free-brands-svg-icons'
34-
35-
import {
36-
faDiscord
37-
} from '@fortawesome/free-brands-svg-icons'
10+
feAnchor,
11+
fePlus,
12+
feShoppingBag,
13+
feCalendar,
14+
feShoppingCart,
15+
feChevronLeft,
16+
feStar,
17+
feUserMinus,
18+
feCheckCircle,
19+
feSettings,
20+
feLock,
21+
feEye,
22+
feSearch,
23+
feEyeOff,
24+
feGithub,
25+
feAirplay,
26+
feCloudRain,
27+
feUploadCloud,
28+
feMap,
29+
feSend,
30+
feServer
31+
} from 'feather-icons-paths'
3832

3933
Vue.use(Chakra, {
4034
icons: {
41-
iconPack: 'fa',
4235
iconSet: {
43-
faBraille,
44-
faAnchor,
45-
faPlus,
46-
faCoffee,
47-
faAmbulance,
48-
faCalendar,
49-
faCar,
50-
faCaretLeft,
51-
faBolt,
52-
faUserSlash,
53-
faChevronCircleUp,
54-
faSearch,
55-
faTimesCircle,
56-
faGithub,
57-
faDiscord,
58-
faCheckCircle,
59-
faCog,
60-
faLock,
61-
faEye,
62-
faEyeSlash
36+
feAnchor,
37+
fePlus,
38+
feShoppingBag,
39+
feCalendar,
40+
feShoppingCart,
41+
feChevronLeft,
42+
feStar,
43+
feUserMinus,
44+
feCheckCircle,
45+
feSettings,
46+
feLock,
47+
feEye,
48+
feSearch,
49+
feEyeOff,
50+
feGithub,
51+
feAirplay,
52+
feCloudRain,
53+
feUploadCloud,
54+
feMap,
55+
feSend,
56+
feServer
57+
},
58+
extend: {
59+
discord: {
60+
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>`,
61+
viewBox: '0 0 496 512'
62+
}
6363
}
6464
}
6565
})

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ Head over here => https://vue.chakra-ui.com
5454
- [Storybook Components](#storybook-components)
5555
- [Development for Contributing:](#development-for-contributing)
5656
- [Related](#related)
57-
- [Contributors ✨](#contributors)
57+
- [Contributors ✨](#contributors-)
5858

5959
## Installation
6060

6161
```bash
62-
yarn add @chakra-ui/vue emotion
62+
yarn add @chakra-ui/vue @emotion/css
6363
```
6464

6565
or
6666

6767
```bash
68-
npm install @chakra-ui/vue emotion
68+
npm install @chakra-ui/vue @emotion/css
6969
```
7070

7171
<a id="nuxt-usage"></a>
@@ -74,7 +74,7 @@ npm install @chakra-ui/vue emotion
7474
> If you're using Nuxt, you need to install `@nuxtjs/emotion` package as well to server-side render your styles.
7575
7676
```bash
77-
yarn add @chakra-ui/vue emotion @nuxtjs/emotion
77+
yarn add @chakra-ui/vue @emotion/css @nuxtjs/emotion
7878
```
7979

8080
## Usage

‎package.json

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"website"
1616
],
1717
"nohoist": [
18-
"core-js"
18+
"core-js",
19+
"@chakra-ui/vue"
1920
]
2021
},
2122
"scripts": {
@@ -45,20 +46,10 @@
4546
"evalbundle": "bundlesize"
4647
},
4748
"dependencies": {
48-
"@babel/core": "^7.9.0",
49-
"@babel/plugin-proposal-object-rest-spread": "^7.7.4",
50-
"@babel/plugin-transform-modules-commonjs": "^7.7.4",
51-
"@babel/plugin-transform-parameters": "^7.7.4",
52-
"@babel/preset-env": "^7.9.5",
53-
"@changesets/cli": "^2.7.1",
54-
"@commitlint/cli": "^8.2.0",
55-
"@commitlint/config-conventional": "^8.2.0",
56-
"@fortawesome/free-brands-svg-icons": "^5.12.0",
57-
"@fortawesome/free-solid-svg-icons": "^5.11.2",
58-
"@fortawesome/pro-light-svg-icons": "^5.11.2",
49+
"@emotion/css": "^11.0.0",
5950
"@mdx-js/vue-loader": "^1.6.1",
6051
"@nuxtjs/dotenv": "^1.4.0",
61-
"@nuxtjs/emotion": "^0.0.1",
52+
"@nuxtjs/emotion": "^0.1.0",
6253
"@nuxtjs/now-builder": "^0.17.1",
6354
"@nuxtjs/router": "^1.5.0",
6455
"@popperjs/core": "^2.4.0",
@@ -70,28 +61,7 @@
7061
"@storybook/theming": "^5.2.8",
7162
"@storybook/vue": "^5.3.3",
7263
"@styled-system/css": "^5.0.23",
73-
"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
74-
"@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
75-
"@vue/babel-preset-app": "^4.1.1",
76-
"@vue/babel-preset-jsx": "^1.1.2",
77-
"@vue/cli-plugin-babel": "^3.11.0",
78-
"@vue/cli-plugin-eslint": "^3.11.0",
79-
"@vue/cli-plugin-pwa": "^3.11.0",
80-
"@vue/cli-plugin-unit-jest": "^3.11.0",
81-
"@vue/eslint-config-standard": "^4.0.0",
82-
"@vue/test-utils": "1.0.0-beta.29",
8364
"aria-hidden": "^1.1.1",
84-
"babel-core": "7.0.0-bridge.0",
85-
"babel-helper-vue-jsx-merge-props": "^2.0.3",
86-
"babel-jest": "^23.6.0",
87-
"babel-loader": "^8.0.6",
88-
"babel-plugin-syntax-jsx": "^6.18.0",
89-
"babel-plugin-transform-es2015-for-of": "^6.23.0",
90-
"babel-plugin-transform-vue-jsx": "^3.7.0",
91-
"babel-preset-env": "^1.7.0",
92-
"babel-preset-es2015": "^6.24.1",
93-
"babel-preset-vue": "^2.0.2",
94-
"babelrc-rollup": "^3.0.0",
9565
"breadstick": "^0.2.14",
9666
"can-use-dom": "^0.1.0",
9767
"chakra-loader": "latest",
@@ -100,10 +70,10 @@
10070
"core-js": "^3.6.4",
10171
"defu": "^2.0.4",
10272
"dotenv-defaults": "^1.1.1",
103-
"emotion": "^10.0.27",
10473
"eslint": "^5.16.0",
10574
"eslint-plugin-vue": "^5.0.0",
10675
"eslint-plugin-vue-a11y": "^0.0.31",
76+
"feather-icons-paths": "^1.0.8",
10777
"file-contributors": "^1.0.2",
10878
"focus-trap": "^5.1.0",
10979
"focus-trap-vue": "^0.0.4",
@@ -135,15 +105,46 @@
135105
},
136106
"devDependencies": {
137107
"@babel/cli": "^7.8.4",
108+
"@babel/core": "^7.9.0",
109+
"@babel/plugin-proposal-object-rest-spread": "^7.7.4",
110+
"@babel/plugin-transform-modules-commonjs": "^7.7.4",
111+
"@babel/plugin-transform-parameters": "^7.7.4",
112+
"@babel/preset-env": "^7.9.5",
138113
"@babel/runtime-corejs2": "^7.8.7",
114+
"@changesets/cli": "^2.7.1",
115+
"@commitlint/cli": "^8.2.0",
116+
"@commitlint/config-conventional": "^8.2.0",
117+
"@emotion/babel-plugin": "^11.1.2",
118+
"@emotion/eslint-plugin": "^11.0.0",
139119
"@nuxtjs/eslint-config": "^3.0.0",
140120
"@nuxtjs/eslint-module": "^1.0.0",
141121
"@nuxtjs/module-test-utils": "^1.6.1",
142122
"@testing-library/jest-dom": "^5.1.1",
143123
"@testing-library/user-event": "^10.0.0",
144124
"@testing-library/vue": "^4.1.0",
125+
"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
126+
"@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
127+
"@vue/babel-preset-app": "^4.1.1",
128+
"@vue/babel-preset-jsx": "^1.1.2",
129+
"@vue/cli-plugin-babel": "^3.11.0",
130+
"@vue/cli-plugin-eslint": "^3.11.0",
131+
"@vue/cli-plugin-pwa": "^3.11.0",
132+
"@vue/cli-plugin-unit-jest": "^3.11.0",
145133
"@vue/devtools": "^5.3.3",
134+
"@vue/eslint-config-standard": "^4.0.0",
135+
"@vue/test-utils": "1.0.0-beta.29",
136+
"babel-core": "7.0.0-bridge.0",
146137
"babel-eslint": "^10.1.0",
138+
"babel-helper-vue-jsx-merge-props": "^2.0.3",
139+
"babel-jest": "^23.6.0",
140+
"babel-loader": "^8.0.6",
141+
"babel-plugin-syntax-jsx": "^6.18.0",
142+
"babel-plugin-transform-es2015-for-of": "^6.23.0",
143+
"babel-plugin-transform-vue-jsx": "^3.7.0",
144+
"babel-preset-env": "^1.7.0",
145+
"babel-preset-es2015": "^6.24.1",
146+
"babel-preset-vue": "^2.0.2",
147+
"babelrc-rollup": "^3.0.0",
147148
"bundlesize": "^0.18.0",
148149
"cross-env": "^7.0.2",
149150
"eslint-config-prettier": "^6.10.0",

0 commit comments

Comments
 (0)