diff --git a/package.json b/package.json index b400f729..80ebc70e 100644 --- a/package.json +++ b/package.json @@ -125,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", diff --git a/packages/chakra-ui-nuxt/lib/module.js b/packages/chakra-ui-nuxt/lib/module.js index e3ba3178..682d652a 100644 --- 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 index a270380b..e9a272d0 100644 --- a/packages/chakra-ui-nuxt/package.json +++ b/packages/chakra-ui-nuxt/package.json @@ -25,7 +25,8 @@ "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/yarn.lock b/yarn.lock index 242b8341..8a59168b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10753,9 +10753,14 @@ defu@^4.0.1: integrity sha512-lC+G0KvvWRbisQa50+iFelm3/eMmwo4IlBmfASOVlw9MZpHHyQeVsZxc5j23+TQy5ydgEoTVSrWl7ptou1kzJQ== defu@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/defu/-/defu-5.0.0.tgz#5768f0d402a555bfc4c267246b20f82ce8b5a10b" - integrity sha512-VHg73EDeRXlu7oYWRmmrNp/nl7QkdXUxkQQKig0Zk8daNmm84AbGoC8Be6/VVLJEKxn12hR0UBmz8O+xQiAPKQ== + version "5.0.1" + resolved "https://registry.yarnpkg.com/defu/-/defu-5.0.1.tgz#a034278f9b032bf0845d261aa75e9ad98da878ac" + integrity sha512-EPS1carKg+dkEVy3qNTqIdp2qV7mUP08nIsupfwQpz++slCVRw7qbQyWvSTig+kFPwz2XXp5/kIIkH+CwrJKkQ== + +defu@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/defu/-/defu-6.0.0.tgz#b397a6709a2f3202747a3d9daf9446e41ad0c5fc" + integrity sha512-t2MZGLf1V2rV4VBZbWIaXKdX/mUcYW0n2znQZoADBkGGxYL8EWqCuCZBmJPJ/Yy9fofJkyuuSuo5GSwo0XdEgw== delayed-stream@~1.0.0: version "1.0.0"