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: upgrade to vue 3.5 #404

Merged
merged 6 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from 5 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
696 changes: 491 additions & 205 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"requiredApiVersion": "~2.0.0"
},
"private": true,
"type": "module",
"scripts": {
"dev": "vite --host",
"build": "run-p type-check build-only",
Expand Down Expand Up @@ -42,7 +43,7 @@
"pinia": "^2.0.36",
"qrcode-vue3": "^1.6.8",
"uid": "^2.0.2",
"vue": "^3.4.27",
"vue": "^3.5.12",
"vue-chartjs": "^5.2.0",
"vue-i18n": "^9.3.0-beta.19",
"vue-router": "^4.2.0",
Expand All @@ -52,10 +53,10 @@
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"@rushstack/eslint-patch": "^1.2.0",
"@tailwindcss/forms": "^0.5.3",
"@tailwindcss/forms": "^0.5.9",
"@tsconfig/node18": "^2.0.1",
"@types/node": "^18.16.8",
"@vitejs/plugin-vue": "^4.6.2",
"@vitejs/plugin-vue": "^5.1.4",
"@vue/eslint-config-prettier": "^7.1.0",
"@vue/eslint-config-typescript": "^11.0.3",
"@vue/tsconfig": "^0.4.0",
Expand All @@ -68,9 +69,9 @@
"prettier": "^2.8.8",
"prettier-plugin-tailwindcss": "^0.4.1",
"semver": "^7.6.3",
"tailwindcss": "^3.3.2",
"tailwindcss": "^3.4.13",
"typescript": "~5.0.4",
"vite": "^4.3.5",
"vite": "^5.4.9",
"vue-tsc": "^1.8.27"
}
}
2 changes: 1 addition & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
plugins: {
tailwindcss: {},
autoprefixer: {}
Expand Down
2 changes: 1 addition & 1 deletion src/components/controller/units/ScheduleUpdateDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
NeButton,
NeFormItemLabel,
NeInlineNotification,
NeNotification,
type NeNotification,
NeRadioSelection,
NeSideDrawer,
NeSkeleton,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ function close() {
<span v-if="itemToDelete !== undefined">
{{
t('standalone.conntrack.delete_conntrack_record_message', {
source: itemToDelete?.destination + ':' + itemToDelete?.destination_port ?? '',
destination: itemToDelete?.source + ':' + itemToDelete?.source_port ?? ''
source: itemToDelete?.destination + ':' + itemToDelete?.destination_port || '',
destination: itemToDelete?.source + ':' + itemToDelete?.source_port || ''
})
}}
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ watch(
/>
<NeCombobox
:label="t('standalone.openvpn_rw.user_database')"
:disabled="itemToEdit?.ns_description != '' ?? false"
:disabled="itemToEdit?.ns_description != '' || false"
:options="userDatabaseOptions"
:no-options-label="t('ne_combobox.no_options_label')"
:no-results-label="t('ne_combobox.no_results')"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ async function fetchOptions() {
}

async function resetForm() {
enabled.value = !props.itemToEdit?.disabled ?? true
enabled.value = !props.itemToEdit?.disabled || true
iface.value = props.itemToEdit?.interface ?? ifaceOptions.value?.[0]?.id ?? ''
downloadSpeed.value = props.itemToEdit?.download.toString() ?? ''
uploadSpeed.value = props.itemToEdit?.upload.toString() ?? ''
Expand Down
1 change: 0 additions & 1 deletion src/views/standalone/firewall/PortForward.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import CreateOrEditPortForwardDrawer from '@/components/standalone/firewall/Crea
import { computed } from 'vue'
import { type ObjectReference } from '@/composables/useObjects'
import DeleteModal from '@/components/DeleteModal.vue'
import type { DomainSet } from '@/composables/useDomainSets'

const { t } = useI18n()

Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** @type {import('tailwindcss').Config} */

module.exports = {
export default {
content: [
'./index.html',
'./src/**/*.{vue,js,ts,jsx,tsx}',
Expand Down