From 9f2619a87680c1baa21f62826ee6f6a4bd8ce8b8 Mon Sep 17 00:00:00 2001 From: alma Date: Sun, 11 Jan 2026 10:12:53 +0100 Subject: [PATCH] Resolve conflicts after pull (keep origin/main) --- next-env.d.ts | 2 +- next.config.mjs | 21 ++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/next-env.d.ts b/next-env.d.ts index c4b7818..9edff1c 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -1,6 +1,6 @@ /// /// -import "./.next/dev/types/routes.d.ts"; +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. diff --git a/next.config.mjs b/next.config.mjs index be7def7..97e5836 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -1,20 +1,5 @@ /** @type {import('next').NextConfig} */ const nextConfig = { - // Turbopack configuration (Next.js 16+) - turbopack: { - resolveAlias: { - buffer: 'buffer/', - stream: 'stream-browserify', - util: 'util/', - }, - }, - - // Allow cross-origin requests from the reverse proxy domain - allowedDevOrigins: [ - 'hub.slm-lab.net', - 'https://hub.slm-lab.net', - ], - eslint: { ignoreDuringBuilds: true, }, @@ -24,6 +9,12 @@ const nextConfig = { images: { unoptimized: true, }, + experimental: { + webpackBuildWorker: true, + parallelServerBuildTraces: true, + parallelServerCompiles: true, + }, + turbopack: {}, async headers() { return [ {