diff --git a/package.json b/package.json index 3ab83655e9..d5a25fb3b4 100644 --- a/package.json +++ b/package.json @@ -249,7 +249,7 @@ "vue-content-loading": "1.6.0", "vue-cropperjs": "4.1.0", "vue-draggable-next": "1.0.5", - "vue-i18n": "9.0.0-alpha.17", + "vue-i18n": "9.0.0-beta.2", "vue-json-pretty": "1.6.7", "vue-loader": "16.0.0-beta.7", "vue-marquee-text-component": "1.1.1", diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue index fb1eee5e4c..a02d5afbb8 100644 --- a/src/client/components/autocomplete.vue +++ b/src/client/components/autocomplete.vue @@ -33,8 +33,8 @@ import { emojilist } from '../../misc/emojilist'; import contains from '@/scripts/contains'; import { twemojiSvgBase } from '../../misc/twemoji-base'; import { getStaticImageUrl } from '@/scripts/get-static-image-url'; -import MkUserSelect from './user-select.vue'; -import { acct } from '../filters/user'; +import MkUserSelect from '@/components/user-select.vue'; +import { acct } from '@/filters/user'; import * as os from '@/os'; type EmojiDef = { diff --git a/src/client/os.ts b/src/client/os.ts index 0d65e6deaf..66d1cbef34 100644 --- a/src/client/os.ts +++ b/src/client/os.ts @@ -46,6 +46,10 @@ export function api(endpoint: string, data: Record = {}, token?: st } export function popup(component: Component, props: Record, events = {}, option?) { + if (_DEV_) { + console.log('os:popup', component, props, events); + } + return new PCancelable((resolve, reject, onCancel) => { markRaw(component); const id = Math.random().toString(); // TODO: uuidとか使う @@ -77,6 +81,10 @@ export function popup(component: Component, props: Record, events = } export function modal(component: Component, props: Record, events = {}, option?: { source?: any; position?: any; cancelableByBgClick?: boolean; }) { + if (_DEV_) { + console.log('os:modal', component, props, events, option); + } + return new PCancelable((resolve, reject, onCancel) => { markRaw(component); const id = Math.random().toString(); // TODO: uuidとか使う diff --git a/src/client/scripts/autocomplete.ts b/src/client/scripts/autocomplete.ts index 62bf758663..5f0910c828 100644 --- a/src/client/scripts/autocomplete.ts +++ b/src/client/scripts/autocomplete.ts @@ -146,7 +146,7 @@ export class Autocomplete { this.opening = false; } else { - const MkAutocomplete = await import('@/components/autocomplete.vue'); + const MkAutocomplete = await import('@/components/autocomplete.vue').then(x => x.default); const _x = ref(x); const _y = ref(y); diff --git a/yarn.lock b/yarn.lock index fd2ee33521..c7bc49b3d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10148,10 +10148,10 @@ vue-eslint-parser@^7.1.0: esquery "^1.0.1" lodash "^4.17.15" -vue-i18n@9.0.0-alpha.17: - version "9.0.0-alpha.17" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.0.0-alpha.17.tgz#a096c8ed0ccc51e16d835192aa8421e89157802b" - integrity sha512-5GIDvYKHPU8DuysdQM7tcALWmBlFbwtM9jKWGI4wBDbych4dK9OMjGCVrC2PvaGD/zo96VLJMYLNpgg0GCk6QA== +vue-i18n@9.0.0-beta.2: + version "9.0.0-beta.2" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.0.0-beta.2.tgz#a07b95502295a04ebc6fb790928af1ddeaf06aae" + integrity sha512-fvpf+LjXFdcSxKWYDaYetto3hnLwLzkPfKUmkzhG/AqgaIi+ZaVf+fLsQUmOaXzqp0l/4orjXjhHUIjhYsBLhA== vue-json-pretty@1.6.7: version "1.6.7"