Fix v2 release error

.cspell.json

@@ -4,18 +4,28 @@
   "words": [
     "autoincrement",
     "bunx",
+    "chrono",
     "coursemate",
+    "daisyui",
     "datasource",
     "direnv",
     "ECCS",
     "isready",
     "lockb",
+    "mytheme",
     "notistack",
     "psql",
     "qiita",
+    "reqwest",
     "safify",
     "supabase",
-    "swiper"
+    "swiper",
+    "lefthook",
+    "stdenv",
+    "rustc",
+    "pkgs",
+    "nixpkgs",
+    "libquery"
   ],
   "dictionaries": [
     "softwareTerms",
@@ -31,6 +41,7 @@
   ],
   "ignorePaths": [
     "flake.*",
+    "nix/*",
     "**/.git/**",
     "**/node_modules/**",
     "server/target/**",
@@ -39,6 +50,11 @@
     "**/bun.lockb",
     "**/*.svg",
     "**/migration.sql",
-    "**/data.json"
+    "**/data.json",
+    "**/Cargo.*",
+    "scraper/target",
+    "**/rust-toolchain.toml",
+    "web/out",
+    "**/tsconfig.tsbuildinfo"
   ]
 }

.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+.env*

.env.sample

@@ -0,0 +1 @@
+SQL_GENERATE_URL=postgres://sql-url

.envrc

@@ -1,3 +1,4 @@
+watch_file ./server/prisma.nix
 # I recommend using nix-direnv: https://github.com/nix-community/nix-direnv
 if command -v nix;
 then

.github/pull_request_template.md

@@ -1,21 +1,12 @@
-<!--変更したい場合は、`/.github/pull_request_template.md` を修正して下さい。-->
 # PRの概要
 
-<!-- 変更の目的 もしくは 関連する Issue 番号 -->
-<!-- 以下のように書くと Issue にリンクでき、マージ時に自動で Issue を閉じられる-->
-<!-- closes #001 -->
-
 ## 具体的な変更内容
-<!-- ビューの変更がある場合はスクショによる比較などがあるとわかりやすい -->
 
 ## 影響範囲
-<!-- この関数を変更したのでこの機能にも影響がある、など -->
 
 ## 動作要件
-<!-- 動作に必要な 環境変数 / 依存関係 / DBの更新 など -->
 
 ## 補足
-<!-- レビューをする際に見てほしい点、ローカル環境で試す際の注意点、など -->
 
 ## レビューリクエストを出す前にチェック！
 

.github/workflows/ci.yml

@@ -7,17 +7,39 @@ on:
 
 env:
   DATABASE_URL: ${{ secrets.DATABASE_URL_FOR_PRISMA_SQL_GENERATION }}
+  DIRECT_URL: ${{ secrets.DATABASE_URL_FOR_PRISMA_SQL_GENERATION }}
+  NEXT_PUBLIC_API_ENDPOINT: "sample"
+  NEXT_PUBLIC_FIREBASE_API_KEY: "sample"
+  NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN: "sample"
+  NEXT_PUBLIC_FIREBASE_PROJECT_ID: "sample"
+  NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET: "sample"
+  NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID: "sample"
+  NEXT_PUBLIC_FIREBASE_APP_ID: "sample"
+  NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID: "sample"
 jobs:
+  sync-db:
+    runs-on: ubuntu-latest
+    name: Build
+    steps:
+      - uses: actions/checkout@v4
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+      - run: bun i --frozen-lockfile
+      - run: bunx prisma db push
+        working-directory: server
+
   build:
     name: Build
     runs-on: ubuntu-latest
+    needs: [sync-db]
     steps:
       - uses: actions/checkout@v4
       - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
-      - run: make setup-ci
-      - run: make build
+      - run: bun install --frozen-lockfile
+      - run: bun run build
 
   biome:
     name: Code style check via Biome
@@ -31,8 +53,8 @@ jobs:
         with:
           version: latest
 
-      - run: make setup
-      - run: biome check
+      - run: bun install --frozen-lockfile
+      - run: bun style:check
 
   type-check:
     name: Type Check
@@ -42,12 +64,8 @@ jobs:
       - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
-      - run: make setup-ci
-
-      - run: bunx tsc --noEmit
-        working-directory: web
-      - run: bunx tsc --noEmit
-        working-directory: server
+      - run: bun install --frozen-lockfile
+      - run: bun type
 
   spell-check:
     name: Spell Check
@@ -58,33 +76,24 @@ jobs:
         with:
           bun-version: latest
 
-      - run: make setup-ci
-      - run: make spell-check
+      - run: bun install --frozen-lockfile
+      - run: bun spell .
 
   test:
     name: Bun Test
     runs-on: ubuntu-latest
+    needs: [sync-db]
     steps:
       - uses: actions/checkout@v4
       - uses: oven-sh/setup-bun@v2
-      - run: make setup-ci
-      - run: make test
+      - run: bun install --frozen-lockfile
+      - run: bun run test
 
   deploy-test-web:
     name: Deploy Test (web)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
-      - uses: oven-sh/setup-bun@v2
-      - run: make prepare-deploy-web
-      - run: test `ls web/dist | wc -l` != 0
-
-  deploy-test-server:
-    name: Deploy Test (server)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
       - uses: oven-sh/setup-bun@v2
-      - run: make prepare-deploy-server
+      - run: bun prepare:deploy:web
+      - run: test `ls web/.next | wc -l` != 0

.github/workflows/deploy.yml

@@ -0,0 +1,17 @@
+name: Deploy
+on:
+  push:
+    branches:
+      - release
+
+jobs:
+  deploy:
+    name: Deploy Server to Fly.io
+    runs-on: ubuntu-latest
+    env:
+      SQL_GENERATE_URL: ${{ secrets.DATABASE_URL_FOR_PRISMA_SQL_GENERATION }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - run: flyctl deploy --build-arg SQL_GENERATE_URL=$SQL_GENERATE_URL --access-token "${{ secrets.FLY_DEPLOY_TOKEN }}"

.github/workflows/keep-alive.yml

@@ -2,7 +2,7 @@ name: Keep Alive
 
 on:
   schedule:
-    - cron: "*/5 * * * *"
+    - cron: "*/2 * * * *"
   workflow_dispatch:
 
 env:

.github/workflows/rust.yml

@@ -0,0 +1,37 @@
+name: Rust
+on: 
+  pull_request:
+    paths:
+      - scraper/**
+  push:
+    branches: [main]
+    paths:
+      - scraper/**
+
+jobs:
+  all:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    env:
+      RUSTFLAGS: -D warnings
+    defaults:
+      run: 
+        working-directory: scraper
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/
+            ~/.rustup/
+            scraper/target
+          key: cargo-cache-${{ github.job }}-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
+      - uses: dtolnay/rust-toolchain@v1
+        with:
+          toolchain: 1.82.0
+          components: clippy,rustfmt
+      - run: cargo build
+      - run: cargo build --release
+      - run: cargo test
+      - run: cargo clippy
+      - run: cargo fmt --check

.gitignore

@@ -1,3 +1,8 @@
+/node_modules
+.env
+/.direnv
+/.husky
+
 # Logs
 logs
 *.log
@@ -7,11 +12,6 @@ yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
 
-node_modules
-dist
-dist-ssr
-*.local
-
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json
@@ -23,5 +23,4 @@ dist-ssr
 *.sln
 *.sw?
 
-.env
-/.direnv
+tsconfig.tsbuildinfo

Dockerfile

@@ -0,0 +1,33 @@
+# syntax = docker/dockerfile:1
+
+ARG BUN_VERSION=1.2.2
+FROM oven/bun:${BUN_VERSION} AS base
+LABEL fly_launch_runtime="Bun/Prisma"
+ENV NODE_ENV="production"
+
+# Throw-away build stage to reduce size of final image
+FROM base AS build
+
+WORKDIR /build
+ARG SQL_GENERATE_URL
+RUN test -n "${SQL_GENERATE_URL}"
+ENV DATABASE_URL=$SQL_GENERATE_URL
+ENV DIRECT_URL=$SQL_GENERATE_URL
+COPY . .
+RUN --mount=type=cache,target=~/.bun/install bun install --frozen-lockfile --ignore-scripts
+RUN cd server; bun prisma generate --sql
+RUN cd server; bun run :build
+
+
+# Final stage for app image
+FROM base AS runner
+WORKDIR /srv
+
+# Copy built application
+COPY --from=build /build/server/target/index.js /srv/index.js
+COPY --from=build /build/node_modules/.prisma/client /node_modules/.prisma/client
+COPY --from=build /build/node_modules/@img /node_modules/@img
+
+# Start the server by default, this can be overwritten at runtime
+EXPOSE 3000
+CMD [ "bun", "run", "./index.js" ]