Merge 12a0e1e433 into 218070eb13

fix(frontend): ビルド成果物のファイル名にlocalesのhashを含めるように (#16580 )
Merge branch 'develop' of github.com:misskey-dev/misskey into fix/postform-footer-button-overflow
2025-09-24 19:54:58 +09:00 · 2025-09-24 17:01:48 +09:00 · 2024-01-24 12:38:32 +09:00 · 2024-01-08 15:07:53 +09:00 · 2024-01-02 22:39:25 +09:00 · 2023-12-31 11:57:46 +09:00
3 changed files with 16 additions and 14 deletions
--- a/packages/frontend-embed/vite.config.ts
+++ b/packages/frontend-embed/vite.config.ts
@ -64,6 +64,8 @@ function toBase62(n: number): string {
 }

 export function getConfig(): UserConfig {
+	const localesHash = toBase62(hash(JSON.stringify(locales)));
+
 	return {
 		base: '/embed_vite/',

@ -148,9 +150,9 @@ export function getConfig(): UserConfig {
 						// dependencies of i18n.ts
 						'config': ['@@/js/config.js'],
 					},
-					entryFileNames: 'scripts/[hash:8].js',
-					chunkFileNames: 'scripts/[hash:8].js',
-					assetFileNames: 'assets/[hash:8][extname]',
+					entryFileNames: `scripts/${localesHash}-[hash:8].js`,
+					chunkFileNames: `scripts/${localesHash}-[hash:8].js`,
+					assetFileNames: `assets/${localesHash}-[hash:8][extname]`,
 					paths(id) {
 						for (const p of externalPackages) {
 							if (p.match.test(id)) {
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@ -1619,19 +1619,16 @@ html[data-color-scheme=light] .preview {

 .footerLeft {
 	flex: 1;
-	display: grid;
-	grid-auto-flow: row;
-	grid-template-columns: repeat(auto-fill, minmax(42px, 1fr));
-	grid-auto-rows: 40px;
+	display: flex;
+	height: 40px;
+	overflow: auto;
 }

 .footerRight {
 	flex: 0;
 	margin-left: auto;
-	display: grid;
-	grid-auto-flow: row;
-	grid-template-columns: repeat(auto-fill, minmax(42px, 1fr));
-	grid-auto-rows: 40px;
+	display: flex;
+	height: 40px;
 	direction: rtl;
 }

@ -1641,6 +1638,7 @@ html[data-color-scheme=light] .preview {
 	margin: 0;
 	font-size: 1em;
 	width: auto;
+	min-width: 42px;
 	height: 100%;
 	border-radius: 6px;

--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@ -85,6 +85,8 @@ export function toBase62(n: number): string {
 }

 export function getConfig(): UserConfig {
+	const localesHash = toBase62(hash(JSON.stringify(locales)));
+
 	return {
 		base: '/vite/',

@ -188,9 +190,9 @@ export function getConfig(): UserConfig {
 						// dependencies of i18n.ts
 						'config': ['@@/js/config.js'],
 					},
-					entryFileNames: 'scripts/[hash:8].js',
-					chunkFileNames: 'scripts/[hash:8].js',
-					assetFileNames: 'assets/[hash:8][extname]',
+					entryFileNames: `scripts/${localesHash}-[hash:8].js`,
+					chunkFileNames: `scripts/${localesHash}-[hash:8].js`,
+					assetFileNames: `assets/${localesHash}-[hash:8][extname]`,
 					paths(id) {
 						for (const p of externalPackages) {
 							if (p.match.test(id)) {
Author	SHA1	Message	Date
1Step621	b99cbbc085	Merge `12a0e1e433` into `218070eb13`	2025-09-24 19:54:58 +09:00
かっこかり	218070eb13	fix(frontend): ビルド成果物のファイル名にlocalesのhashを含めるように (#16580 )	2025-09-24 17:01:48 +09:00
1Step621	12a0e1e433	Merge branch 'develop' of github.com:misskey-dev/misskey into fix/postform-footer-button-overflow	2024-01-24 12:38:32 +09:00
1Step621	b5d676ae7b	Merge branch 'develop' into fix/postform-footer-button-overflow	2024-01-08 15:07:53 +09:00
1Step621	bc66732e07	Merge branch 'develop' into fix/postform-footer-button-overflow	2024-01-02 22:39:25 +09:00
1Step621	968e56ad4b	Merge branch 'develop' into fix/postform-footer-button-overflow	2023-12-31 11:57:46 +09:00
1Step621	deef213855	Merge branch 'develop' of github.com:misskey-dev/misskey into fix/postform-footer-button-overflow	2023-12-28 15:23:27 +09:00
1Step621	b77b564fa1	幅の狭い端末でMkPostFormの下部ボタンがオーバーフローするのを修正	2023-12-28 15:23:03 +09:00