Tabler iconsのセルフホスティングをやめる (#125)

adzukimame · Oct 18, 2024 · 22046d5 · 22046d5
1 parent 719b570
commit 22046d5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 26 deletions.
diff --git a/packages/backend/src/server/SecurityHeaderService.ts b/packages/backend/src/server/SecurityHeaderService.ts
@@ -97,7 +97,7 @@ export class SecurityHeaderService {
 			...(this.config.contentSecurityPolicy?.frameSrc ?? []),
 		].join(' ');
 
-		this.basePolicy = `default-src 'self'; script-src ${baseScriptSrc}; style-src 'self' 'unsafe-inline' https://hcaptcha.com https://*.hcaptcha.com; img-src ${imgSrc}; media-src ${mediaSrc}; connect-src 'self' https://hcaptcha.com https://*.hcaptcha.com https://cloudflareinsights.com/cdn-cgi/rum; frame-src ${frameSrc}; object-src 'none'; base-uri 'none'; form-action 'self'; frame-ancestors 'none';${this.reportEnabled ? ' report-to csp;' : ''}`;
+		this.basePolicy = `default-src 'self'; script-src ${baseScriptSrc}; style-src 'self' 'unsafe-inline' https://hcaptcha.com https://*.hcaptcha.com https://cdn.jsdelivr.net/npm/@tabler/[email protected]/dist/tabler-icons.min.css; font-src 'self' https://cdn.jsdelivr.net/npm/@tabler/[email protected]/dist/fonts/; img-src ${imgSrc}; media-src ${mediaSrc}; connect-src 'self' https://hcaptcha.com https://*.hcaptcha.com https://cloudflareinsights.com/cdn-cgi/rum; frame-src ${frameSrc}; object-src 'none'; base-uri 'none'; form-action 'self'; frame-ancestors 'none';${this.reportEnabled ? ' report-to csp;' : ''}`;
 		//#endregion
 
 		//#region bios.pug, cli.pug, flush.pug

diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
@@ -37,8 +37,8 @@ html
 		link(rel='prefetch' href=serverErrorImageUrl)
 		link(rel='prefetch' href=infoImageUrl)
 		link(rel='prefetch' href=notFoundImageUrl)
-		//- https://github.com/misskey-dev/misskey/issues/9842
-		link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.min.css?v3.3.0')
+		link(rel='preconnect' href='https://cdn.jsdelivr.net')
+		link(rel='stylesheet' href='https://cdn.jsdelivr.net/npm/@tabler/icons[email protected]/dist/tabler-icons.min.css')
 		link(rel='modulepreload' href=`/vite/${clientEntry.file}`)
 
 		if !config.clientManifestExists

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -25,7 +25,6 @@
 		"@rollup/plugin-replace": "5.0.7",
 		"@rollup/pluginutils": "5.1.0",
 		"@syuilo/aiscript": "0.19.0",
-		"@tabler/icons-webfont": "3.3.0",
 		"@vitejs/plugin-vue": "5.1.0",
 		"@vue/compiler-sfc": "3.4.37",
 		"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.11",

diff --git a/packages/frontend/src/_dev_boot_.ts b/packages/frontend/src/_dev_boot_.ts
@@ -6,7 +6,6 @@
 // devモードで起動される際（index.htmlを使うとき）はrouterが暴発してしまってうまく読み込めない。
 // よって、devモードとして起動されるときはビルド時に組み込む形としておく。
 // (pnpm start時はpugファイルの中で静的リソースとして読み込むようになっており、この問題は起こっていない)
-import '@tabler/icons-webfont/dist/tabler-icons.scss';
 
 await main();
 

diff --git a/packages/frontend/src/index.html b/packages/frontend/src/index.html
@@ -19,14 +19,17 @@
 		content="default-src 'self' https://newassets.hcaptcha.com/ https://challenges.cloudflare.com/ http://localhost:7493/;
 			worker-src 'self';
 			script-src 'self' 'unsafe-eval' https://*.hcaptcha.com https://challenges.cloudflare.com https://esm.sh;
-			style-src 'self' 'unsafe-inline';
+			style-src 'self' 'unsafe-inline' cdn.jsdelivr.net;
+			font-src 'self' cdn.jsdelivr.net;
 			img-src 'self' data: blob: www.google.com xn--931a.moe cdn.jsdelivr.net localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000;
 			media-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000;
 			connect-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 https://newassets.hcaptcha.com;
 			frame-src *;"
 	/>
 	<meta property="og:site_name" content="[DEV BUILD] Misskey" />
 	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="preconnect" href="https://cdn.jsdelivr.net" />
+	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@tabler/[email protected]/dist/tabler-icons.min.css" />
 </head>
 
 <body>

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/build-assets.mjs b/scripts/build-assets.mjs
@@ -29,10 +29,6 @@ async function loadConfig() {
 	return fs.readFile(configPath, 'utf-8').then(data => yaml.load(data)).catch(() => null);
 }
 
-async function copyFrontendTablerIcons() {
-  await fs.cp('./packages/frontend/node_modules/@tabler/icons-webfont/dist', './built/_frontend_dist_/tabler-icons', { dereference: true, recursive: true });
-}
-
 async function copyFrontendLocales() {
   generateDTS();
 
@@ -81,7 +77,6 @@ async function buildBackendStyle() {
 
 async function build() {
   await Promise.all([
-    copyFrontendTablerIcons(),
     copyFrontendLocales(),
     copyBackendViews(),
     buildBackendScript(),