diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-03-24 11:34:29 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-03-24 11:34:29 +0900 |
| commit | 3e11011229ef8459747acdf6d3008dc145280fec (patch) | |
| tree | 8ebc85727c4d295f6583b63d9397651151d4394a /src/client/components | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.75.1 (diff) | |
| download | misskey-3e11011229ef8459747acdf6d3008dc145280fec.tar.gz misskey-3e11011229ef8459747acdf6d3008dc145280fec.tar.bz2 misskey-3e11011229ef8459747acdf6d3008dc145280fec.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client/components')
110 files changed, 272 insertions, 272 deletions
diff --git a/src/client/components/abuse-report-window.vue b/src/client/components/abuse-report-window.vue index 98578ee44f..7dbb9657bd 100644 --- a/src/client/components/abuse-report-window.vue +++ b/src/client/components/abuse-report-window.vue @@ -29,10 +29,10 @@ <script lang="ts"> import { defineComponent, markRaw } from 'vue'; import { faExclamationCircle } from '@fortawesome/free-solid-svg-icons'; -import XWindow from '@/components/ui/window.vue'; -import MkTextarea from '@/components/ui/textarea.vue'; -import MkButton from '@/components/ui/button.vue'; -import * as os from '@/os'; +import XWindow from '@client/components/ui/window.vue'; +import MkTextarea from '@client/components/ui/textarea.vue'; +import MkButton from '@client/components/ui/button.vue'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/analog-clock.vue b/src/client/components/analog-clock.vue index 04d98508bb..8aa51898bc 100644 --- a/src/client/components/analog-clock.vue +++ b/src/client/components/analog-clock.vue @@ -36,7 +36,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import * as tinycolor from 'tinycolor2'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ data() { diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue index ae742610f7..35cfb77301 100644 --- a/src/client/components/autocomplete.vue +++ b/src/client/components/autocomplete.vue @@ -29,12 +29,12 @@ <script lang="ts"> import { defineComponent, markRaw } from 'vue'; -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 { acct } from '@/filters/user'; -import * as os from '@/os'; +import { emojilist } from '@/misc/emojilist'; +import contains from '@client/scripts/contains'; +import { twemojiSvgBase } from '@/misc/twemoji-base'; +import { getStaticImageUrl } from '@client/scripts/get-static-image-url'; +import { acct } from '@client/filters/user'; +import * as os from '@client/os'; type EmojiDef = { emoji: string; diff --git a/src/client/components/avatars.vue b/src/client/components/avatars.vue index 8bf64d79b5..cac95e6d40 100644 --- a/src/client/components/avatars.vue +++ b/src/client/components/avatars.vue @@ -8,7 +8,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/channel-follow-button.vue b/src/client/components/channel-follow-button.vue index 17770a6f36..dc0c0faa1f 100644 --- a/src/client/components/channel-follow-button.vue +++ b/src/client/components/channel-follow-button.vue @@ -21,7 +21,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faSpinner, faPlus, faMinus, } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/dialog.vue b/src/client/components/dialog.vue index a34f7f7947..ef30715343 100644 --- a/src/client/components/dialog.vue +++ b/src/client/components/dialog.vue @@ -40,10 +40,10 @@ import { defineComponent } from 'vue'; import { faSpinner, faInfoCircle, faExclamationTriangle, faCheck } from '@fortawesome/free-solid-svg-icons'; import { faTimesCircle, faQuestionCircle } from '@fortawesome/free-regular-svg-icons'; -import MkModal from '@/components/ui/modal.vue'; -import MkButton from '@/components/ui/button.vue'; -import MkInput from '@/components/ui/input.vue'; -import MkSelect from '@/components/ui/select.vue'; +import MkModal from '@client/components/ui/modal.vue'; +import MkButton from '@client/components/ui/button.vue'; +import MkInput from '@client/components/ui/input.vue'; +import MkSelect from '@client/components/ui/select.vue'; export default defineComponent({ components: { diff --git a/src/client/components/drive-file-thumbnail.vue b/src/client/components/drive-file-thumbnail.vue index e669da6a90..91f57d1f49 100644 --- a/src/client/components/drive-file-thumbnail.vue +++ b/src/client/components/drive-file-thumbnail.vue @@ -27,7 +27,7 @@ import { faFilm } from '@fortawesome/free-solid-svg-icons'; import ImgWithBlurhash from './img-with-blurhash.vue'; -import { ColdDeviceStorage } from '@/store'; +import { ColdDeviceStorage } from '@client/store'; export default defineComponent({ components: { diff --git a/src/client/components/drive-select-dialog.vue b/src/client/components/drive-select-dialog.vue index f9a4025452..ce6e2fa789 100644 --- a/src/client/components/drive-select-dialog.vue +++ b/src/client/components/drive-select-dialog.vue @@ -20,8 +20,8 @@ <script lang="ts"> import { defineComponent } from 'vue'; import XDrive from './drive.vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; -import number from '@/filters/number'; +import XModalWindow from '@client/components/ui/modal-window.vue'; +import number from '@client/filters/number'; export default defineComponent({ components: { diff --git a/src/client/components/drive-window.vue b/src/client/components/drive-window.vue index 43f07ebe76..30b04091be 100644 --- a/src/client/components/drive-window.vue +++ b/src/client/components/drive-window.vue @@ -15,7 +15,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import XDrive from './drive.vue'; -import XWindow from '@/components/ui/window.vue'; +import XWindow from '@client/components/ui/window.vue'; export default defineComponent({ components: { diff --git a/src/client/components/drive.file.vue b/src/client/components/drive.file.vue index 5075b574c4..03f2da008d 100644 --- a/src/client/components/drive.file.vue +++ b/src/client/components/drive.file.vue @@ -34,10 +34,10 @@ import { defineComponent } from 'vue'; import { faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons'; import { faDownload, faLink, faICursor, faTrashAlt } from '@fortawesome/free-solid-svg-icons'; -import copyToClipboard from '@/scripts/copy-to-clipboard'; +import copyToClipboard from '@client/scripts/copy-to-clipboard'; import MkDriveFileThumbnail from './drive-file-thumbnail.vue'; -import bytes from '@/filters/bytes'; -import * as os from '@/os'; +import bytes from '@client/filters/bytes'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/drive.folder.vue b/src/client/components/drive.folder.vue index 745b6018da..2822c85680 100644 --- a/src/client/components/drive.folder.vue +++ b/src/client/components/drive.folder.vue @@ -29,7 +29,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faFolder, faFolderOpen, faTrashAlt, faWindowRestore } from '@fortawesome/free-regular-svg-icons'; -import * as os from '@/os'; +import * as os from '@client/os'; import { faICursor } from '@fortawesome/free-solid-svg-icons'; export default defineComponent({ diff --git a/src/client/components/drive.nav-folder.vue b/src/client/components/drive.nav-folder.vue index 881330529c..89a267b19f 100644 --- a/src/client/components/drive.nav-folder.vue +++ b/src/client/components/drive.nav-folder.vue @@ -15,7 +15,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faCloud } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/drive.vue b/src/client/components/drive.vue index b9d93ee4cc..150d0d8774 100644 --- a/src/client/components/drive.vue +++ b/src/client/components/drive.vue @@ -52,7 +52,7 @@ import XNavFolder from './drive.nav-folder.vue'; import XFolder from './drive.folder.vue'; import XFile from './drive.file.vue'; import MkButton from './ui/button.vue'; -import * as os from '@/os'; +import * as os from '@client/os'; import { faTrashAlt } from '@fortawesome/free-regular-svg-icons'; export default defineComponent({ diff --git a/src/client/components/emoji-picker-dialog.vue b/src/client/components/emoji-picker-dialog.vue index 4b165d9f91..5bdbc330ad 100644 --- a/src/client/components/emoji-picker-dialog.vue +++ b/src/client/components/emoji-picker-dialog.vue @@ -6,8 +6,8 @@ <script lang="ts"> import { defineComponent, markRaw } from 'vue'; -import MkModal from '@/components/ui/modal.vue'; -import MkEmojiPicker from '@/components/emoji-picker.vue'; +import MkModal from '@client/components/ui/modal.vue'; +import MkEmojiPicker from '@client/components/emoji-picker.vue'; export default defineComponent({ components: { diff --git a/src/client/components/emoji-picker-window.vue b/src/client/components/emoji-picker-window.vue index fb6a5a9072..5504eaecd6 100644 --- a/src/client/components/emoji-picker-window.vue +++ b/src/client/components/emoji-picker-window.vue @@ -13,8 +13,8 @@ <script lang="ts"> import { defineComponent, markRaw } from 'vue'; -import MkWindow from '@/components/ui/window.vue'; -import MkEmojiPicker from '@/components/emoji-picker.vue'; +import MkWindow from '@client/components/ui/window.vue'; +import MkEmojiPicker from '@client/components/emoji-picker.vue'; export default defineComponent({ components: { diff --git a/src/client/components/emoji-picker.section.vue b/src/client/components/emoji-picker.section.vue index a12493ce0d..944c507bdc 100644 --- a/src/client/components/emoji-picker.section.vue +++ b/src/client/components/emoji-picker.section.vue @@ -18,7 +18,7 @@ <script lang="ts"> import { defineComponent, markRaw } from 'vue'; import { faChevronUp, faChevronDown } from '@fortawesome/free-solid-svg-icons'; -import { getStaticImageUrl } from '@/scripts/get-static-image-url'; +import { getStaticImageUrl } from '@client/scripts/get-static-image-url'; export default defineComponent({ props: { diff --git a/src/client/components/emoji-picker.vue b/src/client/components/emoji-picker.vue index 99d6c8a330..573833b9d3 100644 --- a/src/client/components/emoji-picker.vue +++ b/src/client/components/emoji-picker.vue @@ -74,15 +74,15 @@ <script lang="ts"> import { defineComponent, markRaw } from 'vue'; -import { emojilist } from '../../misc/emojilist'; -import { getStaticImageUrl } from '@/scripts/get-static-image-url'; +import { emojilist } from '@/misc/emojilist'; +import { getStaticImageUrl } from '@client/scripts/get-static-image-url'; import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faClock, faUser, faChevronDown, faShapes, faBicycle, faHashtag } from '@fortawesome/free-solid-svg-icons'; import { faHeart, faFlag, faLaugh } from '@fortawesome/free-regular-svg-icons'; -import Particle from '@/components/particle.vue'; -import * as os from '@/os'; -import { isDeviceTouch } from '@/scripts/is-device-touch'; -import { isMobile } from '@/scripts/is-mobile'; -import { emojiCategories } from '@/instance'; +import Particle from '@client/components/particle.vue'; +import * as os from '@client/os'; +import { isDeviceTouch } from '@client/scripts/is-device-touch'; +import { isMobile } from '@client/scripts/is-mobile'; +import { emojiCategories } from '@client/instance'; import XSection from './emoji-picker.section.vue'; export default defineComponent({ diff --git a/src/client/components/featured-photos.vue b/src/client/components/featured-photos.vue index d0eb775cd0..daa2190feb 100644 --- a/src/client/components/featured-photos.vue +++ b/src/client/components/featured-photos.vue @@ -6,7 +6,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/file-type-icon.vue b/src/client/components/file-type-icon.vue index ec29d5c882..2da9ba0cbd 100644 --- a/src/client/components/file-type-icon.vue +++ b/src/client/components/file-type-icon.vue @@ -7,7 +7,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faFileImage } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/follow-button.vue b/src/client/components/follow-button.vue index 1234649e5a..d2dc9223bd 100644 --- a/src/client/components/follow-button.vue +++ b/src/client/components/follow-button.vue @@ -30,7 +30,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faSpinner, faPlus, faMinus, faHourglassHalf } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/form-dialog.vue b/src/client/components/form-dialog.vue index 7620abcd76..d6a7e39d45 100644 --- a/src/client/components/form-dialog.vue +++ b/src/client/components/form-dialog.vue @@ -48,7 +48,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import XModalWindow from '@client/components/ui/modal-window.vue'; import FormBase from './form/base.vue'; import FormInput from './form/input.vue'; import FormTextarea from './form/textarea.vue'; diff --git a/src/client/components/form/pagination.vue b/src/client/components/form/pagination.vue index df65d9684d..0a2f1ff0e1 100644 --- a/src/client/components/form/pagination.vue +++ b/src/client/components/form/pagination.vue @@ -16,7 +16,7 @@ import { defineComponent } from 'vue'; import FormButton from './button.vue'; import FormGroup from './group.vue'; -import paging from '@/scripts/paging'; +import paging from '@client/scripts/paging'; export default defineComponent({ components: { diff --git a/src/client/components/form/radios.vue b/src/client/components/form/radios.vue index 4c7f405cac..4561df32e1 100644 --- a/src/client/components/form/radios.vue +++ b/src/client/components/form/radios.vue @@ -1,6 +1,6 @@ <script lang="ts"> import { defineComponent, h } from 'vue'; -import MkRadio from '@/components/ui/radio.vue'; +import MkRadio from '@client/components/ui/radio.vue'; import './form.scss'; export default defineComponent({ diff --git a/src/client/components/formula-core.vue b/src/client/components/formula-core.vue index 29c049297e..6e35295ff5 100644 --- a/src/client/components/formula-core.vue +++ b/src/client/components/formula-core.vue @@ -6,7 +6,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import * as katex from 'katex';import * as os from '@/os'; +import * as katex from 'katex';import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/formula.vue b/src/client/components/formula.vue index fbb40bace7..6722ce38a1 100644 --- a/src/client/components/formula.vue +++ b/src/client/components/formula.vue @@ -3,7 +3,7 @@ </template> <script lang="ts"> -import { defineComponent, defineAsyncComponent } from 'vue';import * as os from '@/os'; +import { defineComponent, defineAsyncComponent } from 'vue';import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/global/a.vue b/src/client/components/global/a.vue index d293cb571f..a8a597b2bb 100644 --- a/src/client/components/global/a.vue +++ b/src/client/components/global/a.vue @@ -7,12 +7,12 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faExpandAlt, faColumns, faExternalLinkAlt, faLink, faWindowMaximize } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; -import copyToClipboard from '@/scripts/copy-to-clipboard'; -import { router } from '@/router'; -import { url } from '@/config'; -import { popout } from '@/scripts/popout'; -import { ColdDeviceStorage } from '@/store'; +import * as os from '@client/os'; +import copyToClipboard from '@client/scripts/copy-to-clipboard'; +import { router } from '@client/router'; +import { url } from '@client/config'; +import { popout } from '@client/scripts/popout'; +import { ColdDeviceStorage } from '@client/store'; export default defineComponent({ inject: { diff --git a/src/client/components/global/acct.vue b/src/client/components/global/acct.vue index cad906524e..a969636a7e 100644 --- a/src/client/components/global/acct.vue +++ b/src/client/components/global/acct.vue @@ -8,7 +8,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { toUnicode } from 'punycode'; -import { host } from '@/config'; +import { host } from '@client/config'; export default defineComponent({ props: ['user', 'detail'], diff --git a/src/client/components/global/avatar.vue b/src/client/components/global/avatar.vue index d2f25fa41e..83675a155c 100644 --- a/src/client/components/global/avatar.vue +++ b/src/client/components/global/avatar.vue @@ -9,9 +9,9 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import { getStaticImageUrl } from '@/scripts/get-static-image-url'; -import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash'; -import { acct, userPage } from '@/filters/user'; +import { getStaticImageUrl } from '@client/scripts/get-static-image-url'; +import { extractAvgColorFromBlurhash } from '@client/scripts/extract-avg-color-from-blurhash'; +import { acct, userPage } from '@client/filters/user'; export default defineComponent({ props: { diff --git a/src/client/components/global/emoji.vue b/src/client/components/global/emoji.vue index c072b8431b..f4ebd5f3b3 100644 --- a/src/client/components/global/emoji.vue +++ b/src/client/components/global/emoji.vue @@ -7,8 +7,8 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import { getStaticImageUrl } from '@/scripts/get-static-image-url'; -import { twemojiSvgBase } from '@/../misc/twemoji-base'; +import { getStaticImageUrl } from '@client/scripts/get-static-image-url'; +import { twemojiSvgBase } from '@client/../misc/twemoji-base'; export default defineComponent({ props: { diff --git a/src/client/components/global/error.vue b/src/client/components/global/error.vue index b78973ff82..af989b1c57 100644 --- a/src/client/components/global/error.vue +++ b/src/client/components/global/error.vue @@ -11,7 +11,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@client/components/ui/button.vue'; export default defineComponent({ components: { diff --git a/src/client/components/global/loading.vue b/src/client/components/global/loading.vue index b4693258b9..5d0c10c086 100644 --- a/src/client/components/global/loading.vue +++ b/src/client/components/global/loading.vue @@ -6,7 +6,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/global/misskey-flavored-markdown.vue b/src/client/components/global/misskey-flavored-markdown.vue index a3f443d5d8..988cf9cf47 100644 --- a/src/client/components/global/misskey-flavored-markdown.vue +++ b/src/client/components/global/misskey-flavored-markdown.vue @@ -4,7 +4,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import MfmCore from '@/components/mfm'; +import MfmCore from '@client/components/mfm'; export default defineComponent({ components: { diff --git a/src/client/components/global/url.vue b/src/client/components/global/url.vue index 2650cd33fd..c89536ebdb 100644 --- a/src/client/components/global/url.vue +++ b/src/client/components/global/url.vue @@ -23,9 +23,9 @@ import { defineComponent } from 'vue'; import { faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons'; import { toUnicode as decodePunycode } from 'punycode'; -import { url as local } from '@/config'; -import { isDeviceTouch } from '@/scripts/is-device-touch'; -import * as os from '@/os'; +import { url as local } from '@client/config'; +import { isDeviceTouch } from '@client/scripts/is-device-touch'; +import * as os from '@client/os'; export default defineComponent({ props: { @@ -72,7 +72,7 @@ export default defineComponent({ if (!document.body.contains(this.$el)) return; if (this.close) return; - const { dispose } = await os.popup(import('@/components/url-preview-popup.vue'), { + const { dispose } = await os.popup(import('@client/components/url-preview-popup.vue'), { url: this.url, source: this.$el }); diff --git a/src/client/components/google.vue b/src/client/components/google.vue index fe692a9255..20dc1f825a 100644 --- a/src/client/components/google.vue +++ b/src/client/components/google.vue @@ -8,7 +8,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faSearch } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: ['q'], diff --git a/src/client/components/image-viewer.vue b/src/client/components/image-viewer.vue index 320df30506..ec22bd98ec 100644 --- a/src/client/components/image-viewer.vue +++ b/src/client/components/image-viewer.vue @@ -14,9 +14,9 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import bytes from '@/filters/bytes'; -import number from '@/filters/number'; -import MkModal from '@/components/ui/modal.vue'; +import bytes from '@client/filters/bytes'; +import number from '@client/filters/number'; +import MkModal from '@client/components/ui/modal.vue'; export default defineComponent({ components: { diff --git a/src/client/components/instance-stats.vue b/src/client/components/instance-stats.vue index e9b496180a..75abefc2fe 100644 --- a/src/client/components/instance-stats.vue +++ b/src/client/components/instance-stats.vue @@ -126,7 +126,7 @@ import { defineComponent, markRaw } from 'vue'; import { faChartBar, faUser, faPencilAlt, faSync } from '@fortawesome/free-solid-svg-icons'; import Chart from 'chart.js'; import MkSelect from './ui/select.vue'; -import number from '@/filters/number'; +import number from '@client/filters/number'; const sum = (...arr) => arr.reduce((r, a) => r.map((b, i) => a[i] + b)); const negate = arr => arr.map(x => -x); @@ -137,7 +137,7 @@ const alpha = (hex, a) => { const b = parseInt(result[3], 16); return `rgba(${r}, ${g}, ${b}, ${a})`; }; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/instance-ticker.vue b/src/client/components/instance-ticker.vue index 1ce5a1c2c1..5674174558 100644 --- a/src/client/components/instance-ticker.vue +++ b/src/client/components/instance-ticker.vue @@ -7,7 +7,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import { instanceName } from '@/config'; +import { instanceName } from '@client/config'; export default defineComponent({ props: { diff --git a/src/client/components/launch-pad.vue b/src/client/components/launch-pad.vue index 4d2a3b2c77..a81320954c 100644 --- a/src/client/components/launch-pad.vue +++ b/src/client/components/launch-pad.vue @@ -36,9 +36,9 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faQuestionCircle, faInfoCircle, faCircle } from '@fortawesome/free-solid-svg-icons'; -import MkModal from '@/components/ui/modal.vue'; -import { sidebarDef } from '@/sidebar'; -import { instanceName } from '@/config'; +import MkModal from '@client/components/ui/modal.vue'; +import { sidebarDef } from '@client/sidebar'; +import { instanceName } from '@client/config'; export default defineComponent({ components: { diff --git a/src/client/components/link.vue b/src/client/components/link.vue index f51773dc4b..cc7db8c2f5 100644 --- a/src/client/components/link.vue +++ b/src/client/components/link.vue @@ -12,9 +12,9 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons'; -import { url as local } from '@/config'; -import { isDeviceTouch } from '@/scripts/is-device-touch'; -import * as os from '@/os'; +import { url as local } from '@client/config'; +import { isDeviceTouch } from '@client/scripts/is-device-touch'; +import * as os from '@client/os'; export default defineComponent({ props: { @@ -46,7 +46,7 @@ export default defineComponent({ if (!document.body.contains(this.$el)) return; if (this.close) return; - const { dispose } = await os.popup(import('@/components/url-preview-popup.vue'), { + const { dispose } = await os.popup(import('@client/components/url-preview-popup.vue'), { url: this.url, source: this.$el }); diff --git a/src/client/components/media-banner.vue b/src/client/components/media-banner.vue index a2e1776d09..29d7c727f6 100644 --- a/src/client/components/media-banner.vue +++ b/src/client/components/media-banner.vue @@ -28,8 +28,8 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; -import { ColdDeviceStorage } from '@/store'; +import * as os from '@client/os'; +import { ColdDeviceStorage } from '@client/store'; export default defineComponent({ props: { diff --git a/src/client/components/media-image.vue b/src/client/components/media-image.vue index 9f3898ec56..41760d98d7 100644 --- a/src/client/components/media-image.vue +++ b/src/client/components/media-image.vue @@ -24,11 +24,11 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faExclamationTriangle, faEyeSlash } from '@fortawesome/free-solid-svg-icons'; -import { getStaticImageUrl } from '@/scripts/get-static-image-url'; -import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash'; +import { getStaticImageUrl } from '@client/scripts/get-static-image-url'; +import { extractAvgColorFromBlurhash } from '@client/scripts/extract-avg-color-from-blurhash'; import ImageViewer from './image-viewer.vue'; import ImgWithBlurhash from './img-with-blurhash.vue'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/media-list.vue b/src/client/components/media-list.vue index 36fbb4bd06..71767a0f9f 100644 --- a/src/client/components/media-list.vue +++ b/src/client/components/media-list.vue @@ -17,7 +17,7 @@ import { defineComponent } from 'vue'; import XBanner from './media-banner.vue'; import XImage from './media-image.vue'; import XVideo from './media-video.vue'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/media-video.vue b/src/client/components/media-video.vue index bdd3983e1e..b6f63cb65d 100644 --- a/src/client/components/media-video.vue +++ b/src/client/components/media-video.vue @@ -25,7 +25,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faExclamationTriangle, faEyeSlash } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/mention.vue b/src/client/components/mention.vue index 12a620af9d..322e56d957 100644 --- a/src/client/components/mention.vue +++ b/src/client/components/mention.vue @@ -17,9 +17,9 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { toUnicode } from 'punycode'; -import { host as localHost } from '@/config'; +import { host as localHost } from '@client/config'; import { wellKnownServices } from '../../well-known-services'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/mfm.ts b/src/client/components/mfm.ts index bca469a159..28ac9b8942 100644 --- a/src/client/components/mfm.ts +++ b/src/client/components/mfm.ts @@ -1,16 +1,16 @@ import { VNode, defineComponent, h } from 'vue'; -import { MfmForest } from '@/../mfm/prelude'; -import { parse, parsePlain } from '@/../mfm/parse'; -import MkUrl from '@/components/global/url.vue'; -import MkLink from '@/components/link.vue'; -import MkMention from '@/components/mention.vue'; -import MkEmoji from '@/components/global/emoji.vue'; -import { concat } from '@/../prelude/array'; -import MkFormula from '@/components/formula.vue'; -import MkCode from '@/components/code.vue'; -import MkGoogle from '@/components/google.vue'; -import MkA from '@/components/global/a.vue'; -import { host } from '@/config'; +import { MfmForest } from '@client/../mfm/prelude'; +import { parse, parsePlain } from '@client/../mfm/parse'; +import MkUrl from '@client/components/global/url.vue'; +import MkLink from '@client/components/link.vue'; +import MkMention from '@client/components/mention.vue'; +import MkEmoji from '@client/components/global/emoji.vue'; +import { concat } from '@client/../prelude/array'; +import MkFormula from '@client/components/formula.vue'; +import MkCode from '@client/components/code.vue'; +import MkGoogle from '@client/components/google.vue'; +import MkA from '@client/components/global/a.vue'; +import { host } from '@client/config'; export default defineComponent({ props: { diff --git a/src/client/components/mini-chart.vue b/src/client/components/mini-chart.vue index 2eb9ae8cbe..0d01e4e4b5 100644 --- a/src/client/components/mini-chart.vue +++ b/src/client/components/mini-chart.vue @@ -32,7 +32,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { v4 as uuid } from 'uuid'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/note-detailed.vue b/src/client/components/note-detailed.vue index ea26d31100..fb4f9502b3 100644 --- a/src/client/components/note-detailed.vue +++ b/src/client/components/note-detailed.vue @@ -132,15 +132,15 @@ import XReactionsViewer from './reactions-viewer.vue'; import XMediaList from './media-list.vue'; import XCwButton from './cw-button.vue'; import XPoll from './poll.vue'; -import { pleaseLogin } from '@/scripts/please-login'; -import { focusPrev, focusNext } from '@/scripts/focus'; -import { url } from '@/config'; -import copyToClipboard from '@/scripts/copy-to-clipboard'; -import { checkWordMute } from '@/scripts/check-word-mute'; -import { userPage } from '@/filters/user'; -import * as os from '@/os'; -import { noteActions, noteViewInterruptors } from '@/store'; -import { reactionPicker } from '@/scripts/reaction-picker'; +import { pleaseLogin } from '@client/scripts/please-login'; +import { focusPrev, focusNext } from '@client/scripts/focus'; +import { url } from '@client/config'; +import copyToClipboard from '@client/scripts/copy-to-clipboard'; +import { checkWordMute } from '@client/scripts/check-word-mute'; +import { userPage } from '@client/filters/user'; +import * as os from '@client/os'; +import { noteActions, noteViewInterruptors } from '@client/store'; +import { reactionPicker } from '@client/scripts/reaction-picker'; function markRawAll(...xs) { for (const x of xs) { @@ -160,8 +160,8 @@ export default defineComponent({ XMediaList, XCwButton, XPoll, - MkUrlPreview: defineAsyncComponent(() => import('@/components/url-preview.vue')), - MkInstanceTicker: defineAsyncComponent(() => import('@/components/instance-ticker.vue')), + MkUrlPreview: defineAsyncComponent(() => import('@client/components/url-preview.vue')), + MkInstanceTicker: defineAsyncComponent(() => import('@client/components/instance-ticker.vue')), }, inject: { @@ -687,7 +687,7 @@ export default defineComponent({ text: this.$ts.reportAbuse, action: () => { const u = `${url}/notes/${this.appearNote.id}`; - os.popup(import('@/components/abuse-report-window.vue'), { + os.popup(import('@client/components/abuse-report-window.vue'), { user: this.appearNote.user, initialComment: `Note: ${u}\n-----\n` }, {}, 'closed'); diff --git a/src/client/components/note-header.vue b/src/client/components/note-header.vue index 1f7a07bac3..a6e9b6fe56 100644 --- a/src/client/components/note-header.vue +++ b/src/client/components/note-header.vue @@ -28,7 +28,7 @@ import { faHome, faUnlock, faEnvelope, faMobileAlt, faBookmark, faBiohazard } fr import { faBookmark as farBookmark } from '@fortawesome/free-regular-svg-icons'; import notePage from '../filters/note'; import { userPage } from '../filters/user'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/note-preview.vue b/src/client/components/note-preview.vue index 4ea97d17ee..fcae4c4368 100644 --- a/src/client/components/note-preview.vue +++ b/src/client/components/note-preview.vue @@ -21,7 +21,7 @@ import { defineComponent } from 'vue'; import XNoteHeader from './note-header.vue'; import XSubNoteContent from './sub-note-content.vue'; import XCwButton from './cw-button.vue'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/note.sub.vue b/src/client/components/note.sub.vue index 28553ea4a7..853d481406 100644 --- a/src/client/components/note.sub.vue +++ b/src/client/components/note.sub.vue @@ -24,7 +24,7 @@ import { defineComponent } from 'vue'; import XNoteHeader from './note-header.vue'; import XSubNoteContent from './sub-note-content.vue'; import XCwButton from './cw-button.vue'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ name: 'XSub', diff --git a/src/client/components/note.vue b/src/client/components/note.vue index 70f49fef7e..b54cadfc80 100644 --- a/src/client/components/note.vue +++ b/src/client/components/note.vue @@ -114,15 +114,15 @@ import XReactionsViewer from './reactions-viewer.vue'; import XMediaList from './media-list.vue'; import XCwButton from './cw-button.vue'; import XPoll from './poll.vue'; -import { pleaseLogin } from '@/scripts/please-login'; -import { focusPrev, focusNext } from '@/scripts/focus'; -import { url } from '@/config'; -import copyToClipboard from '@/scripts/copy-to-clipboard'; -import { checkWordMute } from '@/scripts/check-word-mute'; -import { userPage } from '@/filters/user'; -import * as os from '@/os'; -import { noteActions, noteViewInterruptors } from '@/store'; -import { reactionPicker } from '@/scripts/reaction-picker'; +import { pleaseLogin } from '@client/scripts/please-login'; +import { focusPrev, focusNext } from '@client/scripts/focus'; +import { url } from '@client/config'; +import copyToClipboard from '@client/scripts/copy-to-clipboard'; +import { checkWordMute } from '@client/scripts/check-word-mute'; +import { userPage } from '@client/filters/user'; +import * as os from '@client/os'; +import { noteActions, noteViewInterruptors } from '@client/store'; +import { reactionPicker } from '@client/scripts/reaction-picker'; function markRawAll(...xs) { for (const x of xs) { @@ -141,8 +141,8 @@ export default defineComponent({ XMediaList, XCwButton, XPoll, - MkUrlPreview: defineAsyncComponent(() => import('@/components/url-preview.vue')), - MkInstanceTicker: defineAsyncComponent(() => import('@/components/instance-ticker.vue')), + MkUrlPreview: defineAsyncComponent(() => import('@client/components/url-preview.vue')), + MkInstanceTicker: defineAsyncComponent(() => import('@client/components/instance-ticker.vue')), }, inject: { @@ -662,7 +662,7 @@ export default defineComponent({ text: this.$ts.reportAbuse, action: () => { const u = `${url}/notes/${this.appearNote.id}`; - os.popup(import('@/components/abuse-report-window.vue'), { + os.popup(import('@client/components/abuse-report-window.vue'), { user: this.appearNote.user, initialComment: `Note: ${u}\n-----\n` }, {}, 'closed'); diff --git a/src/client/components/notes.vue b/src/client/components/notes.vue index 332f00e5db..80a9502d5f 100644 --- a/src/client/components/notes.vue +++ b/src/client/components/notes.vue @@ -29,10 +29,10 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import paging from '@/scripts/paging'; +import paging from '@client/scripts/paging'; import XNote from './note.vue'; import XList from './date-separated-list.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@client/components/ui/button.vue'; export default defineComponent({ components: { diff --git a/src/client/components/notification-setting-window.vue b/src/client/components/notification-setting-window.vue index 1c19de9ff9..a3e221f7b2 100644 --- a/src/client/components/notification-setting-window.vue +++ b/src/client/components/notification-setting-window.vue @@ -26,7 +26,7 @@ <script lang="ts"> import { defineComponent, PropType } from 'vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import XModalWindow from '@client/components/ui/modal-window.vue'; import MkSwitch from './ui/switch.vue'; import MkInfo from './ui/info.vue'; import MkButton from './ui/button.vue'; diff --git a/src/client/components/notification.vue b/src/client/components/notification.vue index 2fe8500891..2b8b440ced 100644 --- a/src/client/components/notification.vue +++ b/src/client/components/notification.vue @@ -61,13 +61,13 @@ import { defineComponent } from 'vue'; import { faIdCardAlt, faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faCheck, faPollH } from '@fortawesome/free-solid-svg-icons'; import { faClock } from '@fortawesome/free-regular-svg-icons'; -import { getNoteSummary } from '../../misc/get-note-summary'; +import { getNoteSummary } from '@/misc/get-note-summary'; import XReactionIcon from './reaction-icon.vue'; import MkFollowButton from './follow-button.vue'; import notePage from '../filters/note'; import { userPage } from '../filters/user'; -import { i18n } from '@/i18n'; -import * as os from '@/os'; +import { i18n } from '@client/i18n'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/notifications.vue b/src/client/components/notifications.vue index 56dbfd5bdf..01b3ae4396 100644 --- a/src/client/components/notifications.vue +++ b/src/client/components/notifications.vue @@ -18,12 +18,12 @@ <script lang="ts"> import { defineComponent, PropType } from 'vue'; -import paging from '@/scripts/paging'; +import paging from '@client/scripts/paging'; import XNotification from './notification.vue'; import XList from './date-separated-list.vue'; import XNote from './note.vue'; import { notificationTypes } from '../../types'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/page-preview.vue b/src/client/components/page-preview.vue index d59813e00d..2125ddc534 100644 --- a/src/client/components/page-preview.vue +++ b/src/client/components/page-preview.vue @@ -17,7 +17,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { userName } from '../filters/user'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/page-window.vue b/src/client/components/page-window.vue index 37342c403b..ca6f4dd73e 100644 --- a/src/client/components/page-window.vue +++ b/src/client/components/page-window.vue @@ -23,12 +23,12 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faExternalLinkAlt, faExpandAlt, faLink, faChevronLeft, faColumns } from '@fortawesome/free-solid-svg-icons'; -import XWindow from '@/components/ui/window.vue'; -import XHeader from '@/ui/_common_/header.vue'; -import { popout } from '@/scripts/popout'; -import copyToClipboard from '@/scripts/copy-to-clipboard'; -import { resolve } from '@/router'; -import { url } from '@/config'; +import XWindow from '@client/components/ui/window.vue'; +import XHeader from '@client/ui/_common_/header.vue'; +import { popout } from '@client/scripts/popout'; +import copyToClipboard from '@client/scripts/copy-to-clipboard'; +import { resolve } from '@client/router'; +import { url } from '@client/config'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.block.vue b/src/client/components/page/page.block.vue index 54b8b30276..ffd9ce89f9 100644 --- a/src/client/components/page/page.block.vue +++ b/src/client/components/page/page.block.vue @@ -19,8 +19,8 @@ import XCounter from './page.counter.vue'; import XRadioButton from './page.radio-button.vue'; import XCanvas from './page.canvas.vue'; import XNote from './page.note.vue'; -import { Hpml } from '@/scripts/hpml/evaluator'; -import { Block } from '@/scripts/hpml/block'; +import { Hpml } from '@client/scripts/hpml/evaluator'; +import { Block } from '@client/scripts/hpml/block'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.button.vue b/src/client/components/page/page.button.vue index 51da84bd49..c6ae675212 100644 --- a/src/client/components/page/page.button.vue +++ b/src/client/components/page/page.button.vue @@ -7,9 +7,9 @@ <script lang="ts"> import { defineComponent, PropType, unref } from 'vue'; import MkButton from '../ui/button.vue'; -import * as os from '@/os'; -import { ButtonBlock } from '@/scripts/hpml/block'; -import { Hpml } from '@/scripts/hpml/evaluator'; +import * as os from '@client/os'; +import { ButtonBlock } from '@client/scripts/hpml/block'; +import { Hpml } from '@client/scripts/hpml/evaluator'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.canvas.vue b/src/client/components/page/page.canvas.vue index 8f49b88e5e..e26db597f2 100644 --- a/src/client/components/page/page.canvas.vue +++ b/src/client/components/page/page.canvas.vue @@ -6,9 +6,9 @@ <script lang="ts"> import { defineComponent, onMounted, PropType, Ref, ref } from 'vue'; -import * as os from '@/os'; -import { CanvasBlock } from '@/scripts/hpml/block'; -import { Hpml } from '@/scripts/hpml/evaluator'; +import * as os from '@client/os'; +import { CanvasBlock } from '@client/scripts/hpml/block'; +import { Hpml } from '@client/scripts/hpml/evaluator'; export default defineComponent({ props: { diff --git a/src/client/components/page/page.counter.vue b/src/client/components/page/page.counter.vue index b1af8954b0..dad7ac3da0 100644 --- a/src/client/components/page/page.counter.vue +++ b/src/client/components/page/page.counter.vue @@ -7,9 +7,9 @@ <script lang="ts"> import { computed, defineComponent, PropType } from 'vue'; import MkButton from '../ui/button.vue'; -import * as os from '@/os'; -import { CounterVarBlock } from '@/scripts/hpml/block'; -import { Hpml } from '@/scripts/hpml/evaluator'; +import * as os from '@client/os'; +import { CounterVarBlock } from '@client/scripts/hpml/block'; +import { Hpml } from '@client/scripts/hpml/evaluator'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.if.vue b/src/client/components/page/page.if.vue index ec25332db0..a70525e07c 100644 --- a/src/client/components/page/page.if.vue +++ b/src/client/components/page/page.if.vue @@ -5,8 +5,8 @@ </template> <script lang="ts"> -import { IfBlock } from '@/scripts/hpml/block'; -import { Hpml } from '@/scripts/hpml/evaluator'; +import { IfBlock } from '@client/scripts/hpml/block'; +import { Hpml } from '@client/scripts/hpml/evaluator'; import { defineComponent, defineAsyncComponent, PropType } from 'vue'; export default defineComponent({ diff --git a/src/client/components/page/page.image.vue b/src/client/components/page/page.image.vue index 04ce74bd7c..14dedc98a0 100644 --- a/src/client/components/page/page.image.vue +++ b/src/client/components/page/page.image.vue @@ -6,9 +6,9 @@ <script lang="ts"> import { defineComponent, PropType } from 'vue'; -import * as os from '@/os'; -import { ImageBlock } from '@/scripts/hpml/block'; -import { Hpml } from '@/scripts/hpml/evaluator'; +import * as os from '@client/os'; +import { ImageBlock } from '@client/scripts/hpml/block'; +import { Hpml } from '@client/scripts/hpml/evaluator'; export default defineComponent({ props: { diff --git a/src/client/components/page/page.note.vue b/src/client/components/page/page.note.vue index 925844c1bd..7a3f88bb1f 100644 --- a/src/client/components/page/page.note.vue +++ b/src/client/components/page/page.note.vue @@ -7,10 +7,10 @@ <script lang="ts"> import { defineComponent, onMounted, PropType, Ref, ref } from 'vue'; -import XNote from '@/components/note.vue'; -import XNoteDetailed from '@/components/note-detailed.vue'; -import * as os from '@/os'; -import { NoteBlock } from '@/scripts/hpml/block'; +import XNote from '@client/components/note.vue'; +import XNoteDetailed from '@client/components/note-detailed.vue'; +import * as os from '@client/os'; +import { NoteBlock } from '@client/scripts/hpml/block'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.number-input.vue b/src/client/components/page/page.number-input.vue index 7b7d799330..1970ee62a9 100644 --- a/src/client/components/page/page.number-input.vue +++ b/src/client/components/page/page.number-input.vue @@ -7,9 +7,9 @@ <script lang="ts"> import { computed, defineComponent, PropType } from 'vue'; import MkInput from '../ui/input.vue'; -import * as os from '@/os'; -import { Hpml } from '@/scripts/hpml/evaluator'; -import { NumberInputVarBlock } from '@/scripts/hpml/block'; +import * as os from '@client/os'; +import { Hpml } from '@client/scripts/hpml/evaluator'; +import { NumberInputVarBlock } from '@client/scripts/hpml/block'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.post.vue b/src/client/components/page/page.post.vue index 33c6e6b14c..926d06ae80 100644 --- a/src/client/components/page/page.post.vue +++ b/src/client/components/page/page.post.vue @@ -10,10 +10,10 @@ import { defineComponent, PropType } from 'vue'; import { faCheck, faPaperPlane } from '@fortawesome/free-solid-svg-icons'; import MkTextarea from '../ui/textarea.vue'; import MkButton from '../ui/button.vue'; -import { apiUrl } from '@/config'; -import * as os from '@/os'; -import { PostBlock } from '@/scripts/hpml/block'; -import { Hpml } from '@/scripts/hpml/evaluator'; +import { apiUrl } from '@client/config'; +import * as os from '@client/os'; +import { PostBlock } from '@client/scripts/hpml/block'; +import { Hpml } from '@client/scripts/hpml/evaluator'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.radio-button.vue b/src/client/components/page/page.radio-button.vue index def6ee8885..f6f146b52f 100644 --- a/src/client/components/page/page.radio-button.vue +++ b/src/client/components/page/page.radio-button.vue @@ -8,9 +8,9 @@ <script lang="ts"> import { computed, defineComponent, PropType } from 'vue'; import MkRadio from '../ui/radio.vue'; -import * as os from '@/os'; -import { Hpml } from '@/scripts/hpml/evaluator'; -import { RadioButtonVarBlock } from '@/scripts/hpml/block'; +import * as os from '@client/os'; +import { Hpml } from '@client/scripts/hpml/evaluator'; +import { RadioButtonVarBlock } from '@client/scripts/hpml/block'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.section.vue b/src/client/components/page/page.section.vue index d32f5dc732..81cab12501 100644 --- a/src/client/components/page/page.section.vue +++ b/src/client/components/page/page.section.vue @@ -10,9 +10,9 @@ <script lang="ts"> import { defineComponent, defineAsyncComponent, PropType } from 'vue'; -import * as os from '@/os'; -import { SectionBlock } from '@/scripts/hpml/block'; -import { Hpml } from '@/scripts/hpml/evaluator'; +import * as os from '@client/os'; +import { SectionBlock } from '@client/scripts/hpml/block'; +import { Hpml } from '@client/scripts/hpml/evaluator'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.switch.vue b/src/client/components/page/page.switch.vue index 9c3fb5feaa..a928c22bee 100644 --- a/src/client/components/page/page.switch.vue +++ b/src/client/components/page/page.switch.vue @@ -7,9 +7,9 @@ <script lang="ts"> import { computed, defineComponent, PropType } from 'vue'; import MkSwitch from '../ui/switch.vue'; -import * as os from '@/os'; -import { Hpml } from '@/scripts/hpml/evaluator'; -import { SwitchVarBlock } from '@/scripts/hpml/block'; +import * as os from '@client/os'; +import { Hpml } from '@client/scripts/hpml/evaluator'; +import { SwitchVarBlock } from '@client/scripts/hpml/block'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.text-input.vue b/src/client/components/page/page.text-input.vue index e67814af16..8bf3e1c88e 100644 --- a/src/client/components/page/page.text-input.vue +++ b/src/client/components/page/page.text-input.vue @@ -7,9 +7,9 @@ <script lang="ts"> import { computed, defineComponent, PropType } from 'vue'; import MkInput from '../ui/input.vue'; -import * as os from '@/os'; -import { Hpml } from '@/scripts/hpml/evaluator'; -import { TextInputVarBlock } from '@/scripts/hpml/block'; +import * as os from '@client/os'; +import { Hpml } from '@client/scripts/hpml/evaluator'; +import { TextInputVarBlock } from '@client/scripts/hpml/block'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.text.vue b/src/client/components/page/page.text.vue index 1896d00f42..491c62be26 100644 --- a/src/client/components/page/page.text.vue +++ b/src/client/components/page/page.text.vue @@ -6,15 +6,15 @@ </template> <script lang="ts"> -import { TextBlock } from '@/scripts/hpml/block'; -import { Hpml } from '@/scripts/hpml/evaluator'; +import { TextBlock } from '@client/scripts/hpml/block'; +import { Hpml } from '@client/scripts/hpml/evaluator'; import { defineAsyncComponent, defineComponent, PropType } from 'vue'; import { parse } from '../../../mfm/parse'; import { unique } from '../../../prelude/array'; export default defineComponent({ components: { - MkUrlPreview: defineAsyncComponent(() => import('@/components/url-preview.vue')), + MkUrlPreview: defineAsyncComponent(() => import('@client/components/url-preview.vue')), }, props: { block: { diff --git a/src/client/components/page/page.textarea-input.vue b/src/client/components/page/page.textarea-input.vue index 085c2ba579..9951cef2de 100644 --- a/src/client/components/page/page.textarea-input.vue +++ b/src/client/components/page/page.textarea-input.vue @@ -7,10 +7,10 @@ <script lang="ts"> import { computed, defineComponent, PropType } from 'vue'; import MkTextarea from '../ui/textarea.vue'; -import * as os from '@/os'; -import { Hpml } from '@/scripts/hpml/evaluator'; -import { HpmlTextInput } from '@/scripts/hpml'; -import { TextInputVarBlock } from '@/scripts/hpml/block'; +import * as os from '@client/os'; +import { Hpml } from '@client/scripts/hpml/evaluator'; +import { HpmlTextInput } from '@client/scripts/hpml'; +import { TextInputVarBlock } from '@client/scripts/hpml/block'; export default defineComponent({ components: { diff --git a/src/client/components/page/page.textarea.vue b/src/client/components/page/page.textarea.vue index 97d688368a..612bbe41b9 100644 --- a/src/client/components/page/page.textarea.vue +++ b/src/client/components/page/page.textarea.vue @@ -3,8 +3,8 @@ </template> <script lang="ts"> -import { TextBlock } from '@/scripts/hpml/block'; -import { Hpml } from '@/scripts/hpml/evaluator'; +import { TextBlock } from '@client/scripts/hpml/block'; +import { Hpml } from '@client/scripts/hpml/evaluator'; import { defineComponent, PropType } from 'vue'; import MkTextarea from '../ui/textarea.vue'; diff --git a/src/client/components/page/page.vue b/src/client/components/page/page.vue index 6d1c419a40..f125365c3d 100644 --- a/src/client/components/page/page.vue +++ b/src/client/components/page/page.vue @@ -8,10 +8,10 @@ import { defineComponent, onMounted, nextTick, onUnmounted, PropType } from 'vue'; import { parse } from '@syuilo/aiscript'; import XBlock from './page.block.vue'; -import { Hpml } from '@/scripts/hpml/evaluator'; -import { url } from '@/config'; -import { $i } from '@/account'; -import { defaultStore } from '@/store'; +import { Hpml } from '@client/scripts/hpml/evaluator'; +import { url } from '@client/config'; +import { $i } from '@client/account'; +import { defaultStore } from '@client/store'; export default defineComponent({ components: { diff --git a/src/client/components/poll-editor.vue b/src/client/components/poll-editor.vue index 49454f23c3..3503d3df71 100644 --- a/src/client/components/poll-editor.vue +++ b/src/client/components/poll-editor.vue @@ -52,7 +52,7 @@ import { defineComponent } from 'vue'; import { faExclamationTriangle, faTimes } from '@fortawesome/free-solid-svg-icons'; import { addTime } from '../../prelude/time'; -import { formatDateTimeString } from '../../misc/format-time-string'; +import { formatDateTimeString } from '@/misc/format-time-string'; import MkInput from './ui/input.vue'; import MkSelect from './ui/select.vue'; import MkSwitch from './ui/switch.vue'; diff --git a/src/client/components/poll.vue b/src/client/components/poll.vue index 7f13e135aa..af3b3804ab 100644 --- a/src/client/components/poll.vue +++ b/src/client/components/poll.vue @@ -25,7 +25,7 @@ import { defineComponent } from 'vue'; import { faCheck } from '@fortawesome/free-solid-svg-icons'; import { sum } from '../../prelude/array'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/post-form-attaches.vue b/src/client/components/post-form-attaches.vue index 230c944de1..f2eed30441 100644 --- a/src/client/components/post-form-attaches.vue +++ b/src/client/components/post-form-attaches.vue @@ -19,7 +19,7 @@ import { defineComponent, defineAsyncComponent } from 'vue'; import { faTimesCircle, faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons'; import { faExclamationTriangle, faICursor } from '@fortawesome/free-solid-svg-icons'; import MkDriveFileThumbnail from './drive-file-thumbnail.vue' -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/post-form-dialog.vue b/src/client/components/post-form-dialog.vue index ae1cd7f01e..aa23e3891e 100644 --- a/src/client/components/post-form-dialog.vue +++ b/src/client/components/post-form-dialog.vue @@ -6,8 +6,8 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import MkModal from '@/components/ui/modal.vue'; -import MkPostForm from '@/components/post-form.vue'; +import MkModal from '@client/components/ui/modal.vue'; +import MkPostForm from '@client/components/post-form.vue'; export default defineComponent({ components: { diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue index 9b5adf9cc1..7d2355c190 100644 --- a/src/client/components/post-form.vue +++ b/src/client/components/post-form.vue @@ -59,17 +59,17 @@ import { length } from 'stringz'; import { toASCII } from 'punycode'; import XNotePreview from './note-preview.vue'; import { parse } from '../../mfm/parse'; -import { host, url } from '@/config'; +import { host, url } from '@client/config'; import { erase, unique } from '../../prelude/array'; -import extractMentions from '../../misc/extract-mentions'; -import getAcct from '../../misc/acct/render'; -import { formatTimeString } from '../../misc/format-time-string'; -import { Autocomplete } from '@/scripts/autocomplete'; +import extractMentions from '@/misc/extract-mentions'; +import getAcct from '@/misc/acct/render'; +import { formatTimeString } from '@/misc/format-time-string'; +import { Autocomplete } from '@client/scripts/autocomplete'; import { noteVisibilities } from '../../types'; -import * as os from '@/os'; -import { selectFile } from '@/scripts/select-file'; -import { notePostInterruptors, postFormActions } from '@/store'; -import { isMobile } from '@/scripts/is-mobile'; +import * as os from '@client/os'; +import { selectFile } from '@client/scripts/select-file'; +import { notePostInterruptors, postFormActions } from '@client/store'; +import { isMobile } from '@client/scripts/is-mobile'; import { throttle } from 'throttle-debounce'; export default defineComponent({ diff --git a/src/client/components/reactions-viewer.reaction.vue b/src/client/components/reactions-viewer.reaction.vue index a67b24601b..99b4d50c52 100644 --- a/src/client/components/reactions-viewer.reaction.vue +++ b/src/client/components/reactions-viewer.reaction.vue @@ -18,9 +18,9 @@ <script lang="ts"> import { defineComponent, ref } from 'vue'; -import XDetails from '@/components/reactions-viewer.details.vue'; -import XReactionIcon from '@/components/reaction-icon.vue'; -import * as os from '@/os'; +import XDetails from '@client/components/reactions-viewer.details.vue'; +import XReactionIcon from '@client/components/reaction-icon.vue'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/remote-caution.vue b/src/client/components/remote-caution.vue index 3af601f627..98c7aaaa6e 100644 --- a/src/client/components/remote-caution.vue +++ b/src/client/components/remote-caution.vue @@ -5,7 +5,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/sample.vue b/src/client/components/sample.vue index 0f29fc69bb..70949ea357 100644 --- a/src/client/components/sample.vue +++ b/src/client/components/sample.vue @@ -29,13 +29,13 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import MkButton from '@/components/ui/button.vue'; -import MkInput from '@/components/ui/input.vue'; -import MkSwitch from '@/components/ui/switch.vue'; -import MkTextarea from '@/components/ui/textarea.vue'; -import MkRadio from '@/components/ui/radio.vue'; -import * as os from '@/os'; -import * as config from '@/config'; +import MkButton from '@client/components/ui/button.vue'; +import MkInput from '@client/components/ui/input.vue'; +import MkSwitch from '@client/components/ui/switch.vue'; +import MkTextarea from '@client/components/ui/textarea.vue'; +import MkRadio from '@client/components/ui/radio.vue'; +import * as os from '@client/os'; +import * as config from '@client/config'; export default defineComponent({ components: { diff --git a/src/client/components/sidebar.vue b/src/client/components/sidebar.vue index f7c50a2ba5..61439781b4 100644 --- a/src/client/components/sidebar.vue +++ b/src/client/components/sidebar.vue @@ -48,11 +48,11 @@ import { defineComponent } from 'vue'; import { faGripVertical, faChevronLeft, faHashtag, faBroadcastTower, faFireAlt, faEllipsisH, faPencilAlt, faBars, faTimes, faSearch, faUserCog, faCog, faUser, faHome, faStar, faCircle, faAt, faListUl, faPlus, faUserClock, faUsers, faTachometerAlt, faExchangeAlt, faGlobe, faChartBar, faCloud, faServer, faInfoCircle, faQuestionCircle, faProjectDiagram, faStream, faExclamationCircle } from '@fortawesome/free-solid-svg-icons'; import { faBell, faEnvelope, faLaugh, faComments } from '@fortawesome/free-regular-svg-icons'; -import { host } from '@/config'; -import { search } from '@/scripts/search'; -import * as os from '@/os'; -import { sidebarDef } from '@/sidebar'; -import { getAccounts, addAccount, login } from '@/account'; +import { host } from '@client/config'; +import { search } from '@client/scripts/search'; +import * as os from '@client/os'; +import { sidebarDef } from '@client/sidebar'; +import { getAccounts, addAccount, login } from '@client/account'; export default defineComponent({ props: { diff --git a/src/client/components/signin-dialog.vue b/src/client/components/signin-dialog.vue index 2edd10f539..6c38c07d78 100644 --- a/src/client/components/signin-dialog.vue +++ b/src/client/components/signin-dialog.vue @@ -13,7 +13,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import XModalWindow from '@client/components/ui/modal-window.vue'; import MkSignin from './signin.vue'; export default defineComponent({ diff --git a/src/client/components/signin.vue b/src/client/components/signin.vue index 3384fff96d..120da63f30 100755 --- a/src/client/components/signin.vue +++ b/src/client/components/signin.vue @@ -53,10 +53,10 @@ import { faLock, faGavel } from '@fortawesome/free-solid-svg-icons'; import { faTwitter, faDiscord, faGithub } from '@fortawesome/free-brands-svg-icons'; import MkButton from './ui/button.vue'; import MkInput from './ui/input.vue'; -import { apiUrl, host } from '@/config'; -import { byteify, hexify } from '@/scripts/2fa'; -import * as os from '@/os'; -import { login } from '@/account'; +import { apiUrl, host } from '@client/config'; +import { byteify, hexify } from '@client/scripts/2fa'; +import * as os from '@client/os'; +import { login } from '@client/account'; export default defineComponent({ components: { diff --git a/src/client/components/signup-dialog.vue b/src/client/components/signup-dialog.vue index 74566fbce3..072a5ac19f 100644 --- a/src/client/components/signup-dialog.vue +++ b/src/client/components/signup-dialog.vue @@ -15,7 +15,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import XModalWindow from '@client/components/ui/modal-window.vue'; import XSignup from './signup.vue'; export default defineComponent({ diff --git a/src/client/components/signup.vue b/src/client/components/signup.vue index 91d0f2c96f..1ce9fc2789 100644 --- a/src/client/components/signup.vue +++ b/src/client/components/signup.vue @@ -56,12 +56,12 @@ import { defineComponent, defineAsyncComponent } from 'vue'; import { faLock, faExclamationTriangle, faSpinner, faCheck, faKey } from '@fortawesome/free-solid-svg-icons'; const getPasswordStrength = require('syuilo-password-strength'); import { toUnicode } from 'punycode'; -import { host, url } from '@/config'; +import { host, url } from '@client/config'; import MkButton from './ui/button.vue'; import MkInput from './ui/input.vue'; import MkSwitch from './ui/switch.vue'; -import * as os from '@/os'; -import { login } from '@/account'; +import * as os from '@client/os'; +import { login } from '@client/account'; export default defineComponent({ components: { diff --git a/src/client/components/sub-note-content.vue b/src/client/components/sub-note-content.vue index ceb25e0967..384bcb4563 100644 --- a/src/client/components/sub-note-content.vue +++ b/src/client/components/sub-note-content.vue @@ -23,7 +23,7 @@ import { defineComponent } from 'vue'; import { faReply } from '@fortawesome/free-solid-svg-icons'; import XPoll from './poll.vue'; import XMediaList from './media-list.vue'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/taskmanager.api-window.vue b/src/client/components/taskmanager.api-window.vue index ec685462c9..9b6c3f16d0 100644 --- a/src/client/components/taskmanager.api-window.vue +++ b/src/client/components/taskmanager.api-window.vue @@ -23,8 +23,8 @@ <script lang="ts"> import { defineComponent } from 'vue'; import * as JSON5 from 'json5'; -import XWindow from '@/components/ui/window.vue'; -import MkTab from '@/components/tab.vue'; +import XWindow from '@client/components/ui/window.vue'; +import MkTab from '@client/components/tab.vue'; export default defineComponent({ components: { diff --git a/src/client/components/taskmanager.vue b/src/client/components/taskmanager.vue index 1ed8c8bd5e..af9033178e 100644 --- a/src/client/components/taskmanager.vue +++ b/src/client/components/taskmanager.vue @@ -79,11 +79,11 @@ <script lang="ts"> import { defineComponent, markRaw, onBeforeUnmount, ref, shallowRef } from 'vue'; import { faTerminal } from '@fortawesome/free-solid-svg-icons'; -import XWindow from '@/components/ui/window.vue'; -import MkTab from '@/components/tab.vue'; -import MkButton from '@/components/ui/button.vue'; -import follow from '@/directives/follow-append'; -import * as os from '@/os'; +import XWindow from '@client/components/ui/window.vue'; +import MkTab from '@client/components/tab.vue'; +import MkButton from '@client/components/ui/button.vue'; +import follow from '@client/directives/follow-append'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/timeline.vue b/src/client/components/timeline.vue index 9a3d3232cf..c2ab0b005d 100644 --- a/src/client/components/timeline.vue +++ b/src/client/components/timeline.vue @@ -5,8 +5,8 @@ <script lang="ts"> import { defineComponent } from 'vue'; import XNotes from './notes.vue'; -import * as os from '@/os'; -import * as sound from '@/scripts/sound'; +import * as os from '@client/os'; +import * as sound from '@client/scripts/sound'; export default defineComponent({ components: { diff --git a/src/client/components/token-generate-window.vue b/src/client/components/token-generate-window.vue index 844c20eb08..87a76931e4 100644 --- a/src/client/components/token-generate-window.vue +++ b/src/client/components/token-generate-window.vue @@ -27,8 +27,8 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import { kinds } from '../../misc/api-permissions'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import { kinds } from '@/misc/api-permissions'; +import XModalWindow from '@client/components/ui/modal-window.vue'; import MkInput from './ui/input.vue'; import MkTextarea from './ui/textarea.vue'; import MkSwitch from './ui/switch.vue'; diff --git a/src/client/components/ui/context-menu.vue b/src/client/components/ui/context-menu.vue index 561099cbe0..61f5d3bf08 100644 --- a/src/client/components/ui/context-menu.vue +++ b/src/client/components/ui/context-menu.vue @@ -8,7 +8,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import contains from '@/scripts/contains'; +import contains from '@client/scripts/contains'; import MkMenu from './menu.vue'; export default defineComponent({ diff --git a/src/client/components/ui/hr.vue b/src/client/components/ui/hr.vue index 6b075cb440..fb12b4985f 100644 --- a/src/client/components/ui/hr.vue +++ b/src/client/components/ui/hr.vue @@ -3,7 +3,7 @@ </template> <script lang="ts"> -import { defineComponent } from 'vue';import * as os from '@/os'; +import { defineComponent } from 'vue';import * as os from '@client/os'; export default defineComponent({}); </script> diff --git a/src/client/components/ui/info.vue b/src/client/components/ui/info.vue index 5c71b14a0a..12b3dbcfd1 100644 --- a/src/client/components/ui/info.vue +++ b/src/client/components/ui/info.vue @@ -9,7 +9,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faInfoCircle, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/ui/input.vue b/src/client/components/ui/input.vue index 1c5222f8f2..302d96d026 100644 --- a/src/client/components/ui/input.vue +++ b/src/client/components/ui/input.vue @@ -57,7 +57,7 @@ import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue'; import debounce from 'v-debounce'; import { faExclamationCircle } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ directives: { diff --git a/src/client/components/ui/menu.vue b/src/client/components/ui/menu.vue index c2033402e3..1550fe40c7 100644 --- a/src/client/components/ui/menu.vue +++ b/src/client/components/ui/menu.vue @@ -43,8 +43,8 @@ <script lang="ts"> import { defineComponent, ref } from 'vue'; import { faCircle } from '@fortawesome/free-solid-svg-icons'; -import { focusPrev, focusNext } from '@/scripts/focus'; -import contains from '@/scripts/contains'; +import { focusPrev, focusNext } from '@client/scripts/focus'; +import contains from '@client/scripts/contains'; export default defineComponent({ props: { diff --git a/src/client/components/ui/pagination.vue b/src/client/components/ui/pagination.vue index d9588a0373..13181d39e2 100644 --- a/src/client/components/ui/pagination.vue +++ b/src/client/components/ui/pagination.vue @@ -16,7 +16,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import MkButton from './button.vue'; -import paging from '@/scripts/paging'; +import paging from '@client/scripts/paging'; export default defineComponent({ components: { diff --git a/src/client/components/ui/radios.vue b/src/client/components/ui/radios.vue index ea40ba47b4..547e616ea5 100644 --- a/src/client/components/ui/radios.vue +++ b/src/client/components/ui/radios.vue @@ -1,6 +1,6 @@ <script lang="ts"> import { defineComponent, h } from 'vue'; -import MkRadio from '@/components/ui/radio.vue'; +import MkRadio from '@client/components/ui/radio.vue'; export default defineComponent({ components: { diff --git a/src/client/components/ui/window.vue b/src/client/components/ui/window.vue index 501a3bf8ee..1613644c87 100644 --- a/src/client/components/ui/window.vue +++ b/src/client/components/ui/window.vue @@ -39,8 +39,8 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faTimes, faCheck } from '@fortawesome/free-solid-svg-icons'; -import contains from '@/scripts/contains'; -import * as os from '@/os'; +import contains from '@client/scripts/contains'; +import * as os from '@client/os'; const minHeight = 50; const minWidth = 250; diff --git a/src/client/components/url-preview-popup.vue b/src/client/components/url-preview-popup.vue index 0a402f793f..b5e0fce207 100644 --- a/src/client/components/url-preview-popup.vue +++ b/src/client/components/url-preview-popup.vue @@ -9,7 +9,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import MkUrlPreview from './url-preview.vue'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/url-preview.vue b/src/client/components/url-preview.vue index 7a59068710..7495da6f24 100644 --- a/src/client/components/url-preview.vue +++ b/src/client/components/url-preview.vue @@ -36,8 +36,8 @@ import { defineComponent } from 'vue'; import { faPlayCircle } from '@fortawesome/free-regular-svg-icons'; import { faTwitter } from '@fortawesome/free-brands-svg-icons'; -import { url as local, lang } from '@/config'; -import * as os from '@/os'; +import { url as local, lang } from '@client/config'; +import * as os from '@client/os'; export default defineComponent({ props: { diff --git a/src/client/components/user-info.vue b/src/client/components/user-info.vue index 711e367411..34ea38c3b4 100644 --- a/src/client/components/user-info.vue +++ b/src/client/components/user-info.vue @@ -29,7 +29,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import parseAcct from '../../misc/acct/parse'; +import parseAcct from '@/misc/acct/parse'; import MkFollowButton from './follow-button.vue'; import { userPage } from '../filters/user'; diff --git a/src/client/components/user-list.vue b/src/client/components/user-list.vue index 7a57ff7168..418c4127d9 100644 --- a/src/client/components/user-list.vue +++ b/src/client/components/user-list.vue @@ -16,7 +16,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import paging from '@/scripts/paging'; +import paging from '@client/scripts/paging'; import MkUserInfo from './user-info.vue'; import { userPage } from '../filters/user'; diff --git a/src/client/components/user-preview.vue b/src/client/components/user-preview.vue index c4588e478a..b2b3358374 100644 --- a/src/client/components/user-preview.vue +++ b/src/client/components/user-preview.vue @@ -33,10 +33,10 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import parseAcct from '../../misc/acct/parse'; +import parseAcct from '@/misc/acct/parse'; import MkFollowButton from './follow-button.vue'; import { userPage } from '../filters/user'; -import * as os from '@/os'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/user-select-dialog.vue b/src/client/components/user-select-dialog.vue index c67c985fdc..e21deea178 100644 --- a/src/client/components/user-select-dialog.vue +++ b/src/client/components/user-select-dialog.vue @@ -46,8 +46,8 @@ import { defineComponent } from 'vue'; import { faTimes, faCheck } from '@fortawesome/free-solid-svg-icons'; import MkInput from './ui/input.vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; -import * as os from '@/os'; +import XModalWindow from '@client/components/ui/modal-window.vue'; +import * as os from '@client/os'; export default defineComponent({ components: { diff --git a/src/client/components/users-dialog.vue b/src/client/components/users-dialog.vue index 014748adc6..381aa60911 100644 --- a/src/client/components/users-dialog.vue +++ b/src/client/components/users-dialog.vue @@ -28,7 +28,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faTimes } from '@fortawesome/free-solid-svg-icons'; -import paging from '@/scripts/paging'; +import paging from '@client/scripts/paging'; import { userPage } from '../filters/user'; export default defineComponent({ diff --git a/src/client/components/visibility-picker.vue b/src/client/components/visibility-picker.vue index e518f48d0d..0b98d30b9d 100644 --- a/src/client/components/visibility-picker.vue +++ b/src/client/components/visibility-picker.vue @@ -46,7 +46,7 @@ import { defineComponent } from 'vue'; import { faGlobe, faUnlock, faHome, faBiohazard, faToggleOn, faToggleOff } from '@fortawesome/free-solid-svg-icons'; import { faEnvelope } from '@fortawesome/free-regular-svg-icons'; -import MkModal from '@/components/ui/modal.vue'; +import MkModal from '@client/components/ui/modal.vue'; export default defineComponent({ components: { diff --git a/src/client/components/waiting-dialog.vue b/src/client/components/waiting-dialog.vue index 7e8ebeaec0..c3a265af9c 100644 --- a/src/client/components/waiting-dialog.vue +++ b/src/client/components/waiting-dialog.vue @@ -11,7 +11,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { faCheck, faSpinner } from '@fortawesome/free-solid-svg-icons'; -import MkModal from '@/components/ui/modal.vue'; +import MkModal from '@client/components/ui/modal.vue'; export default defineComponent({ components: { diff --git a/src/client/components/widgets.vue b/src/client/components/widgets.vue index 23fce7d714..993b843cb1 100644 --- a/src/client/components/widgets.vue +++ b/src/client/components/widgets.vue @@ -31,9 +31,9 @@ import { defineComponent, defineAsyncComponent } from 'vue'; import { v4 as uuid } from 'uuid'; import { faTimes, faCog, faPlus } from '@fortawesome/free-solid-svg-icons'; -import MkSelect from '@/components/ui/select.vue'; -import MkButton from '@/components/ui/button.vue'; -import { widgets as widgetDefs } from '@/widgets'; +import MkSelect from '@client/components/ui/select.vue'; +import MkButton from '@client/components/ui/button.vue'; +import { widgets as widgetDefs } from '@client/widgets'; export default defineComponent({ components: { |