Upgraded nextjs deps and configuration (#6388)

apps/nextjs/.eslintrc.json

@@ -0,0 +1,9 @@
+{
+ "extends": ["next/core-web-vitals", "next/typescript"],
+ "ignorePatterns": [".next/**", "dist/**", "node_modules/**"],
+ "settings": {
+ "next": {
+ "rootDir": "apps/nextjs/"
+ }
+ }
+}

apps/nextjs/.gitignore

@@ -4,6 +4,7 @@
 /node_modules
 /.pnp
 .pnp.js
+.yarn/install-state.gz
 
 # testing
 /coverage

apps/nextjs/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Plone Foundation
+Copyright (c) 2024 Plone Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

apps/nextjs/next.config.js → apps/nextjs/next.config.mjs

@@ -1,4 +1,4 @@
-const path = require('path');
+import path from 'path';
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
@@ -46,4 +46,4 @@ const nextConfig = {
  },
 };
 
-module.exports = nextConfig;
+export default nextConfig;

apps/nextjs/package.json

@@ -13,21 +13,22 @@
  "@plone/blocks": "workspace: *",
  "@plone/client": "workspace: *",
  "@plone/components": "workspace: *",
- "@plone/registry": "workspace: *",
  "@plone/providers": "workspace: *",
- "@tanstack/react-query": "^5.37.1",
- "next": "14.2.2",
+ "@plone/registry": "workspace: *",
+ "@tanstack/react-query": "^5.59.0",
+ "next": "14.2.14",
  "react": "^18",
  "react-aria-components": "^1.4.0",
  "react-dom": "^18"
  },
  "devDependencies": {
- "@tanstack/react-query-devtools": "^5.37.1",
+ "@plone/types": "workspace: *",
+ "@tanstack/react-query-devtools": "^5.59.0",
  "@types/node": "^20",
  "@types/react": "^18",
  "@types/react-dom": "^18",
  "eslint": "^8",
- "eslint-config-next": "14.2.2",
+ "eslint-config-next": "14.2.14",
  "typescript": "^5.6.3"
  }
 }

apps/nextjs/src/app/Providers.tsx

@@ -36,7 +36,7 @@ const Providers: React.FC<{
  }),
  );
 
- let router = useRouter();
+ const router = useRouter();
 
  return (
  <RouterProvider navigate={router.push}>

apps/nextjs/src/app/content.tsx

@@ -11,7 +11,7 @@ import '@plone/components/dist/basic.css';
 export default function Content() {
  const { getContentQuery } = usePloneClient();
  const pathname = usePathname();
- const { data, isLoading } = useQuery(getContentQuery({ path: pathname }));
+ const { data } = useQuery(getContentQuery({ path: pathname }));
 
  if (data) {
  return (

apps/nextjs/src/middleware.ts

@@ -2,10 +2,7 @@ import { NextResponse } from 'next/server';
 import type { NextRequest } from 'next/server';
 
 export function middleware(request: NextRequest) {
- // Clone the request headers and set a new header `x-hello-from-middleware1`
  const requestHeaders = new Headers(request.headers);
- // console.log(request.nextUrl.pathname);
- // requestHeaders.set('x-hello-from-middleware1', 'hello');
 
  // You can also set request headers in NextResponse.rewrite
  const response = NextResponse.next({

apps/nextjs/tsconfig.json

@@ -1,38 +1,34 @@
 {
- "compilerOptions": {
- "target": "es5",
- "lib": [
- "dom",
- "dom.iterable",
- "esnext"
- ],
- "allowJs": true,
- "skipLibCheck": true,
- "strict": true,
- "forceConsistentCasingInFileNames": true,
- "noEmit": true,
- "esModuleInterop": true,
- "module": "esnext",
- "moduleResolution": "bundler",
- "resolveJsonModule": true,
- "isolatedModules": true,
- "jsx": "preserve",
- "incremental": true,
- "plugins": [
- {
- "name": "next"
- }
- ]
- },
- "include": [
- "next-env.d.ts",
- "**/*.ts",
- "**/*.tsx",
- "**/*.js",
- "**/*.jx",
- ".next/types/**/*.ts"
+ "compilerOptions": {
+ "forceConsistentCasingInFileNames": true,
+ "lib": ["dom", "dom.iterable", "esnext"],
+ "allowJs": true,
+ "skipLibCheck": true,
+ "strict": true,
+ "noEmit": true,
+ "esModuleInterop": true,
+ "module": "esnext",
+ "moduleResolution": "bundler",
+ "resolveJsonModule": true,
+ "isolatedModules": true,
+ "jsx": "preserve",
+ "incremental": true,
+ "plugins": [
+ {
+ "name": "next"
+ }
  ],
- "exclude": [
- "node_modules",
- ]
+ "paths": {
+ "@/*": ["./src/*"]
+ }
+ },
+ "include": [
+ "next-env.d.ts",
+ "**/*.ts",
+ "**/*.tsx",
+ "**/*.js",
+ "**/*.jsx",
+ ".next/types/**/*.ts"
+ ],
+ "exclude": ["node_modules"]
 }