Commit 18c8169
committed
chore: merge main into Next.js 16 upgrade branch
Resolves conflicts between this branch and main's parallel work:
- #67 (chore: remove lootbox feature)
- #69 (test: add Vitest + unit tests for proposal encoding, funding totals,
middleware) plus the CI workflow that runs `pnpm lint` + `pnpm test`
Key merge decisions:
- Rename `src/middleware.test.ts` → `src/proxy.test.ts` and update its
`import` / symbols / describe label to `proxy`, matching this branch's
`middleware.ts` → `proxy.ts` rename for the Next.js 16 file convention.
- Regenerated `pnpm-lock.yaml` from the merged `package.json` so both
Next.js 16 / React 19.2.5 and the new `vitest` + `@vitest/coverage-v8`
devDeps resolve.
- Accept Next.js 16's tsconfig auto-update: add `.next/dev/types/**/*.ts`
to include, switch `jsx` to `react-jsx`. `pnpm exec tsc --noEmit`
passes; `tsc` doesn't emit so the jsx change is non-functional here.
- CLAUDE.md: refresh the `md/` comment to reference `proxy.ts` instead
of middleware.
Validation:
- `pnpm lint` → 0 errors, 137 warnings (pre-existing react-compiler warnings)
- `pnpm exec tsc --noEmit` → clean
- `pnpm test` → 37 pass, 1 todo (includes the renamed proxy tests)
- `pnpm dev` → Ready in 903ms; `curl -H "Accept: text/markdown" /` → 200
https://claude.ai/code/session_01QVjceB1PFubwe6TCpRq3xx28 files changed
Lines changed: 1532 additions & 5591 deletions
File tree
- .github/workflows
- public
- src
- app
- lootbox
- sitemap.xml
- components
- layout
- lootbox
- hooks
- lib
- lootbox
- utils/abis
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
| 46 | + | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | 73 | | |
81 | 74 | | |
82 | 75 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
12 | 15 | | |
13 | 16 | | |
14 | 17 | | |
| |||
100 | 103 | | |
101 | 104 | | |
102 | 105 | | |
| 106 | + | |
103 | 107 | | |
104 | 108 | | |
105 | 109 | | |
| |||
108 | 112 | | |
109 | 113 | | |
110 | 114 | | |
111 | | - | |
| 115 | + | |
| 116 | + | |
112 | 117 | | |
113 | 118 | | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
235 | 235 | | |
236 | 236 | | |
237 | 237 | | |
238 | | - | |
239 | | - | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | 238 | | |
245 | 239 | | |
246 | 240 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
164 | 164 | | |
165 | 165 | | |
166 | 166 | | |
167 | | - | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | 167 | | |
179 | 168 | | |
180 | 169 | | |
| |||
250 | 239 | | |
251 | 240 | | |
252 | 241 | | |
253 | | - | |
254 | | - | |
255 | | - | |
256 | | - | |
257 | | - | |
258 | | - | |
259 | | - | |
260 | | - | |
261 | | - | |
262 | | - | |
263 | | - | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | 242 | | |
269 | 243 | | |
270 | 244 | | |
| |||
419 | 393 | | |
420 | 394 | | |
421 | 395 | | |
422 | | - | |
423 | | - | |
424 | | - | |
425 | | - | |
426 | | - | |
427 | | - | |
428 | | - | |
429 | | - | |
430 | | - | |
431 | | - | |
432 | | - | |
433 | | - | |
434 | | - | |
435 | | - | |
436 | | - | |
437 | 396 | | |
438 | 397 | | |
439 | 398 | | |
| |||
0 commit comments