Skip to content

Commit eefa620

Browse files
committed
bump: next, eslint, react
1 parent 2318f66 commit eefa620

File tree

24 files changed

+2386
-3650
lines changed

24 files changed

+2386
-3650
lines changed

apps/othi/.eslintrc.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

apps/othi/eslint.config.mjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { nextJsConfig } from "eslint-config-custom/next-js";
2+
3+
/** @type {import("eslint").Linter.Config} */
4+
export default nextJsConfig;

apps/othi/next-env.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
/// <reference types="next/image-types/global" />
33

44
// NOTE: This file should not be edited
5-
// see https://nextjs.org/docs/basic-features/typescript for more information.
5+
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

apps/othi/next.config.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ const nextConfig = {
1717
},
1818
experimental: {
1919
swcPlugins: [
20-
["@swc-jotai/react-refresh", {}],
21-
["@swc-jotai/debug-label", {}],
20+
// ["@swc-jotai/react-refresh", {}],
21+
// ["@swc-jotai/debug-label", {}],
2222
],
23-
serverComponentsExternalPackages: ["@libsql/client"],
2423
},
24+
serverExternalPackages: ["@libsql/client"],
2525
transpilePackages: ["lib", "ui", "database", "protocol", "auth"],
2626
};
2727

apps/othi/package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@
8080
"jotai-tanstack-query": "^0.8.5",
8181
"lib": "workspace:*",
8282
"lucide-react": "^0.258.0",
83-
"next": "14.2.5",
83+
"next": "15.2.4",
8484
"next-auth": "^4.24.7",
8585
"next-themes": "^0.2.1",
8686
"optics-ts": "^2.4.1",
8787
"protocol": "workspace:*",
88-
"react": "18.3.1",
88+
"react": "19.1.0",
8989
"react-day-picker": "^8.10.1",
90-
"react-dom": "18.2.0",
90+
"react-dom": "19.1.0",
9191
"react-hook-form": "^7.52.1",
9292
"react-inlinesvg": "^4.1.3",
9393
"react-xarrows": "^2.0.2",
@@ -97,8 +97,6 @@
9797
"tailwindcss-animate": "^1.0.7",
9898
"ui": "workspace:*",
9999
"uploadthing": "^7.0.2",
100-
"use-immer": "^0.9.0",
101-
"wonka": "^6.3.4",
102100
"zod": "^3.23.8"
103101
},
104102
"devDependencies": {
@@ -115,11 +113,11 @@
115113
"@swc-jotai/react-refresh": "^0.1.1",
116114
"@tanstack/eslint-plugin-query": "^5.51.15",
117115
"@types/node": "^22.5.0",
118-
"@types/react": "^18.3.4",
119-
"@types/react-dom": "^18.3.0",
116+
"@types/react": "^19.0.12",
117+
"@types/react-dom": "^19.0.4",
120118
"autoprefixer": "10.4.14",
121119
"dotenv-cli": "^7.4.2",
122-
"eslint": "8.43.0",
120+
"eslint": "9.23.0",
123121
"eslint-config-custom": "workspace:*",
124122
"eslint-config-next": "14.0.1",
125123
"eslint-plugin-storybook": "^0.6.15",

apps/othi/src/app/blog/[id]/edit/page.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import type { Params } from "lib/generics";
21
import { trpcServer } from "protocol/trpc/react/server";
32
import { EditorProvider } from "@othi/components/editor/EditorProvider";
43
import Link from "next/link";
@@ -10,13 +9,17 @@ import { BlogFormProvider } from "../_provider/BlogFormProvider";
109
import { BlogForm } from "../_provider/BlogForm";
1110
import { EditorSubmitButton } from "../_provider/EditorSubmitButton";
1211

13-
export default async function Page({ params }: Params) {
12+
export default async function Page({
13+
params,
14+
}: {
15+
params: Promise<Record<string, string>>;
16+
}) {
1417
const isSudo = await isSuperAdmin({
1518
sessionFn: getServerSession,
1619
});
1720
if (!isSudo) return redirect("/blog");
1821

19-
const id = params?.id as string;
22+
const id = (await params).id as string;
2023
const data = await trpcServer.blog.byId({ id, tags: true });
2124

2225
if (!data) return "not found";

apps/othi/src/app/blog/[id]/page.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { SudoGuard } from "@othi/components/SudoGuard";
2-
import type { Params } from "lib/generics";
32
import { MoveLeft } from "lucide-react";
43
import Link from "next/link";
54
import { trpcServer } from "protocol/trpc/react/server";
@@ -8,11 +7,15 @@ import { HtmlContent } from "@othi/components/typography";
87
import type { Metadata } from "next";
98
import { format } from "date-fns";
109

11-
export async function generateMetadata({ params }: Params): Promise<Metadata> {
10+
export async function generateMetadata({
11+
params,
12+
}: {
13+
params: Promise<Record<string, string>>;
14+
}): Promise<Metadata> {
1215
// this always runs until completion so loading files might not show up if
1316
// using the same action
1417
// TODO: cache the meta queries
15-
const id = params?.id as string;
18+
const id = (await params).id as string;
1619
const data = await trpcServer.blog.byId({ id });
1720
const title = data?.meta.title;
1821
const description = "Othi's blog";
@@ -35,8 +38,12 @@ export async function generateMetadata({ params }: Params): Promise<Metadata> {
3538
};
3639
}
3740

38-
export default async function Page({ params }: Params) {
39-
const id = params?.id as string;
41+
export default async function Page({
42+
params,
43+
}: {
44+
params: Promise<Record<string, string>>;
45+
}) {
46+
const id = (await params).id as string;
4047
const data = await trpcServer.blog.byId({ id });
4148

4249
if (!data) return "not found";

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
"devDependencies": {
1414
"autoprefixer": "^10.4.19",
1515
"dotenv-cli": "^7.4.2",
16-
"eslint": "^8.57.1",
17-
"next": "^14.2.5",
16+
"eslint": "^9.23.0",
17+
"next": "^15.2.4",
1818
"postcss": "^8.4.40",
1919
"prettier": "^3.3.3",
2020
"tailwindcss": "^3.4.7",
2121
"tsconfig": "workspace:*",
2222
"turbo": "^2.1.0"
2323
},
24-
"name": "othi-monorepo"
24+
"name": "othi-monorepo",
25+
"packageManager": "pnpm@9.13.2"
2526
}

packages/database/.eslintrc.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

packages/database/eslint.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { config } from "eslint-config-custom/base";
2+
3+
/** @type {import("eslint").Linter.Config} */
4+
export default config;

0 commit comments

Comments
 (0)