Skip to content
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

chore: bump vue version to 3.5 #6696

Merged
merged 2 commits into from
Sep 26, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const props = withDefaults(
defineProps<{
category?: Category;
parentCategory?: Category;
isChildLevelCategory: boolean;
isChildLevelCategory?: boolean;
}>(),
{
category: undefined,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script lang="ts" setup>
import StickyBlock from "@/components/sticky-block/StickyBlock.vue";
import { useSettingFormConvert } from "@console/composables/use-setting-form";
import { useThemeStore } from "@console/stores/theme";
import type {
Expand Down Expand Up @@ -28,7 +29,6 @@ import { storeToRefs } from "pinia";
import { computed, markRaw, onMounted, ref, toRaw } from "vue";
import { useI18n } from "vue-i18n";
import ThemePreviewListItem from "./ThemePreviewListItem.vue";
import StickyBlock from "@/components/sticky-block/StickyBlock.vue";

const props = withDefaults(
defineProps<{
Expand Down Expand Up @@ -304,6 +304,7 @@ const iframeClasses = computed(() => {
@after-leave="switching = false"
>
<div v-show="settingsVisible" class="mb-20">
<!-- @vue-skip -->
<VTabbar
v-model:active-id="activeSettingTab"
:items="settingTabs"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ const handleChangePassword = async () => {
:title="$t('core.user.change_password_modal.title')"
@close="emit('close')"
>
<!-- @vue-ignore -->
<FormKit
id="password-form"
v-model="formState"
Expand Down
1 change: 1 addition & 0 deletions ui/console-src/views/system/Setup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ const inputClasses = {
<IconLogo class="mb-8 flex-none" />

<div class="flex w-72 flex-col">
<!-- @vue-ignore -->
<FormKit
id="setup-form"
v-model="formState"
Expand Down
8 changes: 4 additions & 4 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"short-unique-id": "^5.0.2",
"transliteration": "^2.3.5",
"ua-parser-js": "^1.0.38",
"vue": "^3.4.27",
"vue": "^3.5.8",
"vue-demi": "^0.14.7",
"vue-draggable-plus": "^0.4.1",
"vue-grid-layout": "3.0.0-beta1",
Expand All @@ -122,7 +122,7 @@
"@types/qs": "^6.9.7",
"@types/randomstring": "^1.1.8",
"@types/ua-parser-js": "^0.7.39",
"@vitejs/plugin-vue": "^5.1.2",
"@vitejs/plugin-vue": "^5.1.4",
"@vitejs/plugin-vue-jsx": "^4.0.1",
"@vitest/ui": "^0.34.1",
"@vue/compiler-sfc": "^3.4.27",
Expand Down Expand Up @@ -151,7 +151,7 @@
"tailwindcss": "^3.2.7",
"tailwindcss-safe-area": "^0.2.2",
"tailwindcss-themer": "^2.0.3",
"typescript": "~5.5.4",
"typescript": "~5.6.2",
"unplugin-icons": "^0.19.2",
"vite": "^5.4.1",
"vite-plugin-externals": "^0.6.2",
Expand All @@ -160,6 +160,6 @@
"vite-plugin-static-copy": "^1.0.6",
"vite-plugin-vue-devtools": "^7.3.8",
"vitest": "^0.34.1",
"vue-tsc": "^2.0.29"
"vue-tsc": "^2.1.6"
}
}
2 changes: 1 addition & 1 deletion ui/packages/api-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"rimraf": "^5.0.7",
"typescript": "~5.5.4",
"unbuild": "^0.7.6",
"vite-plugin-dts": "^4.0.3"
"vite-plugin-dts": "^4.2.2"
},
"peerDependencies": {
"axios": "^1.7.x"
Expand Down
4 changes: 2 additions & 2 deletions ui/packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
"react-dom": "^18.2.0",
"storybook": "^7.6.3",
"unplugin-icons": "^0.14.15",
"vite-plugin-dts": "^4.0.3"
"vite-plugin-dts": "^4.2.2"
},
"peerDependencies": {
"vue": "^3.4.27",
"vue": "^3.5.8",
"vue-router": "^4.3.2"
},
"exports": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const meta: Meta<typeof VDialog> = {
height: 400,
setup() {
const showDialog = () => {
// @ts-ignore
args.visible = true;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ const meta: Meta<typeof VDropdown> = {
template: `
<div style="height: 300px">
<VDropdown>
${args.default}
<VButton>Hello</VButton>
<template #popper>
${args.popper}
<VDropdownItem>删除</VDropdownItem>
<VDropdownDivider></VDropdownDivider>
<VDropdownItem>删除</VDropdownItem>
<VDropdownItem>编辑</VDropdownItem>
</template>
</VDropdown>
</div>
Expand All @@ -34,13 +37,5 @@ export default meta;
type Story = StoryObj<typeof VDropdown>;

export const Default: Story = {
args: {
default: `<VButton>Hello</VButton>`,
popper: `
<VDropdownItem>删除</VDropdownItem>
<VDropdownDivider></VDropdownDivider>
<VDropdownItem>删除</VDropdownItem>
<VDropdownItem>编辑</VDropdownItem>
`,
},
args: {},
};
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ defineExpose({
</script>

<template>
<!-- @vue-ignore -->
<!-- @vue-skip -->
<FloatingDropdown
ref="dropdownRef"
:placement="placement"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const props = withDefaults(
defineProps<{
selected?: boolean;
disabled?: boolean;
type: "default" | "danger";
type?: "default" | "danger";
}>(),
{
selected: false,
Expand Down
2 changes: 1 addition & 1 deletion ui/packages/components/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "@vue/tsconfig/tsconfig.dom.json",
"include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
"exclude": ["src/**/__tests__/*"],
"exclude": ["src/**/__tests__/*", "node_modules"],
"compilerOptions": {
"composite": true,
"baseUrl": ".",
Expand Down
4 changes: 2 additions & 2 deletions ui/packages/editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@
"@iconify/json": "^2.2.117",
"@types/linkifyjs": "^2.1.7",
"release-it": "^16.1.5",
"vite-plugin-dts": "^4.0.3"
"vite-plugin-dts": "^4.2.2"
},
"peerDependencies": {
"vue": "^3.4.27"
"vue": "^3.5.8"
}
}
4 changes: 2 additions & 2 deletions ui/packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
"homepage": "https://github.com/halo-dev/halo/tree/main/ui/packages/shared#readme",
"license": "MIT",
"devDependencies": {
"vite-plugin-dts": "^4.0.3"
"vite-plugin-dts": "^4.2.2"
},
"peerDependencies": {
"vue": "^3.4.27",
"vue": "^3.5.8",
"vue-router": "^4.3.2"
},
"dependencies": {
Expand Down
Loading
Loading