Skip to content

Commit a381ea4

Browse files
authored
chore: upgrade dependencies, regenerate (#4)
- upgrade all dependencies - regenerate with latest nextjs generator from mnahkies/openapi-code-generator#152 - adjust for nextjs 15
1 parent 2eb0baa commit a381ea4

15 files changed

Lines changed: 658 additions & 1068 deletions

File tree

package.json

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "spdx-dependency-track",
33
"version": "0.1.0",
4-
"packageManager": "yarn@4.1.1",
4+
"packageManager": "yarn@4.9.1",
55
"private": true,
66
"license": "MIT",
77
"scripts": {
@@ -18,43 +18,44 @@
1818
"ci-build": "./bin/build.sh",
1919
"ci-test": "echo 'no tests yet'",
2020
"ci-lint": "echo 'n/a'",
21-
"ci-format": "biome ci ."
21+
"ci-format": "biome ci .",
22+
"ci-pipeline": "yarn ci-build && yarn ci-test && yarn ci-format && yarn ci-lint"
2223
},
2324
"dependencies": {
24-
"@ariga/atlas": "^0.32.1",
25-
"@dotenvx/dotenvx": "^0.27.2",
25+
"@ariga/atlas": "^0.33.1",
26+
"@dotenvx/dotenvx": "^1.44.0",
2627
"@emotion/cache": "^11.14.0",
2728
"@emotion/react": "^11.14.0",
2829
"@emotion/styled": "^11.14.0",
29-
"@hookform/resolvers": "^3.10.0",
30-
"@mui/icons-material": "^5.17.1",
31-
"@mui/material": "^5.17.1",
32-
"@mui/material-nextjs": "^5.16.14",
30+
"@hookform/resolvers": "^5.0.1",
31+
"@mui/icons-material": "^7.1.0",
32+
"@mui/material": "^7.1.0",
33+
"@mui/material-nextjs": "^7.1.0",
3334
"@nahkies/typescript-fetch-runtime": "^0.20.0",
3435
"@nahkies/typescript-koa-runtime": "^0.20.0",
35-
"@tanstack/react-query": "^5.75.7",
36-
"@tanstack/react-query-devtools": "^5.75.7",
37-
"@tanstack/react-query-next-experimental": "^5.75.7",
38-
"better-sqlite3": "^9.6.0",
39-
"next": "14.2.28",
40-
"react": "^18.3.1",
41-
"react-dom": "^18.3.1",
42-
"react-hook-form": "^7.56.3",
43-
"semver": "^7.7.1",
36+
"@tanstack/react-query": "^5.76.1",
37+
"@tanstack/react-query-devtools": "^5.76.1",
38+
"@tanstack/react-query-next-experimental": "^5.76.1",
39+
"better-sqlite3": "^11.10.0",
40+
"next": "15.3.2",
41+
"react": "^19.1.0",
42+
"react-dom": "^19.1.0",
43+
"react-hook-form": "^7.56.4",
44+
"semver": "^7.7.2",
4445
"spdx-expression-parse": "^4.0.0",
4546
"zod": "^3.24.4"
4647
},
4748
"devDependencies": {
4849
"@biomejs/biome": "^1.9.4",
4950
"@nahkies/openapi-code-generator": "^0.20.0",
5051
"@types/better-sqlite3": "^7.6.13",
51-
"@types/node": "^22.15.17",
52-
"@types/react": "^18.3.21",
53-
"@types/react-dom": "^18.3.7",
52+
"@types/node": "^22.15.18",
53+
"@types/react": "^19.1.4",
54+
"@types/react-dom": "^19.1.5",
5455
"@types/semver": "^7.7.0",
5556
"@types/spdx-expression-parse": "^3.0.5",
5657
"husky": "^9.1.7",
57-
"lint-staged": "^15.5.2",
58+
"lint-staged": "^16.0.0",
5859
"markdown-toc": "^1.2.0",
5960
"typescript": "^5.8.3"
6061
},

src/app/api/licenses/route.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import {database} from "@/lib/database/database"
33

44
export const dynamic = "force-dynamic"
55

6-
// biome-ignore lint/correctness/noEmptyPattern: <explanation>
7-
export const GET = _GET(async ({}, respond, context) => {
6+
export const GET = _GET(async (respond, context) => {
87
const licenses = await database.licensesRepository.getLicenses()
98

109
return respond.with200().body(licenses)
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import {_GET} from "@/generated/api/repositories/summaries/route"
22
import {database} from "@/lib/database/database"
33

4-
// biome-ignore lint/correctness/noEmptyPattern: <explanation>
5-
export const GET = _GET(async ({}, respond, context) => {
4+
export const GET = _GET(async (respond, context) => {
65
const summaries = await database.repositoryRepository.getRepositorySummaries()
76
return respond.with200().body(summaries)
87
})

src/app/repositories/[repositoryId]/page.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ import {
1414
} from "@mui/material"
1515
import {useQuery} from "@tanstack/react-query"
1616
import Link from "next/link"
17+
import {use} from "react"
1718

1819
export default function RepositoryPage({
1920
params,
20-
}: {params: {repositoryId: string}}) {
21+
}: {params: Promise<{repositoryId: string}>}) {
22+
const {repositoryId} = use(params)
2123
const queryOptions = useQueryOptions()
22-
const summary = useQuery(
23-
queryOptions.getRepositorySummary(params.repositoryId),
24-
)
25-
const scans = useQuery(queryOptions.getRepositoryScans(params.repositoryId))
24+
const summary = useQuery(queryOptions.getRepositorySummary(repositoryId))
25+
const scans = useQuery(queryOptions.getRepositoryScans(repositoryId))
2626

2727
return (
2828
<Stack spacing={2}>

src/app/repositories/[repositoryId]/scans/[scanId]/page.tsx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ import {
1515
TableRow,
1616
Typography,
1717
} from "@mui/material"
18-
import {useMutation, useQuery} from "@tanstack/react-query"
18+
import {useQuery} from "@tanstack/react-query"
1919
import Link from "next/link"
2020
import type React from "react"
21+
import {use} from "react"
2122
import {useState} from "react"
2223

2324
const DependencyName: React.FC<{name: string; version: string}> = ({
@@ -43,17 +44,16 @@ const DependencyName: React.FC<{name: string; version: string}> = ({
4344

4445
export default function RepositoryScanPage({
4546
params,
46-
}: {params: {repositoryId: string; scanId: string}}) {
47+
}: {params: Promise<{repositoryId: string; scanId: string}>}) {
48+
const {repositoryId, scanId} = use(params)
4749
const [excludePermissive, setExcludePermissive] = useState<boolean>(false)
4850

4951
const queryOptions = useQueryOptions()
50-
const summary = useQuery(
51-
queryOptions.getRepositorySummary(params.repositoryId),
52-
)
52+
const summary = useQuery(queryOptions.getRepositorySummary(repositoryId))
5353
const dependencies = useQuery(
5454
queryOptions.getRepositoryScanDependencies(
55-
params.repositoryId,
56-
params.scanId,
55+
repositoryId,
56+
scanId,
5757
excludePermissive,
5858
),
5959
)
@@ -90,9 +90,10 @@ export default function RepositoryScanPage({
9090
<TableBody>
9191
{!dependencies.isPending &&
9292
!dependencies.isError &&
93+
// TODO: we get some duplicates here.
9394
dependencies.data.map((dependency) => (
9495
<TableRow
95-
key={dependency.dependencyName + dependency.dependencyVersion}
96+
key={`${dependency.dependencyName}-${dependency.dependencyVersion}`}
9697
>
9798
<TableCell>
9899
<DependencyName

src/generated/api/licenses/route.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,21 @@ import {
99
KoaRuntimeResponse,
1010
StatusCode,
1111
} from "@nahkies/typescript-koa-runtime/server"
12-
import { Params } from "@nahkies/typescript-koa-runtime/zod"
1312
import { NextRequest } from "next/server"
1413

14+
// /api/licenses
1515
export type GetLicensesResponder = {
1616
with200(): KoaRuntimeResponse<t_License[]>
1717
} & KoaRuntimeResponder
1818

1919
export type GetLicenses = (
20-
params: Params<void, void, void, void>,
2120
respond: GetLicensesResponder,
22-
ctx: { request: NextRequest },
21+
request: NextRequest,
2322
) => Promise<KoaRuntimeResponse<unknown>>
2423

2524
export const _GET =
2625
(implementation: GetLicenses) =>
27-
async (
28-
request: NextRequest,
29-
{ params }: { params: unknown },
30-
): Promise<Response> => {
26+
async (request: NextRequest): Promise<Response> => {
3127
const input = {
3228
params: undefined,
3329
// TODO: this swallows repeated parameters
@@ -45,7 +41,7 @@ export const _GET =
4541
},
4642
}
4743

48-
const { status, body } = await implementation(input, responder, { request })
44+
const { status, body } = await implementation(responder, request)
4945
.then((it) => it.unpack())
5046
.catch((err) => {
5147
throw KoaRuntimeError.HandlerError(err)

src/generated/api/repositories/[repositoryId]/scans/[scanId]/route.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { Params, parseRequestInput } from "@nahkies/typescript-koa-runtime/zod"
2121
import { NextRequest } from "next/server"
2222
import { z } from "zod"
2323

24+
// /api/repositories/{repositoryId}/scans/{scanId}
2425
export type GetRepositoryScanResponder = {
2526
with200(): KoaRuntimeResponse<t_RepositoryScanDependency[]>
2627
} & KoaRuntimeResponder
@@ -33,7 +34,7 @@ export type GetRepositoryScan = (
3334
void
3435
>,
3536
respond: GetRepositoryScanResponder,
36-
ctx: { request: NextRequest },
37+
request: NextRequest,
3738
) => Promise<KoaRuntimeResponse<unknown>>
3839

3940
const getRepositoryScanParamSchema = z.object({
@@ -49,12 +50,12 @@ export const _GET =
4950
(implementation: GetRepositoryScan) =>
5051
async (
5152
request: NextRequest,
52-
{ params }: { params: unknown },
53+
{ params }: { params: Promise<unknown> },
5354
): Promise<Response> => {
5455
const input = {
5556
params: parseRequestInput(
5657
getRepositoryScanParamSchema,
57-
params,
58+
await params,
5859
RequestInputType.RouteParam,
5960
),
6061
// TODO: this swallows repeated parameters
@@ -76,7 +77,7 @@ export const _GET =
7677
},
7778
}
7879

79-
const { status, body } = await implementation(input, responder, { request })
80+
const { status, body } = await implementation(input, responder, request)
8081
.then((it) => it.unpack())
8182
.catch((err) => {
8283
throw KoaRuntimeError.HandlerError(err)

src/generated/api/repositories/[repositoryId]/scans/route.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ import { Params, parseRequestInput } from "@nahkies/typescript-koa-runtime/zod"
1919
import { NextRequest } from "next/server"
2020
import { z } from "zod"
2121

22+
// /api/repositories/{repositoryId}/scans
2223
export type GetRepositoryScansResponder = {
2324
with200(): KoaRuntimeResponse<t_RepositoryScan[]>
2425
} & KoaRuntimeResponder
2526

2627
export type GetRepositoryScans = (
2728
params: Params<t_GetRepositoryScansParamSchema, void, void, void>,
2829
respond: GetRepositoryScansResponder,
29-
ctx: { request: NextRequest },
30+
request: NextRequest,
3031
) => Promise<KoaRuntimeResponse<unknown>>
3132

3233
const getRepositoryScansParamSchema = z.object({ repositoryId: z.string() })
@@ -35,12 +36,12 @@ export const _GET =
3536
(implementation: GetRepositoryScans) =>
3637
async (
3738
request: NextRequest,
38-
{ params }: { params: unknown },
39+
{ params }: { params: Promise<unknown> },
3940
): Promise<Response> => {
4041
const input = {
4142
params: parseRequestInput(
4243
getRepositoryScansParamSchema,
43-
params,
44+
await params,
4445
RequestInputType.RouteParam,
4546
),
4647
// TODO: this swallows repeated parameters
@@ -58,7 +59,7 @@ export const _GET =
5859
},
5960
}
6061

61-
const { status, body } = await implementation(input, responder, { request })
62+
const { status, body } = await implementation(input, responder, request)
6263
.then((it) => it.unpack())
6364
.catch((err) => {
6465
throw KoaRuntimeError.HandlerError(err)

src/generated/api/repositories/[repositoryId]/summary/route.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ import { Params, parseRequestInput } from "@nahkies/typescript-koa-runtime/zod"
1919
import { NextRequest } from "next/server"
2020
import { z } from "zod"
2121

22+
// /api/repositories/{repositoryId}/summary
2223
export type GetRepositorySummaryResponder = {
2324
with200(): KoaRuntimeResponse<t_RepositorySummary>
2425
} & KoaRuntimeResponder
2526

2627
export type GetRepositorySummary = (
2728
params: Params<t_GetRepositorySummaryParamSchema, void, void, void>,
2829
respond: GetRepositorySummaryResponder,
29-
ctx: { request: NextRequest },
30+
request: NextRequest,
3031
) => Promise<KoaRuntimeResponse<unknown>>
3132

3233
const getRepositorySummaryParamSchema = z.object({ repositoryId: z.string() })
@@ -35,12 +36,12 @@ export const _GET =
3536
(implementation: GetRepositorySummary) =>
3637
async (
3738
request: NextRequest,
38-
{ params }: { params: unknown },
39+
{ params }: { params: Promise<unknown> },
3940
): Promise<Response> => {
4041
const input = {
4142
params: parseRequestInput(
4243
getRepositorySummaryParamSchema,
43-
params,
44+
await params,
4445
RequestInputType.RouteParam,
4546
),
4647
// TODO: this swallows repeated parameters
@@ -58,7 +59,7 @@ export const _GET =
5859
},
5960
}
6061

61-
const { status, body } = await implementation(input, responder, { request })
62+
const { status, body } = await implementation(input, responder, request)
6263
.then((it) => it.unpack())
6364
.catch((err) => {
6465
throw KoaRuntimeError.HandlerError(err)

src/generated/api/repositories/scan/route.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,22 @@ import {
1616
import { Params, parseRequestInput } from "@nahkies/typescript-koa-runtime/zod"
1717
import { NextRequest } from "next/server"
1818

19+
// /api/repositories/scan
1920
export type ScanRepositoriesResponder = {
2021
with204(): KoaRuntimeResponse<void>
2122
} & KoaRuntimeResponder
2223

2324
export type ScanRepositories = (
2425
params: Params<void, void, t_ScanRepositoriesBodySchema, void>,
2526
respond: ScanRepositoriesResponder,
26-
ctx: { request: NextRequest },
27+
request: NextRequest,
2728
) => Promise<KoaRuntimeResponse<unknown>>
2829

2930
const scanRepositoriesBodySchema = s_scanRepositoriesJsonRequestBody
3031

3132
export const _POST =
3233
(implementation: ScanRepositories) =>
33-
async (
34-
request: NextRequest,
35-
{ params }: { params: unknown },
36-
): Promise<Response> => {
34+
async (request: NextRequest): Promise<Response> => {
3735
const input = {
3836
params: undefined,
3937
// TODO: this swallows repeated parameters
@@ -55,7 +53,7 @@ export const _POST =
5553
},
5654
}
5755

58-
const { status, body } = await implementation(input, responder, { request })
56+
const { status, body } = await implementation(input, responder, request)
5957
.then((it) => it.unpack())
6058
.catch((err) => {
6159
throw KoaRuntimeError.HandlerError(err)

0 commit comments

Comments
 (0)