chore: 更新

.github/workflows/ci.yml

@@ -3,52 +3,31 @@ name: CI
 on:
   push:
     branches:
-      - "**"
-    tags-ignore:
-      - "**"
+      - master
   pull_request:
 
 jobs:
-  lint:
+  ci:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: "yarn"
-      - name: Install
-        run: |
-          yarn
-      - name: Lint
-        run: |
-          yarn lint:prettier
-          yarn lint:eslint
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.x]
-
-    needs: lint
-
-    steps:
-      - uses: actions/checkout@v3
+          version: 10
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          cache: "yarn"
+          cache: "pnpm"
       - name: Install
         run: |
-          yarn
+          pnpm i
+      - name: Lint
+        run: pnpm check
       - name: Build
-        run: |
-          yarn build
+        run: pnpm build

anilist-codegen.yml

@@ -1,10 +1,8 @@
 schema: ./anilist-schema.json
 documents: ./gql-documents/anilist/*.gql
 generates:
-  ./src/aniListGql.ts:
+  ./src/generated/aniListGql.ts:
     plugins:
-      - add:
-          content: "/* eslint-disable */"
       - typescript
       - typescript-operations
       - typescript-graphql-request

annict-codegen.yml

@@ -1,12 +1,10 @@
 schema: ./annict-schema.gql
 documents: ./gql-documents/annict/*.gql
 config:
-  namingConvention: ./annictGqlNaming.js
+  namingConvention: ./annictGqlNaming.ts
 generates:
-  ./src/annictGql.ts:
+  ./src/generated/annictGql.ts:
     plugins:
-      - add:
-          content: "/* eslint-disable */"
       - typescript
       - typescript-operations
       - typescript-graphql-request

biome.json

@@ -0,0 +1,54 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.1.2/schema.json",
+  "vcs": { "enabled": false, "clientKind": "git", "useIgnoreFile": false },
+  "files": {
+    "ignoreUnknown": false,
+    "includes": [
+      "src/**/*",
+      "!src/generated/**/*",
+      "anilist*",
+      "annict*",
+      "*.json",
+      ".github/**/*",
+      "gql-documents/**/*",
+      "netlify/**/*",
+      "*.ts"
+    ]
+  },
+  "formatter": {
+    "enabled": true,
+    "formatWithErrors": false,
+    "indentStyle": "space",
+    "indentWidth": 2,
+    "lineEnding": "lf",
+    "lineWidth": 80,
+    "attributePosition": "auto",
+    "bracketSameLine": false,
+    "bracketSpacing": true,
+    "expand": "auto",
+    "useEditorconfig": true
+  },
+  "linter": {
+    "enabled": true,
+    "rules": { "recommended": true },
+    "domains": { "react": "recommended" }
+  },
+  "javascript": {
+    "formatter": {
+      "jsxQuoteStyle": "double",
+      "quoteProperties": "asNeeded",
+      "trailingCommas": "es5",
+      "semicolons": "asNeeded",
+      "arrowParentheses": "always",
+      "bracketSameLine": false,
+      "quoteStyle": "double",
+      "attributePosition": "auto",
+      "bracketSpacing": true
+    }
+  },
+  "html": { "formatter": { "selfCloseVoidElements": "always" } },
+  "assist": {
+    "enabled": true,
+    "actions": { "source": { "organizeImports": "on" } }
+  }
+}

gql-documents/anilist/lib.gql

@@ -1,5 +1,19 @@
-query queryLibrary($userId: Int!, $sort: [MediaListSort!]!, $perChunk: Int!, $chunk: Int!, $status: MediaListStatus!) {
-  MediaListCollection(userId: $userId, sort: $sort, perChunk: $perChunk, chunk: $chunk, type: ANIME, forceSingleCompletedList: true, status: $status) {
+query queryLibrary(
+  $userId: Int!
+  $sort: [MediaListSort!]!
+  $perChunk: Int!
+  $chunk: Int!
+  $status: MediaListStatus!
+) {
+  MediaListCollection(
+    userId: $userId
+    sort: $sort
+    perChunk: $perChunk
+    chunk: $chunk
+    type: ANIME
+    forceSingleCompletedList: true
+    status: $status
+  ) {
     lists {
       entries {
         id

gql-documents/anilist/me.gql

@@ -1,9 +1,9 @@
 query getMe {
-    Viewer {
-        id
-        name
-        avatar {
-            large
-        }
+  Viewer {
+    id
+    name
+    avatar {
+      large
     }
+  }
 }

gql-documents/anilist/update.gql

@@ -1,17 +1,33 @@
-mutation createMediaStatus($id: Int!, $status: MediaListStatus!, $numWatchedEpisodes: Int!) {
-    SaveMediaListEntry(mediaId: $id, status: $status, progress: $numWatchedEpisodes) {
-        id
-    }
+mutation createMediaStatus(
+  $id: Int!
+  $status: MediaListStatus!
+  $numWatchedEpisodes: Int!
+) {
+  SaveMediaListEntry(
+    mediaId: $id
+    status: $status
+    progress: $numWatchedEpisodes
+  ) {
+    id
+  }
 }
 
-mutation updateMediaStatus($id: Int!, $status: MediaListStatus!, $numWatchedEpisodes: Int!) {
-    UpdateMediaListEntries(ids: [$id], status: $status, progress: $numWatchedEpisodes) {
-        id
-    }
+mutation updateMediaStatus(
+  $id: Int!
+  $status: MediaListStatus!
+  $numWatchedEpisodes: Int!
+) {
+  UpdateMediaListEntries(
+    ids: [$id]
+    status: $status
+    progress: $numWatchedEpisodes
+  ) {
+    id
+  }
 }
 
 mutation deleteMediaStatus($id: Int!) {
-    DeleteMediaListEntry(id: $id) {
-        deleted
-    }
+  DeleteMediaListEntry(id: $id) {
+    deleted
+  }
 }

netlify/functions/anilist-callback.ts

@@ -1,16 +1,24 @@
-import { Handler } from "@netlify/functions"
+import type { Handler, HandlerResponse } from "@netlify/functions"
 import axios from "axios"
 import cookie from "cookie"
 
-const handler: Handler = async (event) => {
+const clientId = process.env.VITE_ANILIST_CLIENT_ID
+const clientSecret = process.env.ANILIST_CLIENT_SECRET
+const deployUrl = process.env.DEPLOY_PRIME_URL
+if (!clientId || !clientSecret || !deployUrl) {
+  throw new Error("Missing environment variables")
+}
+const redirectUrl = `${deployUrl}/.netlify/functions/anilist-callback`
+
+const handler: Handler = async (event): Promise<HandlerResponse> => {
+  if (!event.queryStringParameters) {
+    return { statusCode: 400 }
+  }
   const { code, state, error } = event.queryStringParameters
   if (typeof error === "string") {
     return {
       statusCode: 403,
       body: "access denied.",
-      headers: {
-        Location: "/",
-      },
     }
   }
   if (typeof code !== "string" || typeof state !== "string") {
@@ -32,9 +40,9 @@ const handler: Handler = async (event) => {
     new URLSearchParams({
       grant_type: "authorization_code",
       code,
-      client_id: process.env.VITE_ANILIST_CLIENT_ID,
-      client_secret: process.env.ANILIST_CLIENT_SECRET,
-      redirect_uri: process.env.VITE_ANILIST_REDIRECT_URL,
+      client_id: clientId,
+      client_secret: clientSecret,
+      redirect_uri: redirectUrl,
       code_verifier: challange,
     }),
     {
@@ -46,15 +54,14 @@ const handler: Handler = async (event) => {
   if (typeof result.data.access_token !== "string") {
     return {
       statusCode: 400,
-      body: "try again",
     }
   }
   return {
     statusCode: 200,
     headers: {
       "Content-Type": "text/html",
     },
-    body: `<script>localStorage.setItem("ANILIST_ACCESS_TOKEN", ${JSON.stringify(result.data.access_token)});history.replaceState({}, document.title, "/");location.reload()</script>`
+    body: `<script>localStorage.setItem("ANILIST_ACCESS_TOKEN", ${JSON.stringify(result.data.access_token)});history.replaceState({}, document.title, "/");location.reload()</script>`,
   }
 }
 

netlify/functions/annict-callback.ts

@@ -1,15 +1,23 @@
-import { Handler } from "@netlify/functions"
+import type { Handler, HandlerResponse } from "@netlify/functions"
 import axios from "axios"
 
-const handler: Handler = async (event) => {
+const clientId = process.env.VITE_ANNICT_CLIENT_ID
+const clientSecret = process.env.ANNICT_CLIENT_SECRET
+const deployUrl = process.env.DEPLOY_PRIME_URL
+if (!clientId || !clientSecret || !deployUrl) {
+  throw new Error("Missing environment variables")
+}
+const redirectUrl = `${deployUrl}/.netlify/functions/annict-callback`
+
+const handler: Handler = async (event): Promise<HandlerResponse> => {
+  if (!event.queryStringParameters) {
+    return { statusCode: 400 }
+  }
   const { code, error } = event.queryStringParameters
   if (typeof error === "string") {
     return {
       statusCode: 403,
       body: "access denied.",
-      headers: {
-        Location: "/",
-      },
     }
   }
   if (typeof code !== "string") {
@@ -23,9 +31,9 @@ const handler: Handler = async (event) => {
     {
       grant_type: "authorization_code",
       code,
-      client_id: process.env.VITE_ANNICT_CLIENT_ID,
-      client_secret: process.env.ANNICT_CLIENT_SECRET,
-      redirect_uri: process.env.VITE_ANNICT_REDIRECT_URL,
+      client_id: clientId,
+      client_secret: clientSecret,
+      redirect_uri: redirectUrl,
     },
     {
       headers: {
@@ -44,7 +52,7 @@ const handler: Handler = async (event) => {
     headers: {
       "Content-Type": "text/html",
     },
-    body: `<script>localStorage.setItem("ANNICT_ACCESS_TOKEN", ${JSON.stringify(result.data.access_token)});history.replaceState({}, document.title, "/");location.reload()</script>`
+    body: `<script>localStorage.setItem("ANNICT_ACCESS_TOKEN", ${JSON.stringify(result.data.access_token)});history.replaceState({}, document.title, "/");location.reload()</script>`,
   }
 }