Merge branch 'main' into hide-join-link

aster-void · aster-void · commit 20c89c74cebb · 2025-10-13T11:57:25.000+09:00
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: oven-sh/setup-bun@v2
         with:
-          bun-version: 1.2.5
+          bun-version: 1.3
       - run: bun install --frozen-lockfile
       - uses: actions/cache@v4
         with:
diff --git a/README.md b/README.md
@@ -16,18 +16,13 @@
 - HEIC は対応していないので、 ImageMagick で他のフォーマットに変換してください。
   - 例: `magick picture.HEIC picture.webp`
 - すべての画像ファイルは 1 MB 未満に抑えてください。既存のものを変更したり、 CI でチェックしたりはまだ実装してないです。
-
   - ffmpeg や ImageMagick を使い、解像度を下げたり、画質 (Quality) を下げたり、WebP (or AVIF) に変換するなどができます。
-
     - 例:
-
       - `mogrify -resize 800x -quality 80 -format webp input.png`
-
         - ImageMagick についてきます。
         - コマンドの引数は見ての通り。
 
       - `ffmpeg -i ./input.png -vf 'scale=1920:-1' -crf 10 output.avif`
-
         - -> 50〜300kb 程度になります。AVIF の場合、多少 (数秒〜1分程度) 時間がかかります。
         - `-vf scale={width}:{height}`: 画像の横幅。height が -1 のときは、横幅から計算する。
         - `-crf`: 画像の圧縮率。大きいほうが圧縮率が高い。
@@ -42,7 +37,6 @@
 ### 記事
 
 - サムネイルは縦横比 3:5 にクロップされます。
-
   - 可能なら 3:5 に近い画像を使い、
   - できないかつクロップが許容できない場合は、 `thumbnail.fit: contain` と背景色 (`thumbnail.bg`) を指定してください。
 
diff --git a/astro.config.ts b/astro.config.ts
@@ -1,10 +1,8 @@
-import { defineConfig } from "astro/config";
-
-import tailwind from "@tailwindcss/vite";
-
 import mdx from "@astrojs/mdx";
 import sitemap from "@astrojs/sitemap";
 import svelte from "@astrojs/svelte";
+import tailwind from "@tailwindcss/vite";
+import { defineConfig } from "astro/config";
 import icon from "astro-icon";
 // import { visualizer } from "rollup-plugin-visualizer";
 
diff --git a/biome.jsonc b/biome.jsonc
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.2.5/schema.json",
   "vcs": {
     "enabled": true,
     "clientKind": "git",
@@ -14,13 +14,14 @@
     "indentWidth": 2,
     "lineWidth": 120,
   },
-  "organizeImports": {
-    "enabled": true,
-  },
+  "assist": { "actions": { "source": { "organizeImports": "on" } } },
   "linter": {
     "enabled": true,
     "rules": {
       "recommended": true,
+      "suspicious": {
+        "noUnknownAtRules": "off",
+      },
     },
   },
   "javascript": {
@@ -31,13 +32,17 @@
   },
   "overrides": [
     {
-      "include": ["*.svelte", "*.astro", "*.vue"],
+      "includes": ["**/*.svelte", "**/*.astro", "**/*.vue"],
       "linter": {
         "rules": {
           "style": {
             "useConst": "off",
             "useImportType": "off",
           },
+          "correctness": {
+            "noUnusedImports": "off",
+            "noUnusedVariables": "off",
+          },
         },
       },
     },
diff --git a/bun.lock b/bun.lock
diff --git a/contents/banner.ts b/contents/banner.ts
@@ -1,4 +1,5 @@
 import type { Banner } from "+/schema.ts";
+
 const banner: Banner = {
   shown: false,
   kind: "notify",
diff --git a/docs/contents/article.md b/docs/contents/article.md
@@ -5,18 +5,15 @@
 ### base
 
 - title: string
-
   - 記事タイトル。
 
 - date: Date
-
   - **記事を書いた**日。
   - フォーマット:
     - yyyy-MM-dd (日付のみ)
     - yyyy-MM-dd hh:mm:ss+09:00 (日付+時間)
 
 - author: string & keyof Member
-
   - 著者。
 
 - categories?: string[]
@@ -25,18 +22,15 @@
 ### image 系
 
 - thumbnail.src: path
-
   - タイトル画像。記事一覧とトップで使うよ。
   - 縦横比 3:5 に crop されるよ。
 
 - thumbnail.fit?: "cover" | "contain" | fill" | "none" = "cover"
-
   - `object-fit`
   - Astro のビルド段階で Sharp に渡されるよ。
   - <https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit>
 
 - thumbnail.position?: "center" | "left" | "right" | "top" | "bottom"
-
   - `object-position`
   - Astro のビルド段階で Sharp に渡されるよ。
 
diff --git a/flake.lock b/flake.lock
diff --git a/package.json b/package.json
@@ -23,34 +23,34 @@
     "preview": "astro preview"
   },
   "dependencies": {
-    "@astrojs/mdx": "^4.3.0",
-    "@astrojs/sitemap": "^3.4.1",
-    "@astrojs/svelte": "^7.1.0",
-    "@date-fns/tz": "^1.2.0",
+    "@astrojs/mdx": "^4.3.7",
+    "@astrojs/sitemap": "^3.6.0",
+    "@astrojs/svelte": "^7.2.0",
+    "@date-fns/tz": "^1.4.1",
     "@iconify-json/feather": "^1.2.1",
-    "@iconify-json/flowbite": "^1.2.5",
-    "@tailwindcss/typography": "^0.5.16",
-    "astro": "^5.10.0",
+    "@iconify-json/flowbite": "^1.2.7",
+    "@tailwindcss/typography": "^0.5.19",
+    "astro": "^5.14.4",
     "astro-icon": "^1.1.5",
-    "bits-ui": "^1.8.0",
-    "cheerio": "^1.1.0",
-    "daisyui": "^5.0.43",
+    "bits-ui": "^2.11.5",
+    "cheerio": "^1.1.2",
+    "daisyui": "^5.2.3",
     "date-fns": "^4.1.0",
     "markdown-to-txt": "^2.0.1",
-    "sharp": "^0.34.2",
-    "svelte": "^5.34.7",
-    "tailwindcss": "^4.1.10",
-    "@tailwindcss/vite": "^4.1.10"
+    "sharp": "^0.34.4",
+    "svelte": "^5.39.11",
+    "tailwindcss": "^4.1.14",
+    "@tailwindcss/vite": "^4.1.14"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.4",
-    "@biomejs/biome": "^1.9.4",
-    "lefthook": "^1.11.14",
-    "prettier": "^3.5.3",
+    "@biomejs/biome": "^2.2.5",
+    "lefthook": "^1.13.6",
+    "prettier": "^3.6.2",
     "prettier-plugin-astro": "^0.14.1",
     "prettier-plugin-svelte": "^3.4.0",
-    "prettier-plugin-tailwindcss": "^0.6.13",
-    "rollup-plugin-visualizer": "^5.14.0",
-    "typescript": "^5.8.3"
+    "prettier-plugin-tailwindcss": "^0.6.14",
+    "rollup-plugin-visualizer": "^6.0.4",
+    "typescript": "^5.9.3"
   }
 }
diff --git a/src/components/ActionButton.astro b/src/components/ActionButton.astro
@@ -1,6 +1,7 @@
 ---
 // support legacy articles because they import from this path
 import ActionButtonSource from "./utils/ActionButton.astro";
+
 interface Props {
   to: string;
 }
diff --git a/src/components/ActivityPage/Layout.astro b/src/components/ActivityPage/Layout.astro
@@ -1,8 +1,8 @@
 ---
-import { Picture } from "astro:assets";
 import JoinUsCTA from "+/components/common/JoinUsCTA.astro";
 import GlobalLayout from "+/layouts/GlobalLayout.astro";
 import { Focus } from "+/schema";
+import { Picture } from "astro:assets";
 import type { ImageMetadata } from "astro";
 
 interface Props {
diff --git a/src/components/ActivityPage/Section.astro b/src/components/ActivityPage/Section.astro
@@ -1,5 +1,6 @@
 ---
 import { Picture } from "astro:assets";
+
 interface Props {
   title: string;
   "align-image": "left" | "right";
diff --git a/src/components/common/ArticleList.astro b/src/components/common/ArticleList.astro
@@ -1,6 +1,6 @@
 ---
-import { Picture } from "astro:assets";
 import type { Article } from "+/schema";
+import { Picture } from "astro:assets";
 import { format } from "date-fns";
 import { markdownToTxt } from "markdown-to-txt";
 
@@ -22,7 +22,7 @@ const {
 } = props;
 
 const maxCols =
-  typeof _maxCols === "string" ? Number.parseInt(_maxCols) : _maxCols;
+  typeof _maxCols === "string" ? Number.parseInt(_maxCols, 10) : _maxCols;
 
 const MDXSpecialSyntax = /^import ActionButton from ".+";/;
 
diff --git a/src/components/common/JoinUsCTA.astro b/src/components/common/JoinUsCTA.astro
@@ -1,5 +1,6 @@
 ---
 import ActionButton from "+/components/utils/ActionButton.astro";
+
 interface Props {
   class?: string;
 }
diff --git a/src/components/common/ProjectList.astro b/src/components/common/ProjectList.astro
@@ -1,6 +1,6 @@
 ---
-import { Picture } from "astro:assets";
 import type { Project } from "+/schema";
+import { Picture } from "astro:assets";
 
 interface Props {
   projects: { id: string; data: Project }[];
diff --git a/src/layouts/GlobalLayout.astro b/src/layouts/GlobalLayout.astro
@@ -1,11 +1,11 @@
 ---
 import "+/global.css";
 
-import { ClientRouter } from "astro:transitions";
 import Footer from "+/components/common/Footer.astro";
 import Header from "+/components/common/Header.astro";
 import type { OgType } from "+/lib/types";
 import type { Focus } from "+/schema";
+import { ClientRouter } from "astro:transitions";
 import Meta from "./meta.astro";
 
 interface Props {
diff --git a/src/lib/cache.ts b/src/lib/cache.ts
@@ -23,7 +23,7 @@ export async function cache<T>(
   } = {},
 ): Promise<T> {
   const ttl = options.ttl ?? DEFAULT_TTL;
-  const now = new Date().getTime() / 1000;
+  const now = Date.now() / 1000;
   const path = await toPath(sanitizeKey(key));
 
   // cache load
@@ -80,7 +80,7 @@ async function exists(path: string) {
   try {
     await fs.stat(path);
     return true;
-  } catch (err) {
+  } catch (_err) {
     return false;
   }
 }
diff --git a/src/pages/about/index.astro b/src/pages/about/index.astro
@@ -1,9 +1,8 @@
 ---
-import GlobalLayout from "+/layouts/GlobalLayout.astro";
-import StaticDocumentWrapper from "+/layouts/StaticDocumentWrapper.astro";
-
 import ActionButton from "+/components/utils/ActionButton.astro";
 import Header from "+/images/activity/develop/solo-dev.jpg";
+import GlobalLayout from "+/layouts/GlobalLayout.astro";
+import StaticDocumentWrapper from "+/layouts/StaticDocumentWrapper.astro";
 import { Focus } from "+/schema";
 ---
 
diff --git a/src/pages/articles/[...id].astro b/src/pages/articles/[...id].astro
@@ -1,10 +1,10 @@
 ---
-import { Picture } from "astro:assets";
-import { render } from "astro:content";
 import JoinUsCTA from "+/components/common/JoinUsCTA.astro";
 import GlobalLayout from "+/layouts/GlobalLayout.astro";
 import { getArticles, getMember } from "+/query.ts";
 import { Focus } from "+/schema.ts";
+import { Picture } from "astro:assets";
+import { render } from "astro:content";
 import { format } from "date-fns";
 
 export async function getStaticPaths() {
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -1,20 +1,17 @@
 ---
-import { Picture } from "astro:assets";
-import { Icon } from "astro-icon/components";
-
-import GlobalLayout from "+/layouts/GlobalLayout.astro";
-
 import ArticleList from "+/components/common/ArticleList.astro";
 import ProjectList from "+/components/common/ProjectList.astro";
 import SectionHeader from "+/components/index/SectionHeader.astro";
 import ActionButton from "+/components/utils/ActionButton.astro";
-import { getArticles, getProjects } from "+/query.ts";
-import { Focus } from "+/schema.ts";
-
 import LogoGMOMedia from "+/images/donators/gmo-media.png";
 import LogoRIZAPTechnologies from "+/images/donators/rizap-technologies.png";
 import Hero from "+/images/headers/index.jpg";
 import LabCafe from "+/images/lab-cafe.jpg";
+import GlobalLayout from "+/layouts/GlobalLayout.astro";
+import { getArticles, getProjects } from "+/query.ts";
+import { Focus } from "+/schema.ts";
+import { Picture } from "astro:assets";
+import { Icon } from "astro-icon/components";
 
 const projects = await getProjects("long-term");
 projects.splice(6);
diff --git a/src/pages/members.astro b/src/pages/members.astro
@@ -1,10 +1,10 @@
 ---
-import { Picture } from "astro:assets";
 import JoinUsCTA from "+/components/common/JoinUsCTA.astro";
 import Header from "+/images/headers/members.jpg";
 import GlobalLayout from "+/layouts/GlobalLayout.astro";
 import { getMembers } from "+/query.ts";
 import { Focus } from "+/schema.ts";
+import { Picture } from "astro:assets";
 
 const members = await getMembers();
 ---
diff --git a/src/pages/members/[...id].astro b/src/pages/members/[...id].astro
@@ -1,11 +1,11 @@
 ---
-import { Picture } from "astro:assets";
-import { render } from "astro:content";
 import ArticleList from "+/components/common/ArticleList.astro";
 import JoinUsCTA from "+/components/common/JoinUsCTA.astro";
 import GlobalLayout from "+/layouts/GlobalLayout.astro";
 import { getArticles, getMembers } from "+/query";
 import { Focus } from "+/schema";
+import { Picture } from "astro:assets";
+import { render } from "astro:content";
 import { Icon } from "astro-icon/components";
 
 export async function getStaticPaths() {
diff --git a/src/pages/projects/[...id].astro b/src/pages/projects/[...id].astro
diff --git a/src/pages/welcome-events.astro b/src/pages/welcome-events.astro
diff --git a/src/schema.ts b/src/schema.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import type { Banner } from "+/schema.ts";`
	`2`	`+`
`2`	`3`	`const banner: Banner = {`
`3`	`4`	`shown: false,`
`4`	`5`	`kind: "notify",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`---`
`2`	`2`	`// support legacy articles because they import from this path`
`3`	`3`	`import ActionButtonSource from "./utils/ActionButton.astro";`
	`4`	`+`
`4`	`5`	`interface Props {`
`5`	`6`	`to: string;`
`6`	`7`	`}`