From e3a2c2d58229f09c9848d335498fef45fb455371 Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 02:51:11 +0900 Subject: [PATCH 01/12] Rename componentsto PascalCase & fix --- .../src/components/{breadcrumb.astro => Breadcrumb.astro} | 0 client/src/components/CalendarListSkeleton.vue | 2 +- client/src/components/{footer.astro => Footer.astro} | 0 client/src/components/{frame.astro => Frame.astro} | 0 client/src/components/{head.astro => Head.astro} | 0 client/src/components/{header.astro => Header.astro} | 2 +- client/src/components/{sidebar.astro => Sidebar.astro} | 0 client/src/layouts/Layout.astro | 8 ++++---- client/src/pages/contact.astro | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename client/src/components/{breadcrumb.astro => Breadcrumb.astro} (100%) rename client/src/components/{footer.astro => Footer.astro} (100%) rename client/src/components/{frame.astro => Frame.astro} (100%) rename client/src/components/{head.astro => Head.astro} (100%) rename client/src/components/{header.astro => Header.astro} (94%) rename client/src/components/{sidebar.astro => Sidebar.astro} (100%) diff --git a/client/src/components/breadcrumb.astro b/client/src/components/Breadcrumb.astro similarity index 100% rename from client/src/components/breadcrumb.astro rename to client/src/components/Breadcrumb.astro diff --git a/client/src/components/CalendarListSkeleton.vue b/client/src/components/CalendarListSkeleton.vue index 2fbb5f5..9d58576 100644 --- a/client/src/components/CalendarListSkeleton.vue +++ b/client/src/components/CalendarListSkeleton.vue @@ -7,7 +7,7 @@ const props = defineProps<{ // 0から7までの配列 const skeletonItems = Array.from({ length: 8 }, (_, i) => i); -const exitStates = ref(new Array(8).fill(false)); +const exitStates = ref(Array.from({ length: 8 }, () => false)); const isFullyExited = ref(false); watch( diff --git a/client/src/components/footer.astro b/client/src/components/Footer.astro similarity index 100% rename from client/src/components/footer.astro rename to client/src/components/Footer.astro diff --git a/client/src/components/frame.astro b/client/src/components/Frame.astro similarity index 100% rename from client/src/components/frame.astro rename to client/src/components/Frame.astro diff --git a/client/src/components/head.astro b/client/src/components/Head.astro similarity index 100% rename from client/src/components/head.astro rename to client/src/components/Head.astro diff --git a/client/src/components/header.astro b/client/src/components/Header.astro similarity index 94% rename from client/src/components/header.astro rename to client/src/components/Header.astro index 6ccc469..0c7f6d7 100644 --- a/client/src/components/header.astro +++ b/client/src/components/Header.astro @@ -1,5 +1,5 @@ --- -import Sidebar from "./sidebar.astro"; +import Sidebar from "./Sidebar.astro"; import favicon from "../../public/favicon.svg"; import { Image } from "astro:assets"; --- diff --git a/client/src/components/sidebar.astro b/client/src/components/Sidebar.astro similarity index 100% rename from client/src/components/sidebar.astro rename to client/src/components/Sidebar.astro diff --git a/client/src/layouts/Layout.astro b/client/src/layouts/Layout.astro index e3f16f5..ae17336 100644 --- a/client/src/layouts/Layout.astro +++ b/client/src/layouts/Layout.astro @@ -1,8 +1,8 @@ --- -import Footer from "@/components/footer.astro"; -import Head from "@/components/head.astro"; -import Header from "@/components/header.astro"; -import Breadcrumb from "@/components/breadcrumb.astro"; +import Footer from "@/components/Footer.astro"; +import Head from "@/components/Head.astro"; +import Header from "@/components/Header.astro"; +import Breadcrumb from "@/components/Breadcrumb.astro"; import "@/styles/global.css"; diff --git a/client/src/pages/contact.astro b/client/src/pages/contact.astro index a2432a7..813a52f 100644 --- a/client/src/pages/contact.astro +++ b/client/src/pages/contact.astro @@ -1,5 +1,5 @@ --- -import ContactForm from "@/components/contactForm.vue"; +import ContactForm from "@/components/ContactForm.vue"; import Layout from "@/layouts/Layout.astro"; --- From 788484d2b142b7ff2eabe54bb675888e1362fa2f Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 02:51:11 +0900 Subject: [PATCH 02/12] Rename componentsto PascalCase & fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e2d8e9d..03e1faf 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "format": "bunx turbo format", "lint": "bunx turbo lint", "outdated": "bunx turbo outdated", - "cf-typegen":"wrangler types ./client/worker-configuration.d.ts" + "cf-typegen": "wrangler types ./client/worker-configuration.d.ts" }, "devDependencies": { "oxfmt": "latest", From ad8693ce5cf78b44423bf2114dc5953fac5e5f0d Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 02:55:07 +0900 Subject: [PATCH 03/12] Upgrade hono to catalog reference --- bun.lock | 7 +++++-- client/package.json | 2 +- package.json | 13 +++++++++---- worker/package.json | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/bun.lock b/bun.lock index 925d676..1eceef5 100644 --- a/bun.lock +++ b/bun.lock @@ -21,7 +21,7 @@ "@unocss/astro": "66.6.7", "astro": "^6.1.3", "astro-llms-generate": "1.3.3", - "hono": "4.12.10", + "hono": "catalog:", "prettier-plugin-vue": "1.1.6", "sharp": "0.34.5", "unocss": "66.6.7", @@ -49,7 +49,7 @@ "name": "server", "dependencies": { "@hono/valibot-validator": "0.6.1", - "hono": "4.12.10", + "hono": "catalog:", "mimetext": "3.0.28", "ts-ics": "2.4.3", "valibot": "1.3.1", @@ -59,6 +59,9 @@ }, }, }, + "catalog": { + "hono": "4.12.10", + }, "packages": { "@antfu/install-pkg": ["@antfu/install-pkg@1.1.0", "", { "dependencies": { "package-manager-detector": "^1.3.0", "tinyexec": "^1.0.1" } }, "sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ=="], diff --git a/client/package.json b/client/package.json index ef77dfc..306c124 100644 --- a/client/package.json +++ b/client/package.json @@ -22,7 +22,7 @@ "@unocss/astro": "66.6.7", "astro": "^6.1.3", "astro-llms-generate": "1.3.3", - "hono": "4.12.10", + "hono": "catalog:", "prettier-plugin-vue": "1.1.6", "sharp": "0.34.5", "unocss": "66.6.7", diff --git a/package.json b/package.json index 03e1faf..ad0a393 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,14 @@ { "name": "page", - "workspaces": [ - "client", - "worker" - ], + "workspaces": { + "packages": [ + "client", + "worker" + ], + "catalog": { + "hono": "4.12.10" + } + }, "scripts": { "build": "bunx turbo build", "dev": "bunx turbo dev", diff --git a/worker/package.json b/worker/package.json index a1d1fff..a42aee8 100644 --- a/worker/package.json +++ b/worker/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@hono/valibot-validator": "0.6.1", - "hono": "4.12.10", + "hono": "catalog:", "mimetext": "3.0.28", "ts-ics": "2.4.3", "valibot": "1.3.1" From 4ff002cea6031a99ecc8ef7dd1c6a0a2428d9b4e Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 02:56:21 +0900 Subject: [PATCH 04/12] Add CI workflow for Bun and linting --- .github/workflow/ci.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflow/ci.yml diff --git a/.github/workflow/ci.yml b/.github/workflow/ci.yml new file mode 100644 index 0000000..2fd479a --- /dev/null +++ b/.github/workflow/ci.yml @@ -0,0 +1,33 @@ +name: CI Workflow + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + ci: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Bun setup + uses: oven-sh/setup-bun@v2 + with: + bun-version: latest + + - name: Install dependencies + run: bun install + + - name: Lint code + run: bun lint + + - name: Format code + run: bun format + + - name: Build project + run: bun build \ No newline at end of file From 7d815ad6c2e8dd60110bbc25f3fb96e11527c9f6 Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 03:04:01 +0900 Subject: [PATCH 05/12] rename --- .github/{workflow => workflows}/ci.yml | 3 --- 1 file changed, 3 deletions(-) rename .github/{workflow => workflows}/ci.yml (93%) diff --git a/.github/workflow/ci.yml b/.github/workflows/ci.yml similarity index 93% rename from .github/workflow/ci.yml rename to .github/workflows/ci.yml index 2fd479a..a1dcf8a 100644 --- a/.github/workflow/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,6 @@ name: CI Workflow on: - push: - branches: - - main pull_request: branches: - main From ef636b657c1ec901c4b0d59d248e90405bc11bfd Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 03:04:56 +0900 Subject: [PATCH 06/12] Use `bun run` to execute npm scripts in CI workflow --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1dcf8a..f44d4db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,10 @@ jobs: run: bun install - name: Lint code - run: bun lint + run: bun run lint - name: Format code - run: bun format + run: bun run format - name: Build project - run: bun build \ No newline at end of file + run: bun run build \ No newline at end of file From 20436d2a6caf874c7b6589f889fc10417ea87b13 Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 03:11:52 +0900 Subject: [PATCH 07/12] nix? --- .github/workflows/ci.yml | 18 ++++++++++-------- flake.lock | 6 +++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f44d4db..9f15284 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,19 +12,21 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Bun setup - uses: oven-sh/setup-bun@v2 - with: - bun-version: latest + - name: Install Nix + run: | + curl -L https://nixos.org/nix/install | sh + . ~/.nix-profile/etc/profile.d/nix.sh - name: Install dependencies - run: bun install + run: | + nix-shell -p bun nodejs-24 + bun install - name: Lint code - run: bun run lint + run: nix-shell -p bun --run "bun run lint" - name: Format code - run: bun run format + run: nix-shell -p bun --run "bun run format" - name: Build project - run: bun run build \ No newline at end of file + run: nix-shell -p bun --run "bun run build" \ No newline at end of file diff --git a/flake.lock b/flake.lock index cea29ec..31c290e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775126147, - "narHash": "sha256-J0dZU4atgcfo4QvM9D92uQ0Oe1eLTxBVXjJzdEMQpD0=", + "lastModified": 1775403759, + "narHash": "sha256-cGyKiTspHEUx3QwAnV3RfyT+VOXhHLs+NEr17HU34Wo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8d8c1fa5b412c223ffa47410867813290cdedfef", + "rev": "5e11f7acce6c3469bef9df154d78534fa7ae8b6c", "type": "github" }, "original": { From d81fec59f1ab1d7a52e432850d86c88e2c9b7710 Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 03:14:21 +0900 Subject: [PATCH 08/12] Replace manual Nix installwith cachix action --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f15284..0187087 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,10 +12,8 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Install Nix - run: | - curl -L https://nixos.org/nix/install | sh - . ~/.nix-profile/etc/profile.d/nix.sh + - name: Install nix + uses: cachix/install-nix-action@v31 - name: Install dependencies run: | From 34fc898539b3fe8444f9a83dc6207c3ea5db81fb Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 03:15:59 +0900 Subject: [PATCH 09/12] Update ci.yml --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0187087..44e9c69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,7 @@ jobs: uses: cachix/install-nix-action@v31 - name: Install dependencies - run: | - nix-shell -p bun nodejs-24 - bun install + run: nix-shell -p bun --run "bun install" - name: Lint code run: nix-shell -p bun --run "bun run lint" From f06dca76ac25c59692e3fa68fdacbe09ae4afc58 Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 03:21:46 +0900 Subject: [PATCH 10/12] =?UTF-8?q?=E8=A9=A6=E8=A1=8C=E9=8C=AF=E8=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44e9c69..d5064eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,11 @@ jobs: uses: actions/checkout@v3 - name: Install nix - uses: cachix/install-nix-action@v31 + uses: nixbuild/nix-quick-install-action@v30 + with: + nix_conf: | + keep-env-derivations = true + keep-outputs = true - name: Install dependencies run: nix-shell -p bun --run "bun install" From 8124ce891dac46ce1f7b8719f987470168067ab8 Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 10:57:06 +0900 Subject: [PATCH 11/12] Simplify Nix flake and improve CI with caching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove flake-utils dependency, use native lib.genAttrs - Update checkout@v3→v6, nix-quick-install-action@v30→v34 - Add cache-nix-action@v7 for Nix artifact caching - Switch from nix-shell to nix develop for dev commands --- .github/workflows/ci.yml | 35 ++++++++++++++-------------- flake.lock | 34 ---------------------------- flake.nix | 49 ++++++++++++++++++++++------------------ 3 files changed, 45 insertions(+), 73 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5064eb..7ec9b28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,32 +1,33 @@ -name: CI Workflow - +name: CI on: pull_request: - branches: - - main + branches: [main] jobs: ci: + name: CI runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Install nix - uses: nixbuild/nix-quick-install-action@v30 + - uses: actions/checkout@v6 + - uses: nixbuild/nix-quick-install-action@v34 + - uses: nix-community/cache-nix-action@v7 with: - nix_conf: | - keep-env-derivations = true - keep-outputs = true - + primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/flake.lock') }} + restore-prefixes-first-match: nix-${{ runner.os }}- + gc-max-store-size-linux: 1G + purge: true + purge-prefixes: nix-${{ runner.os }}- + purge-created: 0 + purge-last-accessed: P1DT12H + purge-primary-key: never - name: Install dependencies - run: nix-shell -p bun --run "bun install" + run: nix develop -c bun install - name: Lint code - run: nix-shell -p bun --run "bun run lint" + run: nix develop -c bun run lint - name: Format code - run: nix-shell -p bun --run "bun run format" + run: nix develop -c bun run format - name: Build project - run: nix-shell -p bun --run "bun run build" \ No newline at end of file + run: nix develop -c bun run build diff --git a/flake.lock b/flake.lock index 31c290e..9fbd13c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1775403759, @@ -36,24 +18,8 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6e0b9c8..3995ae0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,26 +1,31 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { - nixpkgs, - flake-utils, - ... - }: - flake-utils.lib.eachDefaultSystem ( - system: let - pkgs = import nixpkgs {inherit system;}; - in { - devShell = pkgs.mkShell { - buildInputs = with pkgs; [ - bun - nodejs-slim_24 - ]; - shellWrapper = pkgs.writeShellScript "dev-shell" '' - exec ${pkgs.zsh}/bin/zsh \"$@\" - ''; - }; - } - ); -} \ No newline at end of file + outputs = {nixpkgs, ...}: let + systems = ["x86_64-linux" "aarch64-darwin"]; + forAllSystems = nixpkgs.lib.genAttrs systems; + + deps = pkgs: + with pkgs; [ + nodejs-slim_24 + ]; + + devDeps = pkgs: + with pkgs; [ + bun + ]; + in { + devShells = forAllSystems (system: let + pkgs = import nixpkgs {inherit system;}; + in { + default = pkgs.mkShell { + buildInputs = (deps pkgs) ++ (devDeps pkgs); + + shellHook = '' + export NODE_ENV=development + ''; + }; + }); + }; +} From ce50a04543a2778befd397b2da6b90e11244ccd2 Mon Sep 17 00:00:00 2001 From: HAL <68320771+HALQME@users.noreply.github.com> Date: Tue, 7 Apr 2026 11:16:08 +0900 Subject: [PATCH 12/12] Fix Frame component import path case --- client/src/pages/access.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/pages/access.mdx b/client/src/pages/access.mdx index 0bfd558..b700db5 100644 --- a/client/src/pages/access.mdx +++ b/client/src/pages/access.mdx @@ -4,7 +4,7 @@ title: 稽古場所 description: 大阪公立大学合氣道部の活動場所について --- -import Frame from "../components/frame.astro"; +import Frame from "../components/Frame.astro"; import { Image } from "astro:assets"; import multi_use_room from "../assets/CCCB5965-798F-4403-A4D9-60C3B3EA05A9.png";