Upgraded nextjs
This commit is contained in:
parent
f98e1fc715
commit
d2b4d046df
@ -1,4 +1,4 @@
|
|||||||
FROM node:18-alpine AS builder
|
FROM node:20-alpine AS builder
|
||||||
|
|
||||||
# Enable corepack and install pnpm
|
# Enable corepack and install pnpm
|
||||||
RUN corepack enable && corepack prepare pnpm@latest --activate
|
RUN corepack enable && corepack prepare pnpm@latest --activate
|
||||||
@ -20,7 +20,7 @@ COPY . .
|
|||||||
# Build the application
|
# Build the application
|
||||||
RUN pnpm build
|
RUN pnpm build
|
||||||
|
|
||||||
FROM node:18-alpine AS runner
|
FROM node:20-alpine AS runner
|
||||||
|
|
||||||
RUN corepack enable && corepack prepare pnpm@latest --activate
|
RUN corepack enable && corepack prepare pnpm@latest --activate
|
||||||
|
|
||||||
|
|||||||
21
package.json
21
package.json
@ -7,7 +7,7 @@
|
|||||||
"dev": "next dev --turbopack",
|
"dev": "next dev --turbopack",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
"start": "next start",
|
"start": "next start",
|
||||||
"lint": "next lint"
|
"lint": "eslint ."
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@hookform/resolvers": "^5.0.1",
|
"@hookform/resolvers": "^5.0.1",
|
||||||
@ -38,12 +38,12 @@
|
|||||||
"json-to-graphql-query": "^2.3.0",
|
"json-to-graphql-query": "^2.3.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"lucide-react": "^0.501.0",
|
"lucide-react": "^0.501.0",
|
||||||
"next": "15.3.1",
|
"next": "16.0.10",
|
||||||
"next-redux-wrapper": "^8.1.0",
|
"next-redux-wrapper": "^8.1.0",
|
||||||
"next-themes": "^0.4.6",
|
"next-themes": "^0.4.6",
|
||||||
"react": "^19.0.0",
|
"react": "19.2.3",
|
||||||
"react-day-picker": "8.10.1",
|
"react-day-picker": "8.10.1",
|
||||||
"react-dom": "^19.0.0",
|
"react-dom": "19.2.3",
|
||||||
"react-hook-form": "^7.56.1",
|
"react-hook-form": "^7.56.1",
|
||||||
"react-redux": "^9.2.0",
|
"react-redux": "^9.2.0",
|
||||||
"sonner": "^2.0.3",
|
"sonner": "^2.0.3",
|
||||||
@ -55,7 +55,6 @@
|
|||||||
"zod": "^3.24.3"
|
"zod": "^3.24.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/eslintrc": "^3",
|
|
||||||
"@eslint/js": "^9.25.0",
|
"@eslint/js": "^9.25.0",
|
||||||
"@tailwindcss/postcss": "^4",
|
"@tailwindcss/postcss": "^4",
|
||||||
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
|
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
|
||||||
@ -65,11 +64,11 @@
|
|||||||
"@types/eslint-plugin-tailwindcss": "^3.17.0",
|
"@types/eslint-plugin-tailwindcss": "^3.17.0",
|
||||||
"@types/lodash": "^4.17.16",
|
"@types/lodash": "^4.17.16",
|
||||||
"@types/node": "^20.17.30",
|
"@types/node": "^20.17.30",
|
||||||
"@types/react": "^19",
|
"@types/react": "19.2.7",
|
||||||
"@types/react-dom": "^19",
|
"@types/react-dom": "19.2.3",
|
||||||
"@typescript-eslint/parser": "^8.30.1",
|
"@typescript-eslint/parser": "^8.30.1",
|
||||||
"eslint": "^9",
|
"eslint": "^9",
|
||||||
"eslint-config-next": "15.3.1",
|
"eslint-config-next": "16.0.10",
|
||||||
"eslint-config-prettier": "^10.1.2",
|
"eslint-config-prettier": "^10.1.2",
|
||||||
"eslint-plugin-import-x": "^4.10.6",
|
"eslint-plugin-import-x": "^4.10.6",
|
||||||
"eslint-plugin-react": "^7.37.5",
|
"eslint-plugin-react": "^7.37.5",
|
||||||
@ -81,5 +80,11 @@
|
|||||||
"tailwindcss": "^4",
|
"tailwindcss": "^4",
|
||||||
"typescript": "^5",
|
"typescript": "^5",
|
||||||
"typescript-eslint": "^8.30.1"
|
"typescript-eslint": "^8.30.1"
|
||||||
|
},
|
||||||
|
"pnpm": {
|
||||||
|
"overrides": {
|
||||||
|
"@types/react": "19.2.7",
|
||||||
|
"@types/react-dom": "19.2.3"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
2248
pnpm-lock.yaml
generated
2248
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@ -63,8 +63,8 @@ export async function fetchMainPageContent(): Promise<MainPageData> {
|
|||||||
])
|
])
|
||||||
.execute();
|
.execute();
|
||||||
|
|
||||||
// Transform the data using TaylorDB-specific presenters
|
console.log('Loading main page content...');
|
||||||
// The query builder returns arrays directly
|
|
||||||
return {
|
return {
|
||||||
partners: presentPartnersFromTaylor(partnersData),
|
partners: presentPartnersFromTaylor(partnersData),
|
||||||
jobs: presentJobsFromTaylor(jobsData),
|
jobs: presentJobsFromTaylor(jobsData),
|
||||||
@ -108,6 +108,8 @@ export async function fetchAboutUsPageContent(): Promise<AboutUsPageData> {
|
|||||||
])
|
])
|
||||||
.execute();
|
.execute();
|
||||||
|
|
||||||
|
console.log('Loading about us page content...');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
team: presentTeamMembersFromTaylor(teamData),
|
team: presentTeamMembersFromTaylor(teamData),
|
||||||
history: presentHistoryItemsFromTaylor(historyData),
|
history: presentHistoryItemsFromTaylor(historyData),
|
||||||
@ -128,6 +130,8 @@ export async function fetchCharityPageContent(): Promise<CharityPageData> {
|
|||||||
})
|
})
|
||||||
.execute();
|
.execute();
|
||||||
|
|
||||||
|
console.log('Loading charity page content...');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
charities: presentCharitiesFromTaylor(charitiesData),
|
charities: presentCharitiesFromTaylor(charitiesData),
|
||||||
};
|
};
|
||||||
@ -145,6 +149,8 @@ export async function fetchCertificatesPageContent(): Promise<CertificatesPageDa
|
|||||||
})
|
})
|
||||||
.execute();
|
.execute();
|
||||||
|
|
||||||
|
console.log('Loading certificates page content...');
|
||||||
|
|
||||||
return {
|
return {
|
||||||
certificates: presentCertificatesFromTaylor(certificatesData),
|
certificates: presentCertificatesFromTaylor(certificatesData),
|
||||||
};
|
};
|
||||||
@ -161,6 +167,8 @@ export async function fetchTextContent(): Promise<
|
|||||||
.selectAll()
|
.selectAll()
|
||||||
.execute();
|
.execute();
|
||||||
|
|
||||||
|
console.log('Loading text content...');
|
||||||
|
|
||||||
return presentTextsFromTaylor(textsData);
|
return presentTextsFromTaylor(textsData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -178,5 +186,7 @@ export async function fetchMediaContent(): Promise<
|
|||||||
})
|
})
|
||||||
.execute();
|
.execute();
|
||||||
|
|
||||||
|
console.log('Loading media content...');
|
||||||
|
|
||||||
return presentMediaFromTaylor(mediaData);
|
return presentMediaFromTaylor(mediaData);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { NextRequest, NextResponse } from 'next/server';
|
import { NextRequest, NextResponse } from 'next/server';
|
||||||
|
|
||||||
export function middleware(req: NextRequest) {
|
export function proxy(req: NextRequest) {
|
||||||
const url = req.nextUrl.clone();
|
const url = req.nextUrl.clone();
|
||||||
const path = url.pathname;
|
const path = url.pathname;
|
||||||
|
|
||||||
@ -1,7 +1,11 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "ES2017",
|
"target": "ES2017",
|
||||||
"lib": ["dom", "dom.iterable", "esnext"],
|
"lib": [
|
||||||
|
"dom",
|
||||||
|
"dom.iterable",
|
||||||
|
"esnext"
|
||||||
|
],
|
||||||
"allowJs": true,
|
"allowJs": true,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"strict": true,
|
"strict": true,
|
||||||
@ -11,23 +15,45 @@
|
|||||||
"moduleResolution": "bundler",
|
"moduleResolution": "bundler",
|
||||||
"resolveJsonModule": true,
|
"resolveJsonModule": true,
|
||||||
"isolatedModules": true,
|
"isolatedModules": true,
|
||||||
"jsx": "preserve",
|
"jsx": "react-jsx",
|
||||||
"incremental": true,
|
"incremental": true,
|
||||||
"types": ["node"],
|
"types": [
|
||||||
|
"node"
|
||||||
|
],
|
||||||
"plugins": [
|
"plugins": [
|
||||||
{
|
{
|
||||||
"name": "next"
|
"name": "next"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"paths": {
|
"paths": {
|
||||||
"@/*": ["./src/*"],
|
"@/*": [
|
||||||
"@/entities/*": ["./src/entities/*"],
|
"./src/*"
|
||||||
"@/features/*": ["./src/features/*"],
|
],
|
||||||
"@/shared/*": ["./src/shared/*"],
|
"@/entities/*": [
|
||||||
"@/widgets/*": ["./src/widgets/*"],
|
"./src/entities/*"
|
||||||
"@/pages-templates/*": ["./src/pages-templates/*"]
|
],
|
||||||
|
"@/features/*": [
|
||||||
|
"./src/features/*"
|
||||||
|
],
|
||||||
|
"@/shared/*": [
|
||||||
|
"./src/shared/*"
|
||||||
|
],
|
||||||
|
"@/widgets/*": [
|
||||||
|
"./src/widgets/*"
|
||||||
|
],
|
||||||
|
"@/pages-templates/*": [
|
||||||
|
"./src/pages-templates/*"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
|
"include": [
|
||||||
"exclude": ["node_modules"]
|
"next-env.d.ts",
|
||||||
|
"**/*.ts",
|
||||||
|
"**/*.tsx",
|
||||||
|
".next/types/**/*.ts",
|
||||||
|
".next/dev/types/**/*.ts"
|
||||||
|
],
|
||||||
|
"exclude": [
|
||||||
|
"node_modules"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user