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

Commit f95f467

Browse files
Merge branch 'develop' into feat/skip-nav
2 parents 025bec6 + 2175435 commit f95f467

File tree

5 files changed

+105
-652
lines changed

5 files changed

+105
-652
lines changed

.changeset/empty-dryers-rescue.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'nuxt-js': minor
3+
'@chakra-ui/vue': minor
4+
'@chakra-ui/nuxt': minor
5+
'@chakra-ui/theme-vue': minor
6+
'chakra-ui-docs': minor
7+
---
8+
9+
fix: Include all position values in CToast, fix: import in custom theme code snippet

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
"@vue/cli-plugin-eslint": "^3.11.0",
101101
"@vue/cli-plugin-pwa": "^3.11.0",
102102
"@vue/cli-plugin-unit-jest": "^3.11.0",
103-
"@vue/devtools": "^5.3.3",
104103
"@vue/eslint-config-standard": "^4.0.0",
105104
"@vue/test-utils": "1.0.0-beta.29",
106105
"add": "^2.0.6",
@@ -126,7 +125,7 @@
126125
"copy-to-clipboard": "^3.3.1",
127126
"core-js": "^3.15.1",
128127
"cross-env": "^7.0.2",
129-
"defu": "^2.0.4",
128+
"defu": "^6.0.0",
130129
"dotenv-defaults": "^1.1.1",
131130
"eslint": "^7.12.1",
132131
"eslint-config-prettier": "^6.10.0",
@@ -165,7 +164,7 @@
165164
"rollup-plugin-json": "^4.0.0",
166165
"rollup-plugin-jsx": "^1.0.3",
167166
"rollup-plugin-node-resolve": "^5.2.0",
168-
"rollup-plugin-scss": "^2.1.0",
167+
"rollup-plugin-scss": "3",
169168
"rollup-plugin-terser": "^5.1.2",
170169
"rollup-plugin-vue": "^5.1.4",
171170
"sass-loader": "^8.0.2",
@@ -196,5 +195,8 @@
196195
"styled-system",
197196
"kittens ;)"
198197
],
199-
"version": "0.0.0"
198+
"version": "0.0.0",
199+
"devDependencies": {
200+
"sass": "^1.52.3"
201+
}
200202
}

packages/chakra-ui-nuxt/lib/module.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { resolve } = require('path')
2-
const defu = require('defu')
2+
const { defu } = require('defu')
33
const { parsePackIcons, internalIcons, createServerDirective } = require('@chakra-ui/vue')
44
const defaultTheme = require('@chakra-ui/theme-vue')
55
const { ChakraLoaderPlugin } = require('chakra-loader')

packages/chakra-ui-nuxt/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"chakra-loader": "latest"
2626
},
2727
"peerDependencies": {
28-
"@nuxtjs/emotion": "^0.1.0"
28+
"@nuxtjs/emotion": "^0.1.0",
29+
"defu": ">=6.0.0"
2930
},
3031
"devDependencies": {
3132
"@babel/core": "^7.9.6",

0 commit comments

Comments
 (0)