Skip to content

chore: Bump the vue group with 7 updates #2212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .yarn/patches/@bg-dev-nuxt-naiveui-npm-1.2.1-69980da2af.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/dist/runtime/components/NaiveIcon.vue b/dist/runtime/components/NaiveIcon.vue
index 52f2327bdfd2e2cc880fe5cdb03b007579411952..f05a210e249b0ad894e7b191c4dd5d930b8e6e36 100644
--- a/dist/runtime/components/NaiveIcon.vue
+++ b/dist/runtime/components/NaiveIcon.vue
@@ -1,5 +1,5 @@
<template>
- <n-icon-wrapper :size="sSize" :border-radius="borderRadius" :color="color" :icon-color="iconColor">
+ <n-icon-wrapper v-if="icon" :size="sSize" :border-radius="borderRadius" :color="color" :icon-color="iconColor">
<Icon :icon="icon" :width="sSize" :height="sSize" />
</n-icon-wrapper>
</template>
diff --git a/dist/runtime/components/NaiveNavbar.vue b/dist/runtime/components/NaiveNavbar.vue
index 56254eccf8b3eed296abb359fe2696727158bc38..e36d5ab5887b1d204c43c46400c92f9ad3d73eca 100644
--- a/dist/runtime/components/NaiveNavbar.vue
+++ b/dist/runtime/components/NaiveNavbar.vue
@@ -117,6 +117,7 @@ const menuOptions = computed<MenuOption[]>(() => {
const menuOption: MenuOption =
{
label: route.path ? () => h(NuxtLink, { to: route.path }, { default: () => route.label }) : route.label,
+ // @ts-ignore: https://github.com/becem-gharbi/nuxt-naiveui/issues/18
icon: route.icon ? () => h(NaiveIcon, { name: route.icon }) : undefined,
key: route.path || route.label,
}
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@
"@apollo/server": "^4.9.3",
"@as-integrations/h3": "^1.1.6",
"@graphql-tools/schema": "^10.0.0",
"@he-tree/vue": "^2.4.2",
"@he-tree/vue": "^2.5.0",
"@nozomuikuta/h3-cors": "^0.2.2",
"@pinia/nuxt": "^0.4.11",
"@popperjs/core": "^2.11.8",
"@prisma/client": "^5.2.0",
"@variantjs/core": "^0.0.90",
"@variantjs/vue": "^0.0.22",
"@vee-validate/zod": "^4.10.5",
"@vue/apollo-composable": "4.0.0-beta.8",
"@vue/apollo-composable": "4.0.0-beta.9",
"@vue/apollo-util": "^4.0.0-beta.6",
"@vueuse/core": "^10.2.1",
"@vueuse/core": "^10.4.1",
"@yaireo/tagify": "^4.17.9",
"autoprefixer": "^10.4.15",
"body-scroll-lock": "^4.0.0-beta.0",
Expand Down Expand Up @@ -100,7 +100,7 @@
"@storybook/core-server": "^7.0.26",
"@storybook/vue3": "^7.0.26",
"@storybook/vue3-vite": "7.0.26",
"@tailwindcss/forms": "^0.5.3",
"@tailwindcss/forms": "^0.5.6",
"@tailwindcss/line-clamp": "^0.4.4",
"@tailwindcss/typography": "^0.5.8",
"@types/bcryptjs": "^2.4.3",
Expand All @@ -120,7 +120,7 @@
"@volar/vue-typescript": "^1.6.5",
"@vue/compiler-sfc": "^3.3.4",
"@vue/runtime-dom": "^3.3.4",
"@vue/test-utils": "^2.4.0",
"@vue/test-utils": "^2.4.1",
"chromatic": "^6.19.9",
"concurrently": "^8.2.0",
"cross-env": "^7.0.3",
Expand Down Expand Up @@ -150,11 +150,11 @@
"supertest": "^6.3.3",
"supertest-graphql": "^1.1.4",
"ufo": "^1.1.1",
"unplugin-vue-components": "^0.25.1",
"unplugin-vue-components": "^0.25.2",
"vitest": "^0.34.3",
"vitest-github-actions-reporter": "^0.10.0",
"vitest-mock-extended": "^1.2.1",
"vue-tsc": "^1.8.4"
"vue-tsc": "^1.8.8"
},
"resolutions": {
"@types/react": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.0.tgz",
Expand All @@ -171,7 +171,8 @@
"@vue/apollo-util": "patch:@vue/apollo-util@npm%3A4.0.0-beta.6#./.yarn/patches/@vue-apollo-util-npm-4.0.0-beta.6-7e26e14eb7.patch",
"@nuxt/content": "patch:@nuxt/content@npm%3A2.7.0#./.yarn/patches/@nuxt-content-npm-2.7.0-425d472cf3.patch",
"nitropack": "patch:nitropack@npm%3A2.5.2#./.yarn/patches/nitropack-npm-2.5.2-65c39b23d1.patch",
"redis-mock@^0.56.3": "patch:redis-mock@npm%3A0.56.3#./.yarn/patches/redis-mock-npm-0.56.3-967bd7c6ea.patch"
"redis-mock@^0.56.3": "patch:redis-mock@npm%3A0.56.3#./.yarn/patches/redis-mock-npm-0.56.3-967bd7c6ea.patch",
"@bg-dev/nuxt-naiveui@^1.2.1": "patch:@bg-dev/nuxt-naiveui@npm%3A1.2.1#./.yarn/patches/@bg-dev-nuxt-naiveui-npm-1.2.1-69980da2af.patch"
},
"resolutionsComments": {
"@types/react": "Otherwise these types interfere with the types from vite: https://github.com/johnsoncodehk/volar/discussions/592#discussioncomment-1580518",
Expand Down
Loading