@akinon/next 2.0.0-beta.0 → 2.0.0-beta.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @akinon/next
 
+## 2.0.0-beta.1
+
+### Minor Changes
+
+- ZERO-3091: Upgrade Next.js to v15 and React to v19
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/api/client.ts

@@ -14,6 +14,7 @@ interface RouteParams {
 
 async function proxyRequest(...args) {
   const [req, { params }] = args as [req: Request, params: RouteParams];
+  const resolvedParams = await params;
   const { searchParams } = new URL(req.url);
   const commerceUrl = settings.commerceUrl;
 
@@ -32,7 +33,7 @@ async function proxyRequest(...args) {
     responseType: 'json'
   };
 
-  const slug = `${params.slug.join('/')}/`;
+  const slug = `${resolvedParams.slug.join('/')}/`;
   const options_ = JSON.parse(
     decodeURIComponent((searchParams.get('options') as string) ?? '{}')
   );
@@ -85,7 +86,7 @@ async function proxyRequest(...args) {
     }
   } as RequestInit;
 
-  const nextCookies = cookies();
+  const nextCookies = await cookies();
   const segment = nextCookies.get('pz-segment')?.value;
   const currency = nextCookies.get('pz-external-currency')?.value;
 

package/components/pz-root.tsx

@@ -14,7 +14,7 @@ export default async function PzRoot({
   children: React.ReactNode;
   locale?: string;
 }) {
-  const nextCookies = cookies();
+  const nextCookies = await cookies();
   const sessionid = nextCookies.get('osessionid')?.value;
 
   if (!translations) {

package/hocs/client/with-segment-defaults.tsx

@@ -1,5 +1,5 @@
 import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
-import React from 'react';
+import React, { JSX } from 'react';
 
 type SegmentType = 'client-root' | 'layout' | 'page';
 

package/hocs/server/with-segment-defaults.tsx

@@ -1,4 +1,5 @@
 import settings from 'settings';
+import { JSX } from 'react';
 import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
 import { redirect } from 'next/navigation';
 import { ServerVariables } from '../../utils/server-variables';
@@ -21,6 +22,8 @@ export const withSegmentDefaults =
   async (props: T) => {
     let componentProps = { ...props };
 
+    const { locale, currency } = await props.params;
+
     if (options.segmentType === 'root-layout') {
       componentProps = (await addRootLayoutProps(
         componentProps as RootLayoutProps
@@ -29,8 +32,8 @@ export const withSegmentDefaults =
       checkRedisVariables();
     }
 
-    ServerVariables.locale = props.params.locale;
-    ServerVariables.currency = props.params.currency;
+    ServerVariables.locale = await locale;
+    ServerVariables.currency = await currency;
 
     return await (
       <>
@@ -40,7 +43,7 @@ export const withSegmentDefaults =
   };
 
 const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
-  const params = componentProps.params;
+  const params = await componentProps.params;
 
   if (
     params.commerce !== encodeURIComponent(decodeURI(settings.commerceUrl)) ||

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.1",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,13 +30,13 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.0",
+    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.1",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
-    "@typescript-eslint/eslint-plugin": "6.7.4",
-    "@typescript-eslint/parser": "6.7.4",
-    "eslint": "8.56.0",
-    "eslint-config-next": "14.2.3",
-    "eslint-config-prettier": "8.5.0"
+    "@typescript-eslint/eslint-plugin": "8.18.2",
+    "@typescript-eslint/parser": "8.18.2",
+    "eslint": "9.17.0",
+    "eslint-config-next": "15.1.2",
+    "eslint-config-prettier": "9.1.0"
   }
 }

package/types/commerce/checkout.ts

@@ -3,6 +3,7 @@ import { Basket } from './basket';
 import { RetailStore } from './misc';
 import { PaymentOption } from './order';
 import { Product } from './product';
+import { JSX } from 'react';
 
 export enum CheckoutStep {
   Shipping = 'shipping',

package/types/index.ts

@@ -239,8 +239,8 @@ export type ImageOptions = CDNOptions & {
 export type Translations = { [key: string]: object };
 
 export interface PageProps<T = any> {
-  params: T & { locale: string; currency: string };
-  searchParams: URLSearchParams;
+  params: Promise<T & { locale: string; currency: string }>;
+  searchParams: Promise<URLSearchParams>;
 }
 
 export interface LayoutProps<T = any> extends PageProps<T> {

package/utils/app-fetch.ts

@@ -26,8 +26,8 @@ const appFetch = async <T>({
   let ip = '';
 
   try {
-    const nextHeaders = headers();
-    const nextCookies = cookies();
+    const nextHeaders = await headers();
+    const nextCookies = await cookies();
     ip = nextHeaders.get('x-forwarded-for') ?? '';
 
     const commerceUrl = Settings.commerceUrl;

package/utils/redirect.ts

@@ -4,8 +4,8 @@ import { headers } from 'next/headers';
 import { ServerVariables } from '@akinon/next/utils/server-variables';
 import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
 
-export const redirect = (path: string, type?: RedirectType) => {
-  const nextHeaders = headers();
+export const redirect = async (path: string, type?: RedirectType) => {
+  const nextHeaders = await headers();
   const pageUrl = new URL(
     nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL
   );