Using NextJS 15 (Canary)

oxisto · Dec 23, 2024 · 1cce6ba · 1cce6ba
1 parent 1a16e50
commit 1cce6ba
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 69 deletions.
diff --git a/ui/.env.development b/ui/.env.development
@@ -0,0 +1 @@
+AUTH_CLIENT_ID=dashboard
diff --git a/ui/components/portfolio-position-row.tsx b/ui/components/portfolio-position-row.tsx
@@ -1,4 +1,4 @@
-import { components } from "@/lib/api/v1";
+import { components, SchemaPortfolioPosition } from "@/lib/api/v1";
 import { classNames, shorten } from "@/lib/util";
 import {
   ArrowDownIcon,
@@ -9,7 +9,7 @@ import FormattedCurrency from "./formatted-currency";
 import FormattedPercentage from "./formatted-percentage";
 
 interface PortfolioPositionRowProps {
-  position: components["schemas"]["PortfolioPosition"];
+  position: SchemaPortfolioPosition;
 }
 
 export default function PortfolioPositionRow({

diff --git a/ui/lib/api/index.ts b/ui/lib/api/index.ts
@@ -2,7 +2,7 @@ import { decode } from "next-auth/jwt";
 import { cookies } from "next/headers";
 import createClient, { Middleware } from "openapi-fetch";
 import type { paths } from "./v1";
-export * from "./types";
+export * from "./v1";
 
 const authMiddleware: Middleware = {
   async onRequest({ request }) {
@@ -13,7 +13,7 @@ const authMiddleware: Middleware = {
         : "authjs.session-token";
     // Retrieve our frontend auth cookie that contains the encrypted frontend
     // token
-    const cookie = cookies().get(cookieName);
+    const cookie = (await cookies()).get(cookieName);
 
     // Decode/decrypt the token to access the backend API token
     const token = await decode({

diff --git a/ui/lib/api/types.ts b/ui/lib/api/types.ts
diff --git a/ui/lib/api/v1.d.ts → ui/lib/api/v1.ts b/ui/lib/api/v1.d.ts → ui/lib/api/v1.ts
@@ -305,6 +305,18 @@ export interface components {
     headers: never;
     pathItems: never;
 }
+export type SchemaCurrency = components['schemas']['Currency'];
+export type SchemaGoogleProtobufAny = components['schemas']['GoogleProtobufAny'];
+export type SchemaListPortfolioTransactionsResponse = components['schemas']['ListPortfolioTransactionsResponse'];
+export type SchemaListPortfoliosResponse = components['schemas']['ListPortfoliosResponse'];
+export type SchemaListSecuritiesResponse = components['schemas']['ListSecuritiesResponse'];
+export type SchemaListedSecurity = components['schemas']['ListedSecurity'];
+export type SchemaPortfolio = components['schemas']['Portfolio'];
+export type SchemaPortfolioEvent = components['schemas']['PortfolioEvent'];
+export type SchemaPortfolioPosition = components['schemas']['PortfolioPosition'];
+export type SchemaPortfolioSnapshot = components['schemas']['PortfolioSnapshot'];
+export type SchemaSecurity = components['schemas']['Security'];
+export type SchemaStatus = components['schemas']['Status'];
 export type $defs = Record<string, never>;
 export interface operations {
     PortfolioService_ListPortfolios: {

diff --git a/ui/lib/currency.ts b/ui/lib/currency.ts
@@ -1,4 +1,4 @@
-import { Currency } from "@/lib/api";
+import { SchemaCurrency } from "@/lib/api";
 
 /**
  * This function returns a currency value to a decimal. Internally,
@@ -10,7 +10,7 @@ import { Currency } from "@/lib/api";
  * @param currency the currency to convert
  * @returns a decimal representation
  */
-export function toDecimal(currency?: Currency): number {
+export function toDecimal(currency?: SchemaCurrency): number {
   if (
     currency == undefined ||
     currency.value == undefined ||

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -7,12 +7,11 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "generate:types": "openapi-typescript ../openapi.yaml -o lib/api/v1.d.ts",
+    "generate:types": "openapi-typescript ../openapi.yaml -o lib/api/v1.ts --root-types",
     "predev": "npm run generate:types",
     "prebuild": "npm run generate:types"
   },
   "dependencies": {
-    "next": "^15.0.0-rc.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "@headlessui/react": "^2.1.2",
@@ -21,6 +20,7 @@
     "dayjs": "^1.11.12",
     "inter-ui": "^4.0.2",
     "negotiator": "^0.6.3",
+    "next": "^15.1.1-canary.17",
     "next-auth": "^5.0.0-beta.20",
     "next-intl": "^3.17.3",
     "openapi-fetch": "^0.13.0",
@@ -33,7 +33,7 @@
     "eslint": "^9.0.0",
     "eslint-config-next": "14.2.17",
     "eslint-config-prettier": "^9.1.0",
-    "openapi-typescript": "^7.3.0",
+    "openapi-typescript": "^7.4.0",
     "postcss": "^8",
     "prettier": "^3.3.3",
     "prettier-plugin-classnames": "^0.7.2",