Merge branch 'typst-jp:main' into trans/foundations

Author: sbtseiji

.textlintignore

@@ -1,3 +1,3 @@
 # hayagrivaのsrc/csl/archive.rsで管理されている参考文献フォーマット
-website/dist/docs/reference/model/bibliography/index.html
-website/dist/docs/reference/model/cite/index.html
+website/dist/reference/model/bibliography/index.html
+website/dist/reference/model/cite/index.html

bun.lockb

@@ -4,14 +4,14 @@
   "scripts": {
     "textlint-md": "textlint ./docs/",
     "textlint-md:fix": "textlint --fix ./docs/",
-    "textlint-html": "textlint ./website/dist/docs/"
+    "textlint-html": "textlint ./website/dist/"
   },
   "devDependencies": {
     "@types/bun": "latest",
-    "textlint": "^14.3.0",
+    "textlint": "^15.2.2",
     "textlint-filter-rule-comments": "^1.2.2",
     "textlint-plugin-html": "^1.0.1",
-    "textlint-rule-preset-jtf-style": "^2.3.14"
+    "textlint-rule-preset-jtf-style": "^3.0.2"
   },
   "peerDependencies": {
     "typescript": "^5.0.0"

package.json

@@ -0,0 +1,40 @@
+{
+	"$schema": "https://biomejs.dev/schemas/2.0.6/schema.json",
+	"vcs": {
+		"enabled": true,
+		"clientKind": "git",
+		"useIgnoreFile": true
+	},
+	"files": {
+		"ignoreUnknown": false,
+		"includes": ["**"]
+	},
+	"formatter": {
+		"enabled": true,
+		"indentStyle": "tab"
+	},
+	"assist": { "actions": { "source": { "organizeImports": "on" } } },
+	"linter": {
+		"enabled": true,
+		"rules": {
+			"recommended": true,
+			"style": {
+				"noParameterAssign": "error",
+				"useAsConstAssertion": "error",
+				"useDefaultParameterLast": "error",
+				"useEnumInitializers": "error",
+				"useSelfClosingElements": "error",
+				"useSingleVarDeclarator": "error",
+				"noUnusedTemplateLiteral": "error",
+				"useNumberNamespace": "error",
+				"noInferrableTypes": "error",
+				"noUselessElse": "error"
+			}
+		}
+	},
+	"javascript": {
+		"formatter": {
+			"quoteStyle": "double"
+		}
+	}
+}

website/biome.json

@@ -12,7 +12,7 @@
 		"test": "vitest"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "1.9.4",
+		"@biomejs/biome": "2.0.6",
 		"@hono/ssg-plugins-essential": "^0.1.0",
 		"@hono/vite-dev-server": "^0.20.1",
 		"@hono/vite-ssg": "^0.2.0",

website/biome.jsonc

@@ -1,19 +1,19 @@
 // Tabler Icons
 // https://tabler.io/icons
-export { HomeIcon } from "./HomeIcon";
+
+export { AlertTriangleIcon } from "./AlertTriangleIcon";
 export { CaretRightCircleIcon } from "./CaretRightCircleIcon";
-export { InfoCircleIcon } from "./InfoCircleIcon";
-export { HelpCircleIcon } from "./HelpCircleIcon";
 export { ChevronLeftIcon } from "./ChevronLeftIcon";
 export { ChevronRightIcon } from "./ChevronRightIcon";
-export { AlertTriangleIcon } from "./AlertTriangleIcon";
-export { MenuIcon } from "./MenuIcon";
 export { CloseIcon } from "./CloseIcon";
-export { SearchIcon } from "./SearchIcon";
-export { LanguageIcon } from "./LanguageIcon";
-export { WorldIcon } from "./WorldIcon";
-
+export { DiscordIcon } from "./DiscordIcon";
 // Simple Icons
 // https://simpleicons.org/
 export { GitHubIcon } from "./GitHubIcon";
-export { DiscordIcon } from "./DiscordIcon";
+export { HelpCircleIcon } from "./HelpCircleIcon";
+export { HomeIcon } from "./HomeIcon";
+export { InfoCircleIcon } from "./InfoCircleIcon";
+export { LanguageIcon } from "./LanguageIcon";
+export { MenuIcon } from "./MenuIcon";
+export { SearchIcon } from "./SearchIcon";
+export { WorldIcon } from "./WorldIcon";

website/bun.lockb

@@ -1,9 +1,14 @@
 import { html } from "hono/html";
 import type { FC, PropsWithChildren } from "hono/jsx";
-import { basePath, originUrl, typstOfficialDocsUrl } from "../../metadata";
-import { Translation, translation } from "../../translation";
+import {
+	basePath,
+	displayTranslationStatus,
+	originUrl,
+	typstOfficialDocsUrl,
+} from "../../metadata";
+import { Translation, translation } from "../../translation/";
 import type { Page } from "../../types/model";
-import { joinPath, removeBasePath } from "../../utils/path";
+import { joinPath, shiftBase } from "../../utils/path";
 import { getTranslationStatus } from "../../utils/translationStatus";
 import {
 	CaretRightCircleIcon,
@@ -50,9 +55,10 @@ export const BaseTemplate: FC<BaseTemplateProps> = ({
 		joinPath(basePath, "/favicon.png"),
 		originUrl,
 	).toString();
-	const typstOfficialRouteUrl = joinPath(
+	const typstOfficialRouteUrl = shiftBase(
+		route,
+		basePath,
 		typstOfficialDocsUrl,
-		removeBasePath(basePath, route),
 	);
 	return (
 		<html lang={translation.htmlLang()} class="scroll-pt-24">
@@ -207,7 +213,10 @@ export const BaseTemplate: FC<BaseTemplateProps> = ({
 							<Breadcrumbs path={path} />
 
 							<div class="flex flex-col gap-2 my-4">
-								<TranslationStatusAlert status={translationStatus} />
+								{(displayTranslationStatus ||
+									translationStatus === "community") && (
+									<TranslationStatusAlert status={translationStatus} />
+								)}
 							</div>
 
 							{translationStatus !== "community" && (

website/package.json

@@ -1,5 +1,5 @@
 import type { FC } from "hono/jsx";
-import { Translation } from "../../translation";
+import { Translation } from "../../translation/";
 import type { CategoryBody, Page } from "../../types/model";
 import { HtmlContent } from "../ui/HtmlContent";
 import BaseTemplate, { type BaseTemplateProps } from "./BaseTemplate";