The merge of origin/main left 13 conflict markers across 9 files under frontend/src/app, so 'next build' failed with 21 parse errors and the Docker frontend image never built. Resolution: - Keep the HEAD side (views + PageRuntime shell) for all 8 route pages. - Rebuild layout.tsx by hand: it mixed both sides outside the conflict blocks (Viewport/headers/langFromCookie were only imported on the merged-in side). Kept IconSprite/SiteHeader/SiteFooter/SiteBoot, the mock CSS order (shared -> map -> shell -> responsive), the vendored K2D and Leaflet links, and set lang="th" because i18n.ts sets document.documentElement.lang at runtime. Verified: tsc --noEmit clean, npm run build compiles and prerenders all 12 static + 5 dynamic routes.
7 lines
247 B
TypeScript
7 lines
247 B
TypeScript
/// <reference types="next" />
|
|
/// <reference types="next/image-types/global" />
|
|
import "./.next/types/routes.d.ts";
|
|
|
|
// NOTE: This file should not be edited
|
|
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
|