Refactor withDefaults

front/src/components/common/ActionFeedback.vue

@@ -7,10 +7,9 @@ interface Props {
   size?: string
 }
 
-const { isLoading, size } = toRefs(withDefaults(
+const { isLoading, size } = toRefs(withDefaults(defineProps<Props>(), {
-  defineProps<Props>(),
+  size: 'small'
-  { size: 'small' }
+}))
-))
 
 const isDone = refAutoReset(false, 2000)
 watch(isLoading, loading => {

front/src/components/common/ActorLink.vue

@@ -12,15 +12,12 @@ interface Props {
   truncateLength?: number
 }
 
-const { displayName, actor, truncateLength, admin, avatar } = toRefs(withDefaults(
+const { displayName, actor, truncateLength, admin, avatar } = toRefs(withDefaults(defineProps<Props>(), {
-  defineProps<Props>(),
-  {
   avatar: true,
   admin: false,
   displayName: false,
   truncateLength: 30
-  }
+}))
-))
 
 const repr = computed(() => {
   const name = displayName.value || actor.value.is_local

front/src/components/common/HumanDate.vue

@@ -8,10 +8,9 @@ interface Props {
   icon?: boolean
 }
 
-const props = withDefaults(
+const props = withDefaults(defineProps<Props>(), {
-  defineProps<Props>(),
+  icon: false
-  { icon: false }
+})
-)
 
 const date = computed(() => new Date(props.date))
 // TODO (wvffle): Translate useTimeAgo

front/src/components/semantic/Modal.vue

@@ -12,14 +12,11 @@ interface Props {
   additionalClasses?: string[]
 }
 
-const props = withDefaults(
+const props = withDefaults(defineProps<Props>(), {
-  defineProps<Props>(),
-  {
   fullscreen: true,
   scrolling: false,
   additionalClasses: () => []
-  }
+})
-)
 
 const emit = defineEmits(['approved', 'deny', 'update:show', 'show', 'hide'])
 

front/src/components/tags/List.vue

@@ -11,16 +11,13 @@ interface Props {
   detailRoute?: string
 }
 
-const props = withDefaults(
+const props = withDefaults(defineProps<Props>(), {
-  defineProps<Props>(),
-  {
   showMore: true,
   truncateSize: 25,
   limit: 5,
   labelClasses: '',
   detailRoute: 'library.tags.detail'
-  }
+})
-)
 
 const honorLimit = ref(true)
 

front/src/views/auth/Login.vue

@@ -5,16 +5,19 @@ import { computed } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { useStore } from 'vuex'
 
+interface Props {
+  next?: string
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  next: '/library'
+})
+
 const { $pgettext } = useGettext()
 const labels = computed(() => ({
   title: $pgettext('Head/Login/Title', 'Log In')
 }))
 
-const props = withDefaults(
-  defineProps<{ next?: string }>(),
-  { next: '/library' }
-)
-
 const store = useStore()
 if (store.state.auth.authenticated) {
   const router = useRouter()