Merge branch 'main' into i18n

vim-jp · Mar 2, 2025 · dd72e92 · dd72e92
2 parents 9760759 + 79daf1c
commit dd72e92
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/2025/astro.config.mjs b/2025/astro.config.mjs
@@ -12,11 +12,6 @@ export default defineConfig({
 		serializeConfig: true,
 	},
 
-	redirects: {
-		'/': '/2025/ja',
-		'/2025': '/2025/ja',
-	},
-
 	vite: {
 		optimizeDeps: {
 			exclude: [

diff --git a/2025/public/favicon.ico → 2025/src/assets/favicon.ico b/2025/public/favicon.ico → 2025/src/assets/favicon.ico
diff --git a/2025/src/layouts/Layout.astro b/2025/src/layouts/Layout.astro
@@ -1,4 +1,5 @@
 ---
+import favicon from '@/assets/favicon.ico?url';
 import Footer from '@/components/Footer.astro';
 import Header from '@/components/Header.astro';
 import { BASE_URL } from '@/consts';
@@ -16,7 +17,8 @@ const ogImageUrl = ufo.joinURL(BASE_URL, 'og.png');
 <!DOCTYPE html>
 <html lang={lang}>
 	<head>
-    <meta charset="utf-8" />
+		<slot name="header" />
+		<meta charset="utf-8" />
 		<GoogleFontsOptimizer url="https://fonts.googleapis.com/css2?family=Cardo:ital,wght@0,400;0,700;1,400&display=swap" />
 		<SEO
 			{title}
@@ -37,7 +39,7 @@ const ogImageUrl = ufo.joinURL(BASE_URL, 'og.png');
 				image: ogImageUrl,
 			}}
 			extend={{
-				link: [{ rel: 'icon', href: '/favicon.ico' }],
+				link: [{ rel: 'icon', href: favicon }],
 			}}
 		/>
 	</head>

diff --git a/2025/src/pages/index.astro b/2025/src/pages/index.astro
@@ -0,0 +1,8 @@
+---
+import Layout from '@/layouts/Layout.astro';
+---
+<Layout>
+  <Fragment slot="header">
+    <meta http-equiv="refresh" content="0;url=/2025/ja" />
+  </Fragment>
+</Layout>