Merge pull request #12481 from misskey-dev/misskey

locales/generateDTS.js

@@ -56,6 +56,18 @@ export default function generateDTS() {
 				ts.NodeFlags.Const | ts.NodeFlags.Ambient | ts.NodeFlags.ContextFlags,
 			),
 		),
+		ts.factory.createFunctionDeclaration(
+			[ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+			undefined,
+			ts.factory.createIdentifier('build'),
+			undefined,
+			[],
+			ts.factory.createTypeReferenceNode(
+				ts.factory.createIdentifier('Locale'),
+				undefined,
+			),
+			undefined,
+		),
 		ts.factory.createExportDefault(ts.factory.createIdentifier('locales')),
 	];
 	const printed = ts.createPrinter({

locales/index.d.ts

@@ -2848,4 +2848,5 @@ export interface Locale {
 declare const locales: {
     [lang: string]: Locale;
 };
+export function build(): Locale;
 export default locales;

locales/index.js

@@ -52,34 +52,38 @@ const primaries = {
 // 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
 const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
 
-const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(new URL(`${c}.yml`, import.meta.url), 'utf-8'))) || {}, a), {});
+export function build() {
+	const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(new URL(`${c}.yml`, import.meta.url), 'utf-8'))) || {}, a), {});
 
-// 空文字列が入ることがあり、フォールバックが動作しなくなるのでプロパティごと消す
-const removeEmpty = (obj) => {
-	for (const [k, v] of Object.entries(obj)) {
-		if (v === '') {
-			delete obj[k];
-		} else if (typeof v === 'object') {
-			removeEmpty(v);
+	// 空文字列が入ることがあり、フォールバックが動作しなくなるのでプロパティごと消す
+	const removeEmpty = (obj) => {
+		for (const [k, v] of Object.entries(obj)) {
+			if (v === '') {
+				delete obj[k];
+			} else if (typeof v === 'object') {
+				removeEmpty(v);
+			}
 		}
-	}
-	return obj;
-};
-removeEmpty(locales);
+		return obj;
+	};
+	removeEmpty(locales);
 
-export default Object.entries(locales)
-	.reduce((a, [k ,v]) => (a[k] = (() => {
-		const [lang] = k.split('-');
-		switch (k) {
-			case 'ja-JP': return v;
-			case 'ja-KS':
-			case 'en-US': return merge(locales['ja-JP'], v);
-			default: return merge(
-				locales['ja-JP'],
-				locales['ko-KR'],
-				locales['en-US'],
-				locales[`${lang}-${primaries[lang]}`] ?? {},
-				v
-			);
-		}
-	})(), a), {});
+	return Object.entries(locales)
+		.reduce((a, [k, v]) => (a[k] = (() => {
+			const [lang] = k.split('-');
+			switch (k) {
+				case 'ja-JP': return v;
+				case 'ja-KS':
+				case 'en-US': return merge(locales['ja-JP'], v);
+				default: return merge(
+					locales['ja-JP'],
+					locales['ko-KR'],
+					locales['en-US'],
+					locales[`${lang}-${primaries[lang]}`] ?? {},
+					v
+				);
+			}
+		})(), a), {});
+}
+
+export default build();

packages/frontend/src/navbar.ts

@@ -13,6 +13,7 @@ import { i18n } from '@/i18n.js';
 import { ui } from '@/config.js';
 import { defaultStore } from '@/store.js';
 import { unisonReload } from '@/scripts/unison-reload.js';
+import { clearCache } from './scripts/clear-cache.js';
 
 export const navbarItemDef = reactive({
 	notifications: {
@@ -210,4 +211,11 @@ export const navbarItemDef = reactive({
 		show: computed(() => $i != null),
 		to: `/@${$i?.username}`,
 	},
+	cacheClear: {
+		title: i18n.ts.cacheClear,
+		icon: 'ti ti-trash',
+		action: (ev) => {
+			clearCache();
+		},
+	},
 });

packages/frontend/src/pages/settings/index.vue

@@ -33,13 +33,11 @@ import { i18n } from '@/i18n.js';
 import MkInfo from '@/components/MkInfo.vue';
 import MkSuperMenu from '@/components/MkSuperMenu.vue';
 import { signout, signoutAll, $i } from '@/account.js';
-import { unisonReload } from '@/scripts/unison-reload.js';
+import { clearCache } from '@/scripts/clear-cache.js';
 import { instance } from '@/instance.js';
 import { useRouter } from '@/router.js';
 import { definePageMetadata, provideMetadataReceiver } from '@/scripts/page-metadata.js';
 import * as os from '@/os.js';
-import { miLocalStorage } from '@/local-storage.js';
-import { fetchCustomEmojis } from '@/custom-emojis.js';
 
 const indexInfo = {
 	title: i18n.ts.settings,
@@ -192,13 +190,7 @@ const menuDef = computed(() => [{
 		icon: 'ti ti-trash',
 		text: i18n.ts.clearCache,
 		action: async () => {
-			os.waiting();
-			miLocalStorage.removeItem('locale');
-			miLocalStorage.removeItem('theme');
-			miLocalStorage.removeItem('emojis');
-			miLocalStorage.removeItem('lastEmojisFetchedAt');
-			await fetchCustomEmojis(true);
-			unisonReload();
+			await clearCache();
 		},
 	}, {
 		type: 'button',

packages/frontend/src/scripts/clear-cache.ts

@@ -0,0 +1,14 @@
+import { unisonReload } from '@/scripts/unison-reload.js';
+import * as os from '@/os.js';
+import { miLocalStorage } from '@/local-storage.js';
+import { fetchCustomEmojis } from '@/custom-emojis.js';
+
+export async function clearCache() {
+	os.waiting();
+	miLocalStorage.removeItem('locale');
+	miLocalStorage.removeItem('theme');
+	miLocalStorage.removeItem('emojis');
+	miLocalStorage.removeItem('lastEmojisFetchedAt');
+	await fetchCustomEmojis(true);
+	unisonReload();
+}

scripts/build-assets.mjs

@@ -9,10 +9,12 @@ import cssnano from 'cssnano';
 import postcss from 'postcss';
 import * as terser from 'terser';
 
-import locales from '../locales/index.js';
+import { build as buildLocales } from '../locales/index.js';
 import generateDTS from '../locales/generateDTS.js';
 import meta from '../package.json' assert { type: "json" };
 
+let locales = buildLocales();
+
 async function copyFrontendFonts() {
   await fs.cp('./packages/frontend/node_modules/three/examples/fonts', './built/_frontend_dist_/fonts', { dereference: true, recursive: true });
 }
@@ -89,10 +91,18 @@ async function build() {
 await build();
 
 if (process.argv.includes("--watch")) {
-  const watcher = fs.watch('./packages', { recursive: true });
-  for await (const event of watcher) {
-    if (/^[a-z]+\/src/.test(event.filename)) {
-      await build();
-    }
-  }
+	const watcher = fs.watch('./', { recursive: true });
+
+	for await (const event of watcher) {
+		const filename = event.filename?.replaceAll('\\', '/');
+
+		if (/^packages\/[a-z]+\/src/.test(filename)) {
+			await build();
+		}
+
+		if (/^locales\/[a-z]+-[A-Z]+\.yml/.test(filename)) {
+			locales = buildLocales();
+			await copyFrontendLocales()
+		}
+	}
 }