commit: 3e0bb91ff2133d4c26e0bd267a82ab5b64b2fa49 parent dc8bef7928cb6a5e06a793a78652234276ca6fce Author: Henry Jameson <me@hjkos.com> Date: Tue, 29 Mar 2022 15:35:47 +0300 Merge branch 'vue3-again' into vue3-no-compat * vue3-again: lint + fixes for registration fix production build's reply not working in tree mode lock down version? manual lint Revert "fix weird thing i somehow missed" Revert "lint" fix weird thing i somehow missed lintDiffstat:
20 files changed, 58 insertions(+), 43 deletions(-)
diff --git a/package.json b/package.json @@ -34,7 +34,7 @@ "punycode.js": "2.1.0", "ruffle-mirror": "2021.12.31", "click-outside-vue3": "4.0.1", - "vue": "^3.1.0", + "vue": "^3.2.31", "vue-i18n": "9.1.9", "vue-router": "4.0.14", "vue-template-compiler": "2.6.11", diff --git a/src/components/color_input/color_input.vue b/src/components/color_input/color_input.vue @@ -11,7 +11,7 @@ </label> <Checkbox v-if="typeof fallback !== 'undefined' && showOptionalTickbox" - :modelValue="present" + :model-value="present" :disabled="disabled" class="opt" @update:modelValue="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)" diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue @@ -112,7 +112,10 @@ </span> <span v-if="notification.type === 'pleroma:emoji_reaction'"> <small> - <i18n-t scope="global" keypath="notifications.reacted_with"> + <i18n-t + scope="global" + keypath="notifications.reacted_with" + > <span class="emoji-reaction-emoji">{{ notification.emoji }}</span> </i18n-t> </small> diff --git a/src/components/opacity_input/opacity_input.vue b/src/components/opacity_input/opacity_input.vue @@ -11,7 +11,7 @@ </label> <Checkbox v-if="typeof fallback !== 'undefined'" - :modelValue="present" + :model-value="present" :disabled="disabled" class="opt" @update:modelValue="$emit('update:modelValue', !present ? fallback : undefined)" diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue @@ -71,7 +71,10 @@ {{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }} ยท </template> </div> - <i18n-t scope="global" :keypath="expired ? 'polls.expired' : 'polls.expires_in'"> + <i18n-t + scope="global" + :keypath="expired ? 'polls.expired' : 'polls.expires_in'" + > <Timeago :time="expiresAt" :auto-update="60" diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js @@ -24,7 +24,7 @@ const registration = { password: { required }, confirm: { required, - sameAsPassword: sameAs('password') + sameAs: sameAs(this.password) }, reason: { required: requiredIf(() => this.accountApprovalRequired) } } diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue @@ -12,7 +12,7 @@ <div class="text-fields"> <div class="form-group" - :class="{ 'form-group--error': $v.user.username.$error }" + :class="{ 'form-group--error': v$.user.username.$error }" > <label class="form--label" @@ -20,18 +20,18 @@ >{{ $t('login.username') }}</label> <input id="sign-up-username" - v-model.trim="$v.user.username.$model" + v-model.trim="v$.user.username.$model" :disabled="isPending" class="form-control" :placeholder="$t('registration.username_placeholder')" > </div> <div - v-if="$v.user.username.$dirty" + v-if="v$.user.username.$dirty" class="form-error" > <ul> - <li v-if="!$v.user.username.required"> + <li v-if="!v$.user.username.required"> <span>{{ $t('registration.validations.username_required') }}</span> </li> </ul> @@ -39,7 +39,7 @@ <div class="form-group" - :class="{ 'form-group--error': $v.user.fullname.$error }" + :class="{ 'form-group--error': v$.user.fullname.$error }" > <label class="form--label" @@ -47,18 +47,18 @@ >{{ $t('registration.fullname') }}</label> <input id="sign-up-fullname" - v-model.trim="$v.user.fullname.$model" + v-model.trim="v$.user.fullname.$model" :disabled="isPending" class="form-control" :placeholder="$t('registration.fullname_placeholder')" > </div> <div - v-if="$v.user.fullname.$dirty" + v-if="v$.user.fullname.$dirty" class="form-error" > <ul> - <li v-if="!$v.user.fullname.required"> + <li v-if="!v$.user.fullname.required"> <span>{{ $t('registration.validations.fullname_required') }}</span> </li> </ul> @@ -66,7 +66,7 @@ <div class="form-group" - :class="{ 'form-group--error': $v.user.email.$error }" + :class="{ 'form-group--error': v$.user.email.$error }" > <label class="form--label" @@ -74,18 +74,18 @@ >{{ $t('registration.email') }}</label> <input id="email" - v-model="$v.user.email.$model" + v-model="v$.user.email.$model" :disabled="isPending" class="form-control" type="email" > </div> <div - v-if="$v.user.email.$dirty" + v-if="v$.user.email.$dirty" class="form-error" > <ul> - <li v-if="!$v.user.email.required"> + <li v-if="!v$.user.email.required"> <span>{{ $t('registration.validations.email_required') }}</span> </li> </ul> @@ -107,7 +107,7 @@ <div class="form-group" - :class="{ 'form-group--error': $v.user.password.$error }" + :class="{ 'form-group--error': v$.user.password.$error }" > <label class="form--label" @@ -122,11 +122,11 @@ > </div> <div - v-if="$v.user.password.$dirty" + v-if="v$.user.password.$dirty" class="form-error" > <ul> - <li v-if="!$v.user.password.required"> + <li v-if="!v$.user.password.required"> <span>{{ $t('registration.validations.password_required') }}</span> </li> </ul> @@ -134,7 +134,7 @@ <div class="form-group" - :class="{ 'form-group--error': $v.user.confirm.$error }" + :class="{ 'form-group--error': v$.user.confirm.$error }" > <label class="form--label" @@ -149,14 +149,14 @@ > </div> <div - v-if="$v.user.confirm.$dirty" + v-if="v$.user.confirm.$dirty" class="form-error" > <ul> - <li v-if="!$v.user.confirm.required"> + <li v-if="!v$.user.confirm.required"> <span>{{ $t('registration.validations.password_confirmation_required') }}</span> </li> - <li v-if="!$v.user.confirm.sameAsPassword"> + <li v-if="!v$.user.confirm.sameAsPassword"> <span>{{ $t('registration.validations.password_confirmation_match') }}</span> </li> </ul> diff --git a/src/components/selectable_list/selectable_list.vue b/src/components/selectable_list/selectable_list.vue @@ -6,7 +6,7 @@ > <div class="selectable-list-checkbox-wrapper"> <Checkbox - :modelValue="allSelected" + :model-value="allSelected" :indeterminate="someSelected" @change="toggleAll" > @@ -31,7 +31,7 @@ > <div class="selectable-list-checkbox-wrapper"> <Checkbox - :modelValue="isSelected(item)" + :model-value="isSelected(item)" @change="checked => toggle(checked, item)" /> </div> diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue @@ -4,7 +4,7 @@ class="BooleanSetting" > <Checkbox - :modelValue="state" + :model-value="state" :disabled="disabled" @update:modelValue="update" > diff --git a/src/components/settings_modal/helpers/choice_setting.vue b/src/components/settings_modal/helpers/choice_setting.vue @@ -6,7 +6,7 @@ <slot /> {{ ' ' }} <Select - :modelValue="state" + :model-value="state" :disabled="disabled" @update:modelValue="update" > diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue @@ -110,12 +110,15 @@ </template> </Popover> - <Checkbox :modelValue="!!expertLevel" @update:modelValue="expertLevel = Number($event)"> + <Checkbox + :model-value="!!expertLevel" + @update:modelValue="expertLevel = Number($event)" + > {{ $t("settings.expert_mode") }} </Checkbox> <span - class="extra-content" id="unscrolled-content" + class="extra-content" /> </div> </div> diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue @@ -184,8 +184,8 @@ <button v-if="!isDefaultBackground" class="button-unstyled" - @click="resetBackground" :title="$t('settings.reset_profile_background')" + @click="resetBackground" > <FAIcon class="reset-button" diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue @@ -951,14 +951,16 @@ :fallback="currentShadowFallback" /> <div v-if="shadowSelected === 'avatar' || shadowSelected === 'avatarStatus'"> - <i18n-t scope="global" + <i18n-t + scope="global" keypath="settings.style.shadows.filter_hint.always_drop_shadow" tag="p" > <code>filter: drop-shadow()</code> </i18n-t> <p>{{ $t('settings.style.shadows.filter_hint.avatar_inset') }}</p> - <i18n-t scope="global" + <i18n-t + scope="global" keypath="settings.style.shadows.filter_hint.drop_shadow_syntax" tag="p" > @@ -966,7 +968,8 @@ <code>spread-radius</code> <code>inset</code> </i18n-t> - <i18n-t scope="global" + <i18n-t + scope="global" keypath="settings.style.shadows.filter_hint.inset_classic" tag="p" > diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue @@ -204,7 +204,8 @@ v-model="selected.alpha" :disabled="!present" /> - <i18n-t scope="global" + <i18n-t + scope="global" keypath="settings.style.shadows.hintV3" tag="p" > diff --git a/src/components/status/status.js b/src/components/status/status.js @@ -69,7 +69,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => { const controlledName = `controlled${camelized}` const uncontrolledName = `uncontrolled${camelized}` res[name] = function () { - return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName] + return (this.$props[toggle] && this[toggle]) ? this[controlledName] : this[uncontrolledName] } return res }, {}) diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js @@ -31,7 +31,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => { const controlledName = `controlled${camelized}` const uncontrolledName = `uncontrolled${camelized}` res[name] = function () { - return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName] + return (this.$props[toggle] && this[toggle]) ? this[controlledName] : this[uncontrolledName] } return res }, {}) diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue @@ -74,8 +74,9 @@ v-if="currentReplies.length && !threadShowing" class="thread-tree-replies thread-tree-replies-hidden" > - <i18n-t scope="global" + <i18n-t v-if="simple" + scope="global" tag="button" keypath="status.thread_follow_with_icon" class="button-unstyled -link thread-tree-show-replies-button" @@ -92,8 +93,9 @@ </span> </template> </i18n-t> - <i18n-t scope="global" + <i18n-t v-else + scope="global" tag="button" keypath="status.thread_show_full_with_icon" class="button-unstyled -link thread-tree-show-replies-button" diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue @@ -2,7 +2,7 @@ <span class="Avatar" :class="{ '-compact': compact }" - > + > <StillImage v-if="user" class="avatar" diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue @@ -53,7 +53,7 @@ :statusoid="item" /> <Checkbox - :modelValue="isChecked(item.id)" + :model-value="isChecked(item.id)" @change="checked => toggleStatus(checked, item.id)" /> </div> diff --git a/yarn.lock b/yarn.lock @@ -9962,7 +9962,7 @@ vue-template-compiler@2.6.11: de-indent "^1.0.2" he "^1.1.0" -vue@^3.1.0: +vue@^3.2.31: version "3.2.31" resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.31.tgz#e0c49924335e9f188352816788a4cca10f817ce6" integrity sha512-odT3W2tcffTiQCy57nOT93INw1auq5lYLLYtWpPYQQYQOOdHiqFct9Xhna6GJ+pJQaF67yZABraH47oywkJgFw==