Merge branch 'develop'

.mocharc.json

@@ -1,6 +1,6 @@
 {
 	"extension": ["ts","js","cjs","mjs"],
-	"require": "ts-node/register",
+	"require": ["ts-node/register", "tsconfig-paths/register"],
 	"slow": 1000,
 	"timeout": 30000,
 	"exit": true

gulpfile.ts

@@ -4,7 +4,6 @@
 
 import * as fs from 'fs';
 import * as gulp from 'gulp';
-import * as ts from 'gulp-typescript';
 import * as rimraf from 'rimraf';
 import * as replace from 'gulp-replace';
 const terser = require('gulp-terser');
@@ -13,16 +12,6 @@ const cssnano = require('gulp-cssnano');
 const locales: { [x: string]: any } = require('./locales');
 const meta = require('./package.json');
 
-gulp.task('build:ts', () => {
-	const tsProject = ts.createProject('./src/tsconfig.json');
-
-	return tsProject
-		.src()
-		.pipe(tsProject())
-		.on('error', () => {})
-		.pipe(gulp.dest('./built/'));
-});
-
 gulp.task('build:copy:views', () =>
 	gulp.src('./src/server/web/views/**/*').pipe(gulp.dest('./built/server/web/views'))
 );
@@ -78,7 +67,6 @@ gulp.task('cleanall', gulp.parallel('clean', cb =>
 ));
 
 gulp.task('build', gulp.parallel(
-	'build:ts',
 	'build:copy',
 ));
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.75.0",
+	"version": "12.75.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -15,11 +15,13 @@
 		"ormconfig": "node ./built/ormconfig.js",
 		"migrate": "ts-node ./node_modules/typeorm/cli.js migration:run",
 		"migrateandstart": "npm run migrate && npm run start",
-		"build": "npm run build-webpack && npm run build-gulp",
+		"build": "npm run build-webpack && npm run build-ts && npm run build-gulp",
 		"build-webpack": "webpack",
+		"build-ts": "tsc -p src/tsconfig.json || echo done. && tsc-alias -p src/tsconfig.json",
 		"build-gulp": "gulp build",
 		"watch": "concurrently \"npm:watch-*\"",
 		"watch-webpack": "webpack --watch",
+		"watch-ts": "tsc -w -p src/tsconfig.json && tsc-alias -w -p src/tsconfig.json",
 		"watch-gulp": "gulp watch",
 		"clean": "gulp clean",
 		"cleanall": "gulp cleanall",
@@ -148,7 +150,6 @@
 		"gulp-replace": "1.0.0",
 		"gulp-terser": "2.0.1",
 		"gulp-tslint": "8.1.4",
-		"gulp-typescript": "6.0.0-alpha.1",
 		"hard-source-webpack-plugin": "0.13.1",
 		"html-minifier": "4.0.0",
 		"http-proxy-agent": "4.0.1",
@@ -234,12 +235,13 @@
 		"tmp": "0.2.1",
 		"ts-loader": "8.0.18",
 		"ts-node": "9.1.1",
+		"tsc-alias": "1.2.8",
+		"tsconfig-paths": "3.9.0",
 		"tslint": "6.1.3",
 		"tslint-sonarts": "1.9.0",
 		"typeorm": "0.2.31",
 		"typescript": "4.2.3",
 		"ulid": "2.3.0",
-		"url-loader": "4.1.1",
 		"uuid": "8.3.2",
 		"v-debounce": "0.1.2",
 		"vanilla-tilt": "1.7.0",
@@ -252,7 +254,7 @@
 		"vue-style-loader": "4.1.3",
 		"vuedraggable": "4.0.1",
 		"web-push": "3.4.4",
-		"webpack": "5.26.3",
+		"webpack": "5.27.2",
 		"webpack-cli": "4.5.0",
 		"websocket": "1.0.33",
 		"ws": "7.4.4",

src/@types/meta.json.d.ts

@@ -1,3 +0,0 @@
-declare module '*/meta.json' {
-	const version: string;
-}

src/argv.ts

@@ -1,5 +1,5 @@
 import * as program from 'commander';
-import config from './config';
+import config from '@/config';
 
 program
 	.version(config.version)

src/boot/master.ts

@@ -6,13 +6,13 @@ import * as isRoot from 'is-root';
 import { getConnection } from 'typeorm';
 
 import Logger from '../services/logger';
-import loadConfig from '../config/load';
+import loadConfig from '@/config/load';
-import { Config } from '../config/types';
+import { Config } from '@/config/types';
 import { lessThan } from '../prelude/array';
 import { program } from '../argv';
-import { showMachineInfo } from '../misc/show-machine-info';
+import { showMachineInfo } from '@/misc/show-machine-info';
 import { initDb } from '../db/postgre';
-import * as meta from '../meta.json';
+const meta = require('../meta.json');
 
 const logger = new Logger('core', 'cyan');
 const bootLogger = logger.createSubLogger('boot', 'magenta', false);

src/client/account.ts

@@ -1,7 +1,7 @@
 import { reactive } from 'vue';
-import { apiUrl } from '@/config';
+import { apiUrl } from '@client/config';
-import { waiting } from '@/os';
+import { waiting } from '@client/os';
-import { unisonReload } from '@/scripts/unison-reload';
+import { unisonReload } from '@client/scripts/unison-reload';
 
 // TODO: 他のタブと永続化されたstateを同期
 

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 XWindow from '@client/components/ui/window.vue';
-import MkTextarea from '@/components/ui/textarea.vue';
+import MkTextarea from '@client/components/ui/textarea.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@client/components/ui/button.vue';
-import * as os from '@/os';
+import * as os from '@client/os';
 
 export default defineComponent({
 	components: {

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() {

src/client/components/autocomplete.vue

@@ -29,12 +29,12 @@
 
 <script lang="ts">
 import { defineComponent, markRaw } from 'vue';
-import { emojilist } from '../../misc/emojilist';
+import { emojilist } from '@/misc/emojilist';
-import contains from '@/scripts/contains';
+import contains from '@client/scripts/contains';
-import { twemojiSvgBase } from '../../misc/twemoji-base';
+import { twemojiSvgBase } from '@/misc/twemoji-base';
-import { getStaticImageUrl } from '@/scripts/get-static-image-url';
+import { getStaticImageUrl } from '@client/scripts/get-static-image-url';
-import { acct } from '@/filters/user';
+import { acct } from '@client/filters/user';
-import * as os from '@/os';
+import * as os from '@client/os';
 
 type EmojiDef = {
 	emoji: string;

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: {

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: {

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 MkModal from '@client/components/ui/modal.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@client/components/ui/button.vue';
-import MkInput from '@/components/ui/input.vue';
+import MkInput from '@client/components/ui/input.vue';
-import MkSelect from '@/components/ui/select.vue';
+import MkSelect from '@client/components/ui/select.vue';
 
 export default defineComponent({
 	components: {

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: {

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 XModalWindow from '@client/components/ui/modal-window.vue';
-import number from '@/filters/number';
+import number from '@client/filters/number';
 
 export default defineComponent({
 	components: {

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: {

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 bytes from '@client/filters/bytes';
-import * as os from '@/os';
+import * as os from '@client/os';
 
 export default defineComponent({
 	components: {

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({

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: {

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({

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 MkModal from '@client/components/ui/modal.vue';
-import MkEmojiPicker from '@/components/emoji-picker.vue';
+import MkEmojiPicker from '@client/components/emoji-picker.vue';
 
 export default defineComponent({
 	components: {

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 MkWindow from '@client/components/ui/window.vue';
-import MkEmojiPicker from '@/components/emoji-picker.vue';
+import MkEmojiPicker from '@client/components/emoji-picker.vue';
 
 export default defineComponent({
 	components: {

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: {

src/client/components/emoji-picker.vue

@@ -74,15 +74,15 @@
 
 <script lang="ts">
 import { defineComponent, markRaw } from 'vue';
-import { emojilist } from '../../misc/emojilist';
+import { emojilist } from '@/misc/emojilist';
-import { getStaticImageUrl } from '@/scripts/get-static-image-url';
+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 Particle from '@client/components/particle.vue';
-import * as os from '@/os';
+import * as os from '@client/os';
-import { isDeviceTouch } from '@/scripts/is-device-touch';
+import { isDeviceTouch } from '@client/scripts/is-device-touch';
-import { isMobile } from '@/scripts/is-mobile';
+import { isMobile } from '@client/scripts/is-mobile';
-import { emojiCategories } from '@/instance';
+import { emojiCategories } from '@client/instance';
 import XSection from './emoji-picker.section.vue';
 
 export default defineComponent({

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: {

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: {

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: {

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';

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: {

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({

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: {

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: {

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 * as os from '@client/os';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
+import copyToClipboard from '@client/scripts/copy-to-clipboard';
-import { router } from '@/router';
+import { router } from '@client/router';
-import { url } from '@/config';
+import { url } from '@client/config';
-import { popout } from '@/scripts/popout';
+import { popout } from '@client/scripts/popout';
-import { ColdDeviceStorage } from '@/store';
+import { ColdDeviceStorage } from '@client/store';
 
 export default defineComponent({
 	inject: {

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'],

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 { getStaticImageUrl } from '@client/scripts/get-static-image-url';
-import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash';
+import { extractAvgColorFromBlurhash } from '@client/scripts/extract-avg-color-from-blurhash';
-import { acct, userPage } from '@/filters/user';
+import { acct, userPage } from '@client/filters/user';
 
 export default defineComponent({
 	props: {

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 { getStaticImageUrl } from '@client/scripts/get-static-image-url';
-import { twemojiSvgBase } from '@/../misc/twemoji-base';
+import { twemojiSvgBase } from '@client/../misc/twemoji-base';
 
 export default defineComponent({
 	props: {

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: {

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: {

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: {

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 { url as local } from '@client/config';
-import { isDeviceTouch } from '@/scripts/is-device-touch';
+import { isDeviceTouch } from '@client/scripts/is-device-touch';
-import * as os from '@/os';
+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
 			});

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'],

src/client/components/image-viewer.vue

@@ -14,9 +14,9 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import bytes from '@/filters/bytes';
+import bytes from '@client/filters/bytes';
-import number from '@/filters/number';
+import number from '@client/filters/number';
-import MkModal from '@/components/ui/modal.vue';
+import MkModal from '@client/components/ui/modal.vue';
 
 export default defineComponent({
 	components: {

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: {

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: {

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 MkModal from '@client/components/ui/modal.vue';
-import { sidebarDef } from '@/sidebar';
+import { sidebarDef } from '@client/sidebar';
-import { instanceName } from '@/config';
+import { instanceName } from '@client/config';
 
 export default defineComponent({
 	components: {

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 { url as local } from '@client/config';
-import { isDeviceTouch } from '@/scripts/is-device-touch';
+import { isDeviceTouch } from '@client/scripts/is-device-touch';
-import * as os from '@/os';
+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
 			});

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 * as os from '@client/os';
-import { ColdDeviceStorage } from '@/store';
+import { ColdDeviceStorage } from '@client/store';
 
 export default defineComponent({
 	props: {

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 { getStaticImageUrl } from '@client/scripts/get-static-image-url';
-import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash';
+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: {

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: {

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: {

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: {

src/client/components/mfm.ts

@@ -1,16 +1,16 @@
 import { VNode, defineComponent, h } from 'vue';
-import { MfmForest } from '@/../mfm/prelude';
+import { MfmForest } from '@client/../mfm/prelude';
-import { parse, parsePlain } from '@/../mfm/parse';
+import { parse, parsePlain } from '@client/../mfm/parse';
-import MkUrl from '@/components/global/url.vue';
+import MkUrl from '@client/components/global/url.vue';
-import MkLink from '@/components/link.vue';
+import MkLink from '@client/components/link.vue';
-import MkMention from '@/components/mention.vue';
+import MkMention from '@client/components/mention.vue';
-import MkEmoji from '@/components/global/emoji.vue';
+import MkEmoji from '@client/components/global/emoji.vue';
-import { concat } from '@/../prelude/array';
+import { concat } from '@client/../prelude/array';
-import MkFormula from '@/components/formula.vue';
+import MkFormula from '@client/components/formula.vue';
-import MkCode from '@/components/code.vue';
+import MkCode from '@client/components/code.vue';
-import MkGoogle from '@/components/google.vue';
+import MkGoogle from '@client/components/google.vue';
-import MkA from '@/components/global/a.vue';
+import MkA from '@client/components/global/a.vue';
-import { host } from '@/config';
+import { host } from '@client/config';
 
 export default defineComponent({
 	props: {

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: {

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 { pleaseLogin } from '@client/scripts/please-login';
-import { focusPrev, focusNext } from '@/scripts/focus';
+import { focusPrev, focusNext } from '@client/scripts/focus';
-import { url } from '@/config';
+import { url } from '@client/config';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
+import copyToClipboard from '@client/scripts/copy-to-clipboard';
-import { checkWordMute } from '@/scripts/check-word-mute';
+import { checkWordMute } from '@client/scripts/check-word-mute';
-import { userPage } from '@/filters/user';
+import { userPage } from '@client/filters/user';
-import * as os from '@/os';
+import * as os from '@client/os';
-import { noteActions, noteViewInterruptors } from '@/store';
+import { noteActions, noteViewInterruptors } from '@client/store';
-import { reactionPicker } from '@/scripts/reaction-picker';
+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')),
+		MkUrlPreview: defineAsyncComponent(() => import('@client/components/url-preview.vue')),
-		MkInstanceTicker: defineAsyncComponent(() => import('@/components/instance-ticker.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');

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: {

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: {

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',

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 { pleaseLogin } from '@client/scripts/please-login';
-import { focusPrev, focusNext } from '@/scripts/focus';
+import { focusPrev, focusNext } from '@client/scripts/focus';
-import { url } from '@/config';
+import { url } from '@client/config';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
+import copyToClipboard from '@client/scripts/copy-to-clipboard';
-import { checkWordMute } from '@/scripts/check-word-mute';
+import { checkWordMute } from '@client/scripts/check-word-mute';
-import { userPage } from '@/filters/user';
+import { userPage } from '@client/filters/user';
-import * as os from '@/os';
+import * as os from '@client/os';
-import { noteActions, noteViewInterruptors } from '@/store';
+import { noteActions, noteViewInterruptors } from '@client/store';
-import { reactionPicker } from '@/scripts/reaction-picker';
+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')),
+		MkUrlPreview: defineAsyncComponent(() => import('@client/components/url-preview.vue')),
-		MkInstanceTicker: defineAsyncComponent(() => import('@/components/instance-ticker.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');

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: {

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';

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 { i18n } from '@client/i18n';
-import * as os from '@/os';
+import * as os from '@client/os';
 
 export default defineComponent({
 	components: {

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: {

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: {

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 XWindow from '@client/components/ui/window.vue';
-import XHeader from '@/ui/_common_/header.vue';
+import XHeader from '@client/ui/_common_/header.vue';
-import { popout } from '@/scripts/popout';
+import { popout } from '@client/scripts/popout';
-import copyToClipboard from '@/scripts/copy-to-clipboard';
+import copyToClipboard from '@client/scripts/copy-to-clipboard';
-import { resolve } from '@/router';
+import { resolve } from '@client/router';
-import { url } from '@/config';
+import { url } from '@client/config';
 
 export default defineComponent({
 	components: {

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 { Hpml } from '@client/scripts/hpml/evaluator';
-import { Block } from '@/scripts/hpml/block';
+import { Block } from '@client/scripts/hpml/block';
 
 export default defineComponent({
 	components: {

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 * as os from '@client/os';
-import { ButtonBlock } from '@/scripts/hpml/block';
+import { ButtonBlock } from '@client/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
 
 export default defineComponent({
 	components: {

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 * as os from '@client/os';
-import { CanvasBlock } from '@/scripts/hpml/block';
+import { CanvasBlock } from '@client/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
 
 export default defineComponent({
 	props: {

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 * as os from '@client/os';
-import { CounterVarBlock } from '@/scripts/hpml/block';
+import { CounterVarBlock } from '@client/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
 
 export default defineComponent({
 	components: {

src/client/components/page/page.if.vue

@@ -5,8 +5,8 @@
 </template>
 
 <script lang="ts">
-import { IfBlock } from '@/scripts/hpml/block';
+import { IfBlock } from '@client/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
 import { defineComponent, defineAsyncComponent, PropType } from 'vue';
 
 export default defineComponent({

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 * as os from '@client/os';
-import { ImageBlock } from '@/scripts/hpml/block';
+import { ImageBlock } from '@client/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
 
 export default defineComponent({
 	props: {

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 XNote from '@client/components/note.vue';
-import XNoteDetailed from '@/components/note-detailed.vue';
+import XNoteDetailed from '@client/components/note-detailed.vue';
-import * as os from '@/os';
+import * as os from '@client/os';
-import { NoteBlock } from '@/scripts/hpml/block';
+import { NoteBlock } from '@client/scripts/hpml/block';
 
 export default defineComponent({
 	components: {

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 * as os from '@client/os';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
-import { NumberInputVarBlock } from '@/scripts/hpml/block';
+import { NumberInputVarBlock } from '@client/scripts/hpml/block';
 
 export default defineComponent({
 	components: {

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 { apiUrl } from '@client/config';
-import * as os from '@/os';
+import * as os from '@client/os';
-import { PostBlock } from '@/scripts/hpml/block';
+import { PostBlock } from '@client/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
 
 export default defineComponent({
 	components: {

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 * as os from '@client/os';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
-import { RadioButtonVarBlock } from '@/scripts/hpml/block';
+import { RadioButtonVarBlock } from '@client/scripts/hpml/block';
 
 export default defineComponent({
 	components: {

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 * as os from '@client/os';
-import { SectionBlock } from '@/scripts/hpml/block';
+import { SectionBlock } from '@client/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
 
 export default defineComponent({
 	components: {

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 * as os from '@client/os';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
-import { SwitchVarBlock } from '@/scripts/hpml/block';
+import { SwitchVarBlock } from '@client/scripts/hpml/block';
 
 export default defineComponent({
 	components: {

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 * as os from '@client/os';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
-import { TextInputVarBlock } from '@/scripts/hpml/block';
+import { TextInputVarBlock } from '@client/scripts/hpml/block';
 
 export default defineComponent({
 	components: {

src/client/components/page/page.text.vue

@@ -6,15 +6,15 @@
 </template>
 
 <script lang="ts">
-import { TextBlock } from '@/scripts/hpml/block';
+import { TextBlock } from '@client/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+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: {

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 * as os from '@client/os';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
-import { HpmlTextInput } from '@/scripts/hpml';
+import { HpmlTextInput } from '@client/scripts/hpml';
-import { TextInputVarBlock } from '@/scripts/hpml/block';
+import { TextInputVarBlock } from '@client/scripts/hpml/block';
 
 export default defineComponent({
 	components: {

src/client/components/page/page.textarea.vue

@@ -3,8 +3,8 @@
 </template>
 
 <script lang="ts">
-import { TextBlock } from '@/scripts/hpml/block';
+import { TextBlock } from '@client/scripts/hpml/block';
-import { Hpml } from '@/scripts/hpml/evaluator';
+import { Hpml } from '@client/scripts/hpml/evaluator';
 import { defineComponent, PropType } from 'vue';
 import MkTextarea from '../ui/textarea.vue';
 

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 { Hpml } from '@client/scripts/hpml/evaluator';
-import { url } from '@/config';
+import { url } from '@client/config';
-import { $i } from '@/account';
+import { $i } from '@client/account';
-import { defaultStore } from '@/store';
+import { defaultStore } from '@client/store';
 
 export default defineComponent({
 	components: {

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';

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: {

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: {

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 MkModal from '@client/components/ui/modal.vue';
-import MkPostForm from '@/components/post-form.vue';
+import MkPostForm from '@client/components/post-form.vue';
 
 export default defineComponent({
 	components: {

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 extractMentions from '@/misc/extract-mentions';
-import getAcct from '../../misc/acct/render';
+import getAcct from '@/misc/acct/render';
-import { formatTimeString } from '../../misc/format-time-string';
+import { formatTimeString } from '@/misc/format-time-string';
-import { Autocomplete } from '@/scripts/autocomplete';
+import { Autocomplete } from '@client/scripts/autocomplete';
 import { noteVisibilities } from '../../types';
-import * as os from '@/os';
+import * as os from '@client/os';
-import { selectFile } from '@/scripts/select-file';
+import { selectFile } from '@client/scripts/select-file';
-import { notePostInterruptors, postFormActions } from '@/store';
+import { notePostInterruptors, postFormActions } from '@client/store';
-import { isMobile } from '@/scripts/is-mobile';
+import { isMobile } from '@client/scripts/is-mobile';
 import { throttle } from 'throttle-debounce';
 
 export default defineComponent({

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 XDetails from '@client/components/reactions-viewer.details.vue';
-import XReactionIcon from '@/components/reaction-icon.vue';
+import XReactionIcon from '@client/components/reaction-icon.vue';
-import * as os from '@/os';
+import * as os from '@client/os';
 
 export default defineComponent({
 	components: {

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: {

src/client/components/sample.vue

@@ -29,13 +29,13 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@client/components/ui/button.vue';
-import MkInput from '@/components/ui/input.vue';
+import MkInput from '@client/components/ui/input.vue';
-import MkSwitch from '@/components/ui/switch.vue';
+import MkSwitch from '@client/components/ui/switch.vue';
-import MkTextarea from '@/components/ui/textarea.vue';
+import MkTextarea from '@client/components/ui/textarea.vue';
-import MkRadio from '@/components/ui/radio.vue';
+import MkRadio from '@client/components/ui/radio.vue';
-import * as os from '@/os';
+import * as os from '@client/os';
-import * as config from '@/config';
+import * as config from '@client/config';
 
 export default defineComponent({
 	components: {

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 { host } from '@client/config';
-import { search } from '@/scripts/search';
+import { search } from '@client/scripts/search';
-import * as os from '@/os';
+import * as os from '@client/os';
-import { sidebarDef } from '@/sidebar';
+import { sidebarDef } from '@client/sidebar';
-import { getAccounts, addAccount, login } from '@/account';
+import { getAccounts, addAccount, login } from '@client/account';
 
 export default defineComponent({
 	props: {

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({

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 { apiUrl, host } from '@client/config';
-import { byteify, hexify } from '@/scripts/2fa';
+import { byteify, hexify } from '@client/scripts/2fa';
-import * as os from '@/os';
+import * as os from '@client/os';
-import { login } from '@/account';
+import { login } from '@client/account';
 
 export default defineComponent({
 	components: {

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({

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 * as os from '@client/os';
-import { login } from '@/account';
+import { login } from '@client/account';
 
 export default defineComponent({
 	components: {

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: {

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 XWindow from '@client/components/ui/window.vue';
-import MkTab from '@/components/tab.vue';
+import MkTab from '@client/components/tab.vue';
 
 export default defineComponent({
 	components: {

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 XWindow from '@client/components/ui/window.vue';
-import MkTab from '@/components/tab.vue';
+import MkTab from '@client/components/tab.vue';
-import MkButton from '@/components/ui/button.vue';
+import MkButton from '@client/components/ui/button.vue';
-import follow from '@/directives/follow-append';
+import follow from '@client/directives/follow-append';
-import * as os from '@/os';
+import * as os from '@client/os';
 
 export default defineComponent({
 	components: {

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 os from '@client/os';
-import * as sound from '@/scripts/sound';
+import * as sound from '@client/scripts/sound';
 
 export default defineComponent({
 	components: {

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 { kinds } from '@/misc/api-permissions';
-import XModalWindow from '@/components/ui/modal-window.vue';
+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';

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({