Skip to content

Commit 8be4f2b

Browse files
yn1323yn1323
authored
Next.js → Vite (#35)
* wip: next to vite * tmp * temp: storybook setup * fix: add tanstack router mock * file moves * fix: test execute works * fix: zod migration * fix: pass tests * fix: local auth & db * fix: e2e * fix: type * fix: lint * fix: ci * fix: lint * fix: add convex url * fix * fix * fix: test * fix * fix * fix * fix: playwright * fix: chromatic ci * fix: e2e
1 parent 26d749a commit 8be4f2b

124 files changed

Lines changed: 3531 additions & 17953 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.claude/settings.local.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"playwright",
4141
"serena"
4242
],
43-
"outputStyle": "default"
43+
"outputStyle": "default",
44+
"enableAllProjectMcpServers": true
4445
}

‎.cta.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"projectName": "yps-crispy-carnival",
3+
"mode": "file-router",
4+
"typescript": true,
5+
"tailwind": false,
6+
"packageManager": "pnpm",
7+
"git": true,
8+
"version": 1,
9+
"framework": "react-cra",
10+
"chosenAddOns": ["biome"]
11+
}

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
build:
88
runs-on: ubuntu-latest
9+
environment: Preview
910
steps:
1011
- uses: actions/checkout@v5
1112
with:
@@ -20,6 +21,6 @@ jobs:
2021
kill %1
2122
env:
2223
CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
23-
NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: ${{ secrets.CLERK_PUBLISHABLE_KEY }}
24-
NEXT_PUBLIC_CONVEX_URL: ${{ secrets.NEXT_PUBLIC_CONVEX_URL }}
25-
CONVEX_DEPLOYMENT: ${{ secrets.CONVEX_DEPLOYMENT }}
24+
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
25+
CONVEX_DEPLOY_KEY: ${{ secrets.CONVEX_DEPLOY_KEY }}
26+

‎.github/workflows/chromatic_merged.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,23 @@ on:
99
jobs:
1010
chromatic_on_merge_to_develop:
1111
runs-on: ubuntu-latest
12+
environment: Preview
1213
steps:
1314
- uses: actions/checkout@v5
1415
with:
1516
fetch-depth: 0
1617
- name: Setup
1718
uses: ./.github/actions/setup
1819
- name: Storybook Build
19-
run: pnpm build-storybook
20+
run: |
21+
npx convex dev &
22+
sleep 15
23+
pnpm storybook:build
24+
kill %1
2025
env:
21-
NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: ${{ secrets.CLERK_PUBLISHABLE_KEY }}
22-
NEXT_PUBLIC_CONVEX_URL: ${{ secrets.NEXT_PUBLIC_CONVEX_URL }}
23-
CONVEX_DEPLOYMENT: ${{ secrets.CONVEX_DEPLOYMENT }}
26+
CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
27+
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
28+
CONVEX_DEPLOY_KEY: ${{ secrets.CONVEX_DEPLOY_KEY }}
2429
- name: Publish to Chromatic
2530
uses: chromaui/action@latest
2631
with:

‎.github/workflows/chromatic_pr_on_push.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ jobs:
66
chromatic_pr_on_push:
77
if: (github.event.pull_request.draft == false && !contains(github.head_ref, 'renovate/') && github.base_ref != 'main')
88
runs-on: ubuntu-latest
9+
environment: Preview
910
steps:
1011
- uses: actions/checkout@v4
1112
with:
@@ -15,13 +16,12 @@ jobs:
1516
- name: Storybook Build
1617
run: |
1718
npx convex dev &
18-
sleep 5
19-
pnpm build-storybook
19+
sleep 15
20+
pnpm storybook:build
2021
kill %1
2122
env:
22-
NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: ${{ secrets.CLERK_PUBLISHABLE_KEY }}
23-
NEXT_PUBLIC_CONVEX_URL: ${{ secrets.NEXT_PUBLIC_CONVEX_URL }}
24-
CONVEX_DEPLOYMENT: ${{ secrets.CONVEX_DEPLOYMENT }}
23+
CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
24+
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
2525
CONVEX_DEPLOY_KEY: ${{ secrets.CONVEX_DEPLOY_KEY }}
2626
- name: Publish to Chromatic
2727
uses: chromaui/action@latest

.github/workflows/chromatic_pr_on_ready copy.yml renamed to .github/workflows/chromatic_pr_on_ready.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,23 @@ jobs:
88
chromatic_pr_on_ready:
99
if: (github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name , 'renovate'))
1010
runs-on: ubuntu-latest
11+
environment: Preview
1112
steps:
1213
- uses: actions/checkout@v5
1314
with:
1415
fetch-depth: 0
1516
- name: Setup
1617
uses: ./.github/actions/setup
1718
- name: Storybook Build
18-
run: pnpm build-storybook
19+
run: |
20+
npx convex dev &
21+
sleep 15
22+
pnpm storybook:build
23+
kill %1
1924
env:
20-
NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: ${{ secrets.CLERK_PUBLISHABLE_KEY }}
21-
NEXT_PUBLIC_CONVEX_URL: ${{ secrets.NEXT_PUBLIC_CONVEX_URL }}
22-
CONVEX_DEPLOYMENT: ${{ secrets.CONVEX_DEPLOYMENT }}
25+
CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
26+
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
27+
CONVEX_DEPLOY_KEY: ${{ secrets.CONVEX_DEPLOY_KEY }}
2328
- name: Publish to Chromatic
2429
uses: chromaui/action@latest
2530
with:

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
lint:
88
runs-on: ubuntu-latest
9+
environment: Preview
910
steps:
1011
- uses: actions/checkout@v5
1112
with:

‎.github/workflows/playwright.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ jobs:
88
test:
99
timeout-minutes: 60
1010
runs-on: ubuntu-latest
11+
environment: Preview
1112
concurrency:
1213
group: "playwright-convex"
1314
cancel-in-progress: false
@@ -20,21 +21,19 @@ jobs:
2021
- name: Reset Database
2122
run: pnpm convex:import
2223
env:
23-
CONVEX_DEPLOYMENT: ${{ secrets.CONVEX_DEPLOYMENT }}
2424
CONVEX_DEPLOY_KEY: ${{ secrets.CONVEX_DEPLOY_KEY }}
2525
- name: Run Playwright tests
2626
run: |
2727
npx convex dev &
28-
sleep 5
28+
# Convexの起動と環境変数のセットを待つ
29+
sleep 15
2930
pnpm e2e
31+
kill %1
3032
env:
31-
NEXT_CLERK_PUBLISHABLE_KEY: ${{ secrets.CLERK_PUBLISHABLE_KEY }}
32-
CLERK_PUBLISHABLE_KEY: ${{ secrets.CLERK_PUBLISHABLE_KEY }}
33+
E2E_CLERK_USER: ${{ vars.E2E_CLERK_USER }}
34+
E2E_CLERK_PASSWORD: ${{ vars.E2E_CLERK_PASSWORD }}
3335
CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
34-
E2E_CLERK_USER: ${{ secrets.E2E_CLERK_USER }}
35-
E2E_CLERK_PASSWORD: ${{ secrets.E2E_CLERK_PASSWORD }}
36-
NEXT_PUBLIC_CONVEX_URL: ${{ secrets.CONVEX_REMOTE_URL }}
37-
CONVEX_DEPLOYMENT: ${{ secrets.CONVEX_DEPLOYMENT }}
36+
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
3837
CONVEX_DEPLOY_KEY: ${{ secrets.CONVEX_DEPLOY_KEY }}
3938
- uses: actions/upload-artifact@v4
4039
if: ${{ !cancelled() }}

‎.github/workflows/test-logic.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
unit-test:
88
runs-on: ubuntu-latest
9+
environment: Preview
910
strategy:
1011

1112
fail-fast: false
@@ -20,14 +21,4 @@ jobs:
2021
- name: Setup Playwright
2122
uses: ./.github/actions/playwright
2223
- name: Run Test
23-
run: |
24-
npx convex dev &
25-
sleep 5
26-
pnpm vitest run --shard=${{ matrix.shard }} --project=logic
27-
kill %1
28-
env:
29-
CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
30-
CLERK_PUBLISHABLE_KEY : ${{ secrets.CLERK_PUBLISHABLE_KEY }}
31-
CONVEX_DEPLOY_KEY: ${{ secrets.CONVEX_DEPLOY_KEY }}
32-
CONVEX_DEPLOYMENT: ${{ secrets.CONVEX_DEPLOYMENT }}
33-
NEXT_PUBLIC_CONVEX_URL: ${{ secrets.NEXT_PUBLIC_CONVEX_URL }}
24+
run: pnpm vitest run --shard=${{ matrix.shard }} --project=logic

‎.github/workflows/test-ui.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
unit-test:
88
runs-on: ubuntu-latest
9+
environment: Preview
910
strategy:
1011
fail-fast: false
1112
matrix:
@@ -20,13 +21,12 @@ jobs:
2021
uses: ./.github/actions/playwright
2122
- name: Run Test
2223
run: |
23-
npx convex dev &
24-
sleep 5
24+
npx convex dev &
25+
# Convexの起動と環境変数のセットを待つ
26+
sleep 15
2527
pnpm vitest run --shard=${{ matrix.shard }} --project=ui
2628
kill %1
2729
env:
28-
CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
29-
CLERK_PUBLISHABLE_KEY : ${{ secrets.CLERK_PUBLISHABLE_KEY }}
30-
CONVEX_DEPLOY_KEY: ${{ secrets.CONVEX_DEPLOY_KEY }}
31-
CONVEX_DEPLOYMENT: ${{ secrets.CONVEX_DEPLOYMENT }}
32-
NEXT_PUBLIC_CONVEX_URL: ${{ secrets.NEXT_PUBLIC_CONVEX_URL }}
30+
CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
31+
VITE_CLERK_PUBLISHABLE_KEY: ${{ secrets.VITE_CLERK_PUBLISHABLE_KEY }}
32+
CONVEX_DEPLOY_KEY: ${{ secrets.CONVEX_DEPLOY_KEY }}

0 commit comments

Comments
 (0)
⚡