diff --git a/src/components/SocialShares.astro b/src/components/SocialShares.astro
index 0f8abfb..497be4c 100644
--- a/src/components/SocialShares.astro
+++ b/src/components/SocialShares.astro
@@ -1,5 +1,5 @@
---
-import { Icon } from "astro-icon/components";
+import { Image } from "astro:assets";
/**
* SocialShares Component
@@ -23,14 +23,24 @@ const { url = Astro.url.href } = Astro.props;
target="_blank"
rel="noopener noreferrer"
>
-
Share on Facebook
-
+
- Share on Twitter
-
+
@@ -39,8 +49,13 @@ const { url = Astro.url.href } = Astro.props;
target="_blank"
rel="noopener noreferrer"
>
- Share on LinkedIn
-
+
diff --git a/src/layouts/DefaultLayout.astro b/src/layouts/DefaultLayout.astro
index c732aaa..d665efa 100644
--- a/src/layouts/DefaultLayout.astro
+++ b/src/layouts/DefaultLayout.astro
@@ -31,7 +31,7 @@ const lang = Astro.currentLocale ?? Astro.preferredLocale ?? defaultLocale;
)}
-
+
diff --git a/src/libs/i18n/translations.ts b/src/libs/i18n/translations.ts
index eb15dda..32e3f7c 100644
--- a/src/libs/i18n/translations.ts
+++ b/src/libs/i18n/translations.ts
@@ -1,6 +1,14 @@
import type { Translations } from "./utils.ts";
export const translations = {
+ "404.notfound": {
+ en: "Page Not Found",
+ ja: "ページが見つかりませんでした",
+ },
+ "404.tohome": {
+ en: "Back to Home",
+ ja: "ホームへ戻る",
+ },
"nav.home": {
en: "Home",
ja: "ホーム",
diff --git a/src/libs/i18n/utils.ts b/src/libs/i18n/utils.ts
index fbd801d..0eb4997 100644
--- a/src/libs/i18n/utils.ts
+++ b/src/libs/i18n/utils.ts
@@ -4,7 +4,7 @@ import { translations } from "./translations.ts";
export type Locale = typeof locales[number];
export type Translations = Record
>;
-const isSupportedLocale = (maybeLocaleString: string): maybeLocaleString is Locale =>
+export const isSupportedLocale = (maybeLocaleString: string): maybeLocaleString is Locale =>
(locales as unknown as string[]).includes(maybeLocaleString);
export const useTranslations = (locale: string | undefined) => {
diff --git a/src/pages/404.astro b/src/pages/404.astro
new file mode 100644
index 0000000..b495995
--- /dev/null
+++ b/src/pages/404.astro
@@ -0,0 +1,37 @@
+---
+import DefaultLayout from "@layouts/DefaultLayout.astro";
+import { defaultLocale } from "@libs/i18n/configs";
+import { isSupportedLocale, useTranslations } from "@libs/i18n/utils.ts";
+
+export const prerender = false;
+
+const [ , maybeLocaleInURL, ...pathComponents ] = Astro.url.pathname.split("/");
+
+if (!maybeLocaleInURL || !isSupportedLocale(maybeLocaleInURL)) {
+ // `astro check` has a bug to warn that `res` is never read ― see: https://github.com/withastro/astro/issues/14684
+ const res = Astro.redirect(`/${
+ [ (Astro.preferredLocale ?? Astro.currentLocale), maybeLocaleInURL, ...pathComponents ]
+ .filter((pathComponent) => !!pathComponent)
+ .join("/")
+ }/`);
+
+ return res;
+}
+
+const lang = Astro.currentLocale ?? Astro.preferredLocale ?? defaultLocale;
+const t = useTranslations(lang);
+---
+
+
+
+
+
diff --git a/src/pages/[locale]/404.astro b/src/pages/[locale]/404.astro
deleted file mode 100644
index d217aca..0000000
--- a/src/pages/[locale]/404.astro
+++ /dev/null
@@ -1,22 +0,0 @@
----
-import DefaultLayout from "@layouts/DefaultLayout.astro";
-import { locales } from "@libs/i18n/configs.ts";
-
-export function getStaticPaths() {
- return locales.map((locale) => ({ params: { locale }}));
-}
----
-
-
-
-
-
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 6439efe..8c39bee 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,3 +1,5 @@
---
-// This file should never be visited.
+export const prerender = false;
+
+return Astro.redirect(`/${ Astro.preferredLocale ?? Astro.currentLocale }/`);
---
diff --git a/tsconfig.json b/tsconfig.json
index aea7f15..0bd1a00 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,7 @@
"dom"
],
"types": [
- "@cloudflare/workers-types"
+ "./worker-configuration.d.ts"
],
"paths": {
"@components/*": [ "./src/components/*" ],
@@ -17,5 +17,12 @@
"@assets/*": [ "./src/assets/*" ],
"@libs/*": [ "./src/libs/*" ]
}
- }
+ },
+ "include": [
+ ".astro/types.d.ts",
+ "**/*"
+ ],
+ "exclude": [
+ "dist"
+ ]
}
diff --git a/wrangler.jsonc b/wrangler.jsonc
index d292b6a..4cbe18c 100644
--- a/wrangler.jsonc
+++ b/wrangler.jsonc
@@ -2,7 +2,7 @@
"$schema": "node_modules/wrangler/config-schema.json",
"name": "guildkit-website",
- "compatibility_date": "2025-09-25",
+ "compatibility_date": "2026-05-19",
"compatibility_flags": [ "nodejs_compat" ],
"workers_dev": true,
"placement": {
@@ -10,7 +10,9 @@
},
"assets": {
- "directory": "./dist"
+ "directory": "./dist",
+ "html_handling": "force-trailing-slash",
+ "not_found_handling": "404-page"
},
"vars": {