From 88f4868a29e00c1a49a21b431189485b75332438 Mon Sep 17 00:00:00 2001 From: wappon28dev Date: Mon, 23 Sep 2024 05:53:02 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=81=AE=E3=82=B9=E3=82=AF=E3=83=AA=E3=83=97=E3=83=88=E3=82=92?= =?UTF-8?q?=E3=81=A1=E3=82=87=E3=81=A3=E3=81=A8=E6=94=B9=E8=89=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cspell.json | 1 + .github/workflows/build.yml | 11 ++++++----- .prettierignore | 1 + package.json | 4 ++-- src/components/sva/dialog.ts | 2 +- src/lib/classes/user.ts | 4 ++-- src/routes/demo/index.tsx | 1 + 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.cspell.json b/.cspell.json index d4b7098..7407525 100644 --- a/.cspell.json +++ b/.cspell.json @@ -3,6 +3,7 @@ "version": "0.2", "ignorePaths": [ "node_modules", + "src/types/supabase.gen.ts", "/package.json" ], "words": [ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 770d004..563ccc2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,23 +22,24 @@ jobs: - name: 🔨 Prepare Node environment uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 22 - name: 🔨 Prepare Bun environment uses: oven-sh/setup-bun@v2 with: bun-version: latest - - run: curl -sfS https://dotenvx.sh/install.sh | sh - - name: 🎉 Install project dependencies run: bun i - - name: 🏗️ Build app - run: bun run build + - name: 🔏 Decrypt .envs + run: bun dotenvx decrypt -f .env -f .env.production env: DOTENV_PRIVATE_KEY: ${{ secrets.DOTENV_PRIVATE_KEY }} DOTENV_PRIVATE_KEY_PRODUCTION: ${{ secrets.DOTENV_PRIVATE_KEY_PRODUCTION }} + - name: 🏗️ Build app + run: bun run build + - name: 🚀 Deploy to Cloudflare Pages id: cloudflare_pages_deploy uses: cloudflare/wrangler-action@2.0.0 diff --git a/.prettierignore b/.prettierignore index 14784e1..bb412fe 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,2 @@ src/assets/animations/* +functions/tsconfig.json diff --git a/package.json b/package.json index 38f7420..d3ad560 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "prepare": "panda codegen", "dev": "dotenvx run -- bun vite", "dev:workers": "dotenvx run -- wrangler pages dev --ip 127.0.0.1 --port 5173 -- bun run dev", - "build": "dotenvx run -f .env -f .env.production --overload -- bun tsr generate && bun tsc -b && vite build && bunx cpx wrangler.toml dist/ && bunx cpx \"functions/**\" dist/functions", + "build": "dotenvx run -f .env -f .env.production --overload -- bun run test && vite build && bunx cpx wrangler.toml dist/ && bunx cpx \"functions/**\" dist/functions", "preview": "vite preview", - "test": "tsc && bun typo && prettier --check ./src/ ./functions/ --check && eslint --ext .ts,.tsx ./src ./functions/ ", + "test": "bun tsr generate && bun tsc -b && bun typo && prettier --check ./src/ ./functions/ --check && eslint --ext .ts,.tsx ./src ./functions/ ", "fmt": "prettier --write ./src/", "lint": "eslint --ext .ts,.tsx ./src", "typo": "cspell \"./src/**\" \"./functions/**\" --gitignore", diff --git a/src/components/sva/dialog.ts b/src/components/sva/dialog.ts index a64c826..00b6765 100644 --- a/src/components/sva/dialog.ts +++ b/src/components/sva/dialog.ts @@ -44,7 +44,7 @@ export const svaDialog = sva({ }, backdrop: { animation: "fadeIn 0.3s", - backgroundColor: "rgba(0, 0, 0, 0.5)", + backgroundColor: "wkb-neutral.0/20", position: "fixed", top: 0, left: 0, diff --git a/src/lib/classes/user.ts b/src/lib/classes/user.ts index 93616c6..e65df06 100644 --- a/src/lib/classes/user.ts +++ b/src/lib/classes/user.ts @@ -6,11 +6,11 @@ import { notifyErrorInToast, toaster } from "@/lib/utils/toast"; import { type UserMetadata } from "@/types/auth"; export class User { - constructor(public session: Session) {} - public metadata = this.session.user.user_metadata as UserMetadata; public id = this.session.user.id; + constructor(public session: Session) {} + static async signIn(): Promise { match( await supabase.auth.signInWithOAuth({ diff --git a/src/routes/demo/index.tsx b/src/routes/demo/index.tsx index d068c62..80de451 100644 --- a/src/routes/demo/index.tsx +++ b/src/routes/demo/index.tsx @@ -13,6 +13,7 @@ export const Route = createFileRoute("/demo/")({ useEffect(() => { void fetchAddressFromLocation({ lat: 35.681236, lon: 139.767125 }).then( (res) => { + // eslint-disable-next-line no-console console.log(res); }, );