commit: e80e53d9d2b02f12c522f3f3d2fe6ae09739d675
parent 3e0bb91ff2133d4c26e0bd267a82ab5b64b2fa49
Author: Henry Jameson <me@hjkos.com>
Date: Tue, 29 Mar 2022 16:00:56 +0300
Merge branch 'vue3-again' into vue3-no-compat
* vue3-again:
re-fix i18n warnings again
fix qr code
Diffstat:
5 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/package.json b/package.json
@@ -17,14 +17,18 @@
},
"dependencies": {
"@babel/runtime": "7.17.8",
- "@chenfengyuan/vue-qrcode": "1.0.2",
+ "@chenfengyuan/vue-qrcode": "2.0.0",
"@fortawesome/fontawesome-svg-core": "1.3.0",
"@fortawesome/free-regular-svg-icons": "5.15.4",
"@fortawesome/free-solid-svg-icons": "5.15.4",
"@fortawesome/vue-fontawesome": "3.0.0-5",
"@kazvmoe-infra/pinch-zoom-element": "1.2.0",
+ "@vue/compat": "^3.1.0",
+ "@vuelidate/core": "2.0.0-alpha.35",
+ "@vuelidate/validators": "2.0.0-alpha.27",
"body-scroll-lock": "2.7.1",
"chromatism": "3.0.0",
+ "click-outside-vue3": "4.0.1",
"cropperjs": "1.5.12",
"diff": "3.5.0",
"escape-html": "1.0.3",
@@ -32,14 +36,12 @@
"parse-link-header": "1.0.1",
"phoenix": "1.4.0",
"punycode.js": "2.1.0",
+ "qrcode": "1",
"ruffle-mirror": "2021.12.31",
- "click-outside-vue3": "4.0.1",
"vue": "^3.2.31",
"vue-i18n": "9.1.9",
"vue-router": "4.0.14",
"vue-template-compiler": "2.6.11",
- "@vuelidate/core": "2.0.0-alpha.35",
- "@vuelidate/validators": "2.0.0-alpha.27",
"vuex": "4.0.2"
},
"devDependencies": {
@@ -50,8 +52,8 @@
"@ungap/event-target": "0.2.3",
"@vue/babel-helper-vue-jsx-merge-props": "1.2.1",
"@vue/babel-plugin-jsx": "1.1.1",
- "@vue/test-utils": "2.0.0-rc.17",
"@vue/compiler-sfc": "^3.1.0",
+ "@vue/test-utils": "2.0.0-rc.17",
"autoprefixer": "6.7.7",
"babel-eslint": "7.2.3",
"babel-loader": "8.2.4",
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
@@ -32,6 +32,7 @@
tag="button"
class="button-unstyled -link"
@click.prevent="diveToTopLevel"
+ scope="global"
>
<template #icon>
<FAIcon
@@ -101,6 +102,7 @@
>
<i18n-t
tag="button"
+ scope="global"
keypath="status.ancestor_follow_with_icon"
class="button-unstyled -link thread-tree-show-replies-button"
@click.prevent="diveIntoStatus(status.id)"
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
@@ -23,6 +23,7 @@
keypath="post_status.account_not_locked_warning"
tag="p"
class="visibility-notice"
+ scope="global"
>
<button
class="button-unstyled -link"
diff --git a/src/components/settings_modal/tabs/theme_tab/preview.vue b/src/components/settings_modal/tabs/theme_tab/preview.vue
@@ -29,7 +29,7 @@
{{ $t('settings.style.preview.content') }}
</h4>
- <i18n-t keypath="settings.style.preview.text">
+ <i18n-t scope="global" keypath="settings.style.preview.text">
<code style="font-family: var(--postCodeFont)">
{{ $t('settings.style.preview.mono') }}
</code>
@@ -76,6 +76,7 @@
keypath="settings.style.preview.fine_print"
tag="span"
class="faint"
+ scope="global"
>
<a style="color: var(--faintLink)">
{{ $t('settings.style.preview.faint_link') }}
diff --git a/yarn.lock b/yarn.lock
@@ -1160,12 +1160,10 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"
-"@chenfengyuan/vue-qrcode@1.0.2":
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/@chenfengyuan/vue-qrcode/-/vue-qrcode-1.0.2.tgz#37d71902e166e1ae58176bd6cb9c40905c1b0949"
- integrity sha512-hwy1d4YMJAyEh+V7dLPG8eAKACRvugzSB4ylwb6QNqo84KHTF50/5EJcBYdUhTRPfAqrxG0i6jDAXONWOGyQbQ==
- dependencies:
- qrcode "^1.4.4"
+"@chenfengyuan/vue-qrcode@2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@chenfengyuan/vue-qrcode/-/vue-qrcode-2.0.0.tgz#8cd01f6fc528d471680ebe812ec47c830aea7e63"
+ integrity sha512-33Cfr0zjbc3Dd8d5b1IgzXRAgXH0c2Gv19VI4snS25V/x9Z41eg769tC+Us1x+vqgQQhgD5YUjLnkpkrQfeMSw==
"@colors/colors@1.5.0":
version "1.5.0"
@@ -3571,8 +3569,9 @@ diffie-hellman@^5.0.0:
randombytes "^2.0.0"
dijkstrajs@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.2.tgz#2e48c0d3b825462afe75ab4ad5e829c8ece36257"
+ integrity sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg==
dir-glob@^3.0.1:
version "3.0.1"
@@ -8002,7 +8001,7 @@ qjobs@^1.2.0:
resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
-qrcode@^1.4.4:
+qrcode@1:
version "1.5.0"
resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.0.tgz#95abb8a91fdafd86f8190f2836abbfc500c72d1b"
integrity sha512-9MgRpgVc+/+47dFvQeD6U2s0Z92EsKzcHogtum4QB+UNd025WOJSHvn/hjk9xmzj7Stj95CyUAs31mrjxliEsQ==
@@ -10098,6 +10097,7 @@ which-boxed-primitive@^1.0.2:
which-module@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+ integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
which@^1.0.9, which@^1.1.1, which@^1.2.9, which@^1.3.1:
version "1.3.1"
