fix: add es2017 build target (#8931)

* remove top level awaits

* add es2017 target

* refactor: use setup and ref sugar

packages/client/src/components/ui/modal.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onMounted, computed, ref, watch, provide } from 'vue';
+import { nextTick, onMounted, watch, provide } from 'vue';
 import * as os from '@/os';
 import { isTouchUsing } from '@/scripts/touch';
 import { defaultStore } from '@/store';
@@ -57,13 +57,13 @@ const emit = defineEmits<{
 
 provide('modal', true);
 
-const maxHeight = ref<number>();
+let maxHeight = $ref<number>();
-const fixed = ref(false);
+let fixed = $ref(false);
-const transformOrigin = ref('center');
+let transformOrigin = $ref('center');
-const showing = ref(true);
+let showing = $ref(true);
-const content = ref<HTMLElement>();
+let content = $ref<HTMLElement>();
 const zIndex = os.claimZIndex(props.zPriority);
-const type = computed(() => {
+const type = $computed(() => {
 	if (props.preferType === 'auto') {
 		if (!defaultStore.state.disableDrawer && isTouchUsing && deviceKind === 'smartphone') {
 			return 'drawer';
@@ -80,7 +80,7 @@ let contentClicking = false;
 const close = () => {
 	// eslint-disable-next-line vue/no-mutating-props
 	if (props.src) props.src.style.pointerEvents = 'auto';
-	showing.value = false;
+	showing = false;
 	emit('close');
 };
 
@@ -89,8 +89,8 @@ const onBgClick = () => {
 	emit('click');
 };
 
-if (type.value === 'drawer') {
+if (type === 'drawer') {
-	maxHeight.value = window.innerHeight / 1.5;
+	maxHeight = window.innerHeight / 1.5;
 }
 
 const keymap = {
@@ -101,22 +101,21 @@ const MARGIN = 16;
 
 const align = () => {
 	if (props.src == null) return;
-	if (type.value === 'drawer') return;
+	if (type === 'drawer') return;
-	if (type.value === 'dialog') return;
+	if (type == 'dialog') return;
 
-	const popover = content.value!;
+	if (content == null) return;
-	if (popover == null) return;
 
 	const srcRect = props.src.getBoundingClientRect();
 
-	const width = popover.offsetWidth;
+	const width = content!.offsetWidth;
-	const height = popover.offsetHeight;
+	const height = content!.offsetHeight;
 
 	let left;
 	let top;
 
-	const x = srcRect.left + (fixed.value ? 0 : window.pageXOffset);
+	const x = srcRect.left + (fixed ? 0 : window.pageXOffset);
-	const y = srcRect.top + (fixed.value ? 0 : window.pageYOffset);
+	const y = srcRect.top + (fixed ? 0 : window.pageYOffset);
 
 	if (props.anchor.x === 'center') {
 		left = x + (props.src.offsetWidth / 2) - (width / 2);
@@ -134,7 +133,7 @@ const align = () => {
 		top = y + props.src.offsetHeight;
 	}
 
-	if (fixed.value) {
+	if (fixed) {
 		// 画面から横にはみ出る場合
 		if (left + width > window.innerWidth) {
 			left = window.innerWidth - width;
@@ -147,16 +146,16 @@ const align = () => {
 		if (top + height > (window.innerHeight - MARGIN)) {
 			if (props.noOverlap && props.anchor.x === 'center') {
 				if (underSpace >= (upperSpace / 3)) {
-					maxHeight.value = underSpace;
+					maxHeight = underSpace;
 				} else {
-					maxHeight.value = upperSpace;
+					maxHeight = upperSpace;
 					top = (upperSpace + MARGIN) - height;
 				}
 			} else {
 				top = (window.innerHeight - MARGIN) - height;
 			}
 		} else {
-			maxHeight.value = underSpace;
+			maxHeight = underSpace;
 		}
 	} else {
 		// 画面から横にはみ出る場合
@@ -171,16 +170,16 @@ const align = () => {
 		if (top + height - window.pageYOffset > (window.innerHeight - MARGIN)) {
 			if (props.noOverlap && props.anchor.x === 'center') {
 				if (underSpace >= (upperSpace / 3)) {
-					maxHeight.value = underSpace;
+					maxHeight = underSpace;
 				} else {
-					maxHeight.value = upperSpace;
+					maxHeight = upperSpace;
 					top = window.pageYOffset + ((upperSpace + MARGIN) - height);
 				}
 			} else {
 				top = (window.innerHeight - MARGIN) - height + window.pageYOffset - 1;
 			}
 		} else {
-			maxHeight.value = underSpace;
+			maxHeight = underSpace;
 		}
 	}
 
@@ -195,29 +194,29 @@ const align = () => {
 	let transformOriginX = 'center';
 	let transformOriginY = 'center';
 
-	if (top >= srcRect.top + props.src.offsetHeight + (fixed.value ? 0 : window.pageYOffset)) {
+	if (top >= srcRect.top + props.src.offsetHeight + (fixed ? 0 : window.pageYOffset)) {
 		transformOriginY = 'top';
-	} else if ((top + height) <= srcRect.top + (fixed.value ? 0 : window.pageYOffset)) {
+	} else if ((top + height) <= srcRect.top + (fixed ? 0 : window.pageYOffset)) {
 		transformOriginY = 'bottom';
 	}
 
-	if (left >= srcRect.left + props.src.offsetWidth + (fixed.value ? 0 : window.pageXOffset)) {
+	if (left >= srcRect.left + props.src.offsetWidth + (fixed ? 0 : window.pageXOffset)) {
 		transformOriginX = 'left';
-	} else if ((left + width) <= srcRect.left + (fixed.value ? 0 : window.pageXOffset)) {
+	} else if ((left + width) <= srcRect.left + (fixed ? 0 : window.pageXOffset)) {
 		transformOriginX = 'right';
 	}
 
-	transformOrigin.value = `${transformOriginX} ${transformOriginY}`;
+	transformOrigin = `${transformOriginX} ${transformOriginY}`;
 
-	popover.style.left = left + 'px';
+	content.style.left = left + 'px';
-	popover.style.top = top + 'px';
+	content.style.top = top + 'px';
 };
 
 const onOpened = () => {
 	emit('opened');
 
 	// モーダルコンテンツにマウスボタンが押され、コンテンツ外でマウスボタンが離されたときにモーダルバックグラウンドクリックと判定させないためにマウスイベントを監視しフラグ管理する
-	const el = content.value!.children[0];
+	const el = content!.children[0];
 	el.addEventListener('mousedown', ev => {
 		contentClicking = true;
 		window.addEventListener('mouseup', ev => {
@@ -235,7 +234,7 @@ onMounted(() => {
 			// eslint-disable-next-line vue/no-mutating-props
 			props.src.style.pointerEvents = 'none';
 		}
-		fixed.value = (type.value === 'drawer') || (getFixedContainer(props.src) != null);
+		fixed = (type === 'drawer') || (getFixedContainer(props.src) != null);
 
 		await nextTick();
 		
@@ -243,10 +242,9 @@ onMounted(() => {
 	}, { immediate: true });
 
 	nextTick(() => {
-		const popover = content.value;
 		new ResizeObserver((entries, observer) => {
 			align();
-		}).observe(popover!);
+		}).observe(content!);
 	});
 });
 

packages/client/src/init.ts

@@ -39,9 +39,10 @@ import { reactionPicker } from '@/scripts/reaction-picker';
 import { getUrlWithoutLoginId } from '@/scripts/login-id';
 import { getAccountFromId } from '@/scripts/get-account-from-id';
 
-console.info(`Misskey v${version}`);
+(async () => {
+	console.info(`Misskey v${version}`);
 
-if (_DEV_) {
+	if (_DEV_) {
 		console.warn('Development mode!!!');
 
 		console.info(`vue ${vueVersion}`);
@@ -70,44 +71,44 @@ if (_DEV_) {
 			});
 			*/
 		});
-}
+	}
 
-// タッチデバイスでCSSの:hoverを機能させる
+	// タッチデバイスでCSSの:hoverを機能させる
-document.addEventListener('touchend', () => {}, { passive: true });
+	document.addEventListener('touchend', () => {}, { passive: true });
 
-// 一斉リロード
+	// 一斉リロード
-reloadChannel.addEventListener('message', path => {
+	reloadChannel.addEventListener('message', path => {
 		if (path !== null) location.href = path;
 		else location.reload();
-});
+	});
 
-//#region SEE: https://css-tricks.com/the-trick-to-viewport-units-on-mobile/
+	//#region SEE: https://css-tricks.com/the-trick-to-viewport-units-on-mobile/
-// TODO: いつの日にか消したい
+	// TODO: いつの日にか消したい
-const vh = window.innerHeight * 0.01;
-document.documentElement.style.setProperty('--vh', `${vh}px`);
-window.addEventListener('resize', () => {
 	const vh = window.innerHeight * 0.01;
 	document.documentElement.style.setProperty('--vh', `${vh}px`);
-});
+	window.addEventListener('resize', () => {
-//#endregion
+		const vh = window.innerHeight * 0.01;
+		document.documentElement.style.setProperty('--vh', `${vh}px`);
+	});
+	//#endregion
 
-// If mobile, insert the viewport meta tag
+	// If mobile, insert the viewport meta tag
-if (['smartphone', 'tablet'].includes(deviceKind)) {
+	if (['smartphone', 'tablet'].includes(deviceKind)) {
 		const viewport = document.getElementsByName('viewport').item(0);
 		viewport.setAttribute('content',
 			`${viewport.getAttribute('content')}, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover`);
-}
+	}
 
-//#region Set lang attr
+	//#region Set lang attr
-const html = document.documentElement;
+	const html = document.documentElement;
-html.setAttribute('lang', lang);
+	html.setAttribute('lang', lang);
-//#endregion
+	//#endregion
 
-//#region loginId
+	//#region loginId
-const params = new URLSearchParams(location.search);
+	const params = new URLSearchParams(location.search);
-const loginId = params.get('loginId');
+	const loginId = params.get('loginId');
 
-if (loginId) {
+	if (loginId) {
 		const target = getUrlWithoutLoginId(location.href);
 
 		if (!$i || $i.id !== loginId) {
@@ -118,18 +119,18 @@ if (loginId) {
 		}
 
 		history.replaceState({ misskey: 'loginId' }, '', target);
-}
+	}
 
-//#endregion
+	//#endregion
 
-//#region Fetch user
+	//#region Fetch user
-if ($i && $i.token) {
+	if ($i && $i.token) {
 		if (_DEV_) {
 			console.log('account cache found. refreshing...');
 		}
 
 		refreshAccount();
-} else {
+	} else {
 		if (_DEV_) {
 			console.log('no account cache found.');
 		}
@@ -155,51 +156,51 @@ if ($i && $i.token) {
 				console.log('not signed in');
 			}
 		}
-}
+	}
-//#endregion
+	//#endregion
 
-const fetchInstanceMetaPromise = fetchInstance();
+	const fetchInstanceMetaPromise = fetchInstance();
 
-fetchInstanceMetaPromise.then(() => {
+	fetchInstanceMetaPromise.then(() => {
 		localStorage.setItem('v', instance.version);
 
 		// Init service worker
 		initializeSw();
-});
+	});
 
-const app = createApp(
+	const app = createApp(
 		window.location.search === '?zen' ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
 		!$i ? defineAsyncComponent(() => import('@/ui/visitor.vue')) :
 		ui === 'deck' ? defineAsyncComponent(() => import('@/ui/deck.vue')) :
 		ui === 'classic' ? defineAsyncComponent(() => import('@/ui/classic.vue')) :
 		defineAsyncComponent(() => import('@/ui/universal.vue')),
-);
+	);
 
-if (_DEV_) {
+	if (_DEV_) {
 		app.config.performance = true;
-}
+	}
 
-app.config.globalProperties = {
+	app.config.globalProperties = {
 		$i,
 		$store: defaultStore,
 		$instance: instance,
 		$t: i18n.t,
 		$ts: i18n.ts,
-};
+	};
 
-widgets(app);
+	widgets(app);
-directives(app);
+	directives(app);
-components(app);
+	components(app);
 
-const splash = document.getElementById('splash');
+	const splash = document.getElementById('splash');
-// 念のためnullチェック(HTMLが古い場合があるため(そのうち消す))
+	// 念のためnullチェック(HTMLが古い場合があるため(そのうち消す))
-if (splash) splash.addEventListener('transitionend', () => {
+	if (splash) splash.addEventListener('transitionend', () => {
 		splash.remove();
-});
+	});
 
-// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
+	// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
-// なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する
+	// なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する
-const rootEl = (() => {
+	const rootEl = (() => {
 		const MISSKEY_MOUNT_DIV_ID = 'misskey_app';
 
 		const currentEl = document.getElementById(MISSKEY_MOUNT_DIV_ID);
@@ -213,24 +214,24 @@ const rootEl = (() => {
 		rootEl.id = MISSKEY_MOUNT_DIV_ID;
 		document.body.appendChild(rootEl);
 		return rootEl;
-})();
+	})();
 
-app.mount(rootEl);
+	app.mount(rootEl);
 
-// boot.jsのやつを解除
+	// boot.jsのやつを解除
-window.onerror = null;
+	window.onerror = null;
-window.onunhandledrejection = null;
+	window.onunhandledrejection = null;
 
-reactionPicker.init();
+	reactionPicker.init();
 
-if (splash) {
+	if (splash) {
 		splash.style.opacity = '0';
 		splash.style.pointerEvents = 'none';
-}
+	}
 
-// クライアントが更新されたか？
+	// クライアントが更新されたか？
-const lastVersion = localStorage.getItem('lastVersion');
+	const lastVersion = localStorage.getItem('lastVersion');
-if (lastVersion !== version) {
+	if (lastVersion !== version) {
 		localStorage.setItem('lastVersion', version);
 
 		// テーマリビルドするため
@@ -245,62 +246,62 @@ if (lastVersion !== version) {
 			}
 		} catch (err) {
 		}
-}
+	}
 
-// NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)
+	// NOTE: この処理は必ず↑のクライアント更新時処理より後に来ること(テーマ再構築のため)
-watch(defaultStore.reactiveState.darkMode, (darkMode) => {
+	watch(defaultStore.reactiveState.darkMode, (darkMode) => {
 		applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));
-}, { immediate: localStorage.theme == null });
+	}, { immediate: localStorage.theme == null });
 
-const darkTheme = computed(ColdDeviceStorage.makeGetterSetter('darkTheme'));
+	const darkTheme = computed(ColdDeviceStorage.makeGetterSetter('darkTheme'));
-const lightTheme = computed(ColdDeviceStorage.makeGetterSetter('lightTheme'));
+	const lightTheme = computed(ColdDeviceStorage.makeGetterSetter('lightTheme'));
 
-watch(darkTheme, (theme) => {
+	watch(darkTheme, (theme) => {
 		if (defaultStore.state.darkMode) {
 			applyTheme(theme);
 		}
-});
+	});
 
-watch(lightTheme, (theme) => {
+	watch(lightTheme, (theme) => {
 		if (!defaultStore.state.darkMode) {
 			applyTheme(theme);
 		}
-});
+	});
 
-//#region Sync dark mode
+	//#region Sync dark mode
-if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
+	if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
 		defaultStore.set('darkMode', isDeviceDarkmode());
-}
+	}
 
-window.matchMedia('(prefers-color-scheme: dark)').addListener(mql => {
+	window.matchMedia('(prefers-color-scheme: dark)').addListener(mql => {
 		if (ColdDeviceStorage.get('syncDeviceDarkMode')) {
 			defaultStore.set('darkMode', mql.matches);
 		}
-});
+	});
-//#endregion
+	//#endregion
 
-fetchInstanceMetaPromise.then(() => {
+	fetchInstanceMetaPromise.then(() => {
 		if (defaultStore.state.themeInitial) {
 			if (instance.defaultLightTheme != null) ColdDeviceStorage.set('lightTheme', JSON5.parse(instance.defaultLightTheme));
 			if (instance.defaultDarkTheme != null) ColdDeviceStorage.set('darkTheme', JSON5.parse(instance.defaultDarkTheme));
 			defaultStore.set('themeInitial', false);
 		}
-});
+	});
 
-watch(defaultStore.reactiveState.useBlurEffectForModal, v => {
+	watch(defaultStore.reactiveState.useBlurEffectForModal, v => {
 		document.documentElement.style.setProperty('--modalBgFilter', v ? 'blur(4px)' : 'none');
-}, { immediate: true });
+	}, { immediate: true });
 
-watch(defaultStore.reactiveState.useBlurEffect, v => {
+	watch(defaultStore.reactiveState.useBlurEffect, v => {
 		if (v) {
 			document.documentElement.style.removeProperty('--blur');
 		} else {
 			document.documentElement.style.setProperty('--blur', 'none');
 		}
-}, { immediate: true });
+	}, { immediate: true });
 
-let reloadDialogShowing = false;
+	let reloadDialogShowing = false;
-stream.on('_disconnected_', async () => {
+	stream.on('_disconnected_', async () => {
 		if (defaultStore.state.serverDisconnectedBehavior === 'reload') {
 			location.reload();
 		} else if (defaultStore.state.serverDisconnectedBehavior === 'dialog') {
@@ -316,27 +317,27 @@ stream.on('_disconnected_', async () => {
 				location.reload();
 			}
 		}
-});
+	});
 
-stream.on('emojiAdded', emojiData => {
+	stream.on('emojiAdded', emojiData => {
 		// TODO
 		//store.commit('instance/set', );
-});
+	});
 
-for (const plugin of ColdDeviceStorage.get('plugins').filter(p => p.active)) {
+	for (const plugin of ColdDeviceStorage.get('plugins').filter(p => p.active)) {
 		import('./plugin').then(({ install }) => {
 			install(plugin);
 		});
-}
+	}
 
-const hotkeys = {
+	const hotkeys = {
 		'd': (): void => {
 			defaultStore.set('darkMode', !defaultStore.state.darkMode);
 		},
 		's': search,
-};
+	};
 
-if ($i) {
+	if ($i) {
 		// only add post shortcuts if logged in
 		hotkeys['p|n'] = post;
 
@@ -433,7 +434,8 @@ if ($i) {
 		main.on('myTokenRegenerated', () => {
 			signout();
 		});
-}
+	}
 
-// shortcut
+	// shortcut
-document.addEventListener('keydown', makeHotkey(hotkeys));
+	document.addEventListener('keydown', makeHotkey(hotkeys));
+})();

packages/client/src/scripts/emojilist.ts

@@ -8,4 +8,6 @@ export type UnicodeEmojiDef = {
 }
 
 // initial converted from https://github.com/muan/emojilib/commit/242fe68be86ed6536843b83f7e32f376468b38fb
-export const emojilist = (await import('../emojilist.json')).default as UnicodeEmojiDef[];
+import _emojilist from '../emojilist.json';
+
+export const emojilist = _emojilist  as UnicodeEmojiDef[];

packages/client/src/scripts/idb-proxy.ts

@@ -11,16 +11,15 @@ const fallbackName = (key: string) => `idbfallback::${key}`;
 let idbAvailable = typeof window !== 'undefined' ? !!window.indexedDB : true;
 
 if (idbAvailable) {
-	try {
+	iset('idb-test', 'test').catch(err => {
-		await iset('idb-test', 'test');
-	} catch (err) {
 		console.error('idb error', err);
+		console.error('indexedDB is unavailable. It will use localStorage.');
 		idbAvailable = false;
-	}
+	});
+} else {
+	console.error('indexedDB is unavailable. It will use localStorage.');
 }
 
-if (!idbAvailable) console.error('indexedDB is unavailable. It will use localStorage.');
-
 export async function get(key: string) {
 	if (idbAvailable) return iget(key);
 	return JSON.parse(localStorage.getItem(fallbackName(key)));

packages/client/vite.config.ts

@@ -49,6 +49,7 @@ export default defineConfig(({ command, mode }) => {
 				'chrome100',
 				'firefox100',
 				'safari15',
+				'es2017',
 			],
 			manifest: 'manifest.json',
 			rollupOptions: {