From 00c0a2eb0a5114a6bead88297e9d0413ee1b610a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8F=E3=82=8F=E3=82=8F=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 2 Feb 2025 01:54:13 +0900
Subject: [PATCH] =?UTF-8?q?fix(MisskeyIO#927):=20tabler-icons-filled?=
 =?UTF-8?q?=E3=81=AE=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88=E3=82=92=E5=8F=82?=
 =?UTF-8?q?=E7=85=A7=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/src/server/web/views/base.pug     |  1 +
 .../frontend/.storybook/preview-head.html     |  2 +-
 packages/frontend/src/style.scss              |  4 ---
 scripts/build-assets.mjs                      | 28 +++++++++++++------
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index b16ac18fa738..ab3d0d957f73 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -37,6 +37,7 @@ html
 		link(rel='prefetch' href=notFoundImageUrl)
 		//- https://github.com/misskey-dev/misskey/issues/9842
 		link(rel='stylesheet' href=`/assets/tabler-icons.${version}/dist/tabler-icons-outline.min.css`)
+		link(rel='stylesheet' href=`/assets/tabler-icons.${version}/dist/tabler-icons-filled.min.css`)
 		link(rel='modulepreload' href=`/vite/${clientEntry.file}`)
 
 		if !config.clientManifestExists
diff --git a/packages/frontend/.storybook/preview-head.html b/packages/frontend/.storybook/preview-head.html
index 86a093767abd..26264abfa340 100644
--- a/packages/frontend/.storybook/preview-head.html
+++ b/packages/frontend/.storybook/preview-head.html
@@ -5,7 +5,7 @@
 
 <link rel="preload" href="https://github.com/misskey-dev/misskey/blob/master/packages/frontend/assets/about-icon.png?raw=true" as="image" type="image/png" crossorigin="anonymous">
 <link rel="preload" href="https://github.com/misskey-dev/misskey/blob/master/packages/frontend/assets/fedi.jpg?raw=true" as="image" type="image/jpeg" crossorigin="anonymous">
-<link rel="stylesheet" href="https://unpkg.com/@tabler/icons-webfont@latest/dist/tabler-icons-outline.min.css">
+<link rel="stylesheet" href="https://unpkg.com/@tabler/icons-webfont@latest/dist/tabler-icons.min.css">
 <link rel="stylesheet" href="https://unpkg.com/@fontsource/m-plus-rounded-1c/index.css">
 <style>
 	html {
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index e6786cef1489..438b21a49b13 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -6,10 +6,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-@use '@tabler/icons-webfont/dist/tabler-icons-filled' with (
-	$ti-prefix: 'ti-filled'
-);
-
 :root {
 	--radius: 12px;
 	--marginFull: 16px;
diff --git a/scripts/build-assets.mjs b/scripts/build-assets.mjs
index c2829f6285d1..f18631e1f780 100644
--- a/scripts/build-assets.mjs
+++ b/scripts/build-assets.mjs
@@ -21,6 +21,16 @@ async function copyFrontendFonts() {
 
 async function copyFrontendTablerIcons() {
   await fs.cp('./packages/frontend/node_modules/@tabler/icons-webfont', `./built/_frontend_dist_/tabler-icons.${meta.version}`, { dereference: true, recursive: true });
+  for (const file of [
+    `./built/_frontend_dist_/tabler-icons.${meta.version}/dist/tabler-icons-filled.scss`,
+    `./built/_frontend_dist_/tabler-icons.${meta.version}/dist/tabler-icons-filled.css`,
+    `./built/_frontend_dist_/tabler-icons.${meta.version}/dist/tabler-icons-filled.min.css`,
+  ]) {
+    let source = await fs.readFile(file, { encoding: 'utf-8' });
+    source = source.replaceAll('$ti-prefix: \'ti\'', '$ti-prefix: \'ti-filled\'');
+    source = source.replaceAll('.ti', '.ti-filled');
+    await fs.writeFile(file, source);
+  }
 }
 
 async function copyFrontendLocales() {
@@ -91,13 +101,13 @@ async function build() {
 await build();
 
 if (process.argv.includes("--watch")) {
-	const watcher = fs.watch('./locales');
-	for await (const event of watcher) {
-		const filename = event.filename?.replaceAll('\\', '/');
-		if (/^[a-z]+-[A-Z]+\.yml/.test(filename)) {
-			console.log(`update ${filename} ...`)
-			locales = buildLocales();
-			await copyFrontendLocales()
-		}
-	}
+  const watcher = fs.watch('./locales');
+  for await (const event of watcher) {
+    const filename = event.filename?.replaceAll('\\', '/');
+    if (/^[a-z]+-[A-Z]+\.yml/.test(filename)) {
+      console.log(`update ${filename} ...`)
+      locales = buildLocales();
+      await copyFrontendLocales()
+    }
+  }
 }