From 66aed36f525717defad4253f9de702af3dcfcd7d Mon Sep 17 00:00:00 2001
From: Stefan Probst <stefanprobst@kolabnow.com>
Date: Sun, 8 Aug 2021 12:54:11 +0200
Subject: [PATCH 1/3] chore: add missing poweredByHeader field to NextConfig
 type

---
 packages/next/build/entries.ts        | 2 +-
 packages/next/server/config-shared.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/next/build/entries.ts b/packages/next/build/entries.ts
index 90158e859616220..b9705c2d0a964a8 100644
--- a/packages/next/build/entries.ts
+++ b/packages/next/build/entries.ts
@@ -91,7 +91,7 @@ export function createEntrypoints(
     buildId,
     assetPrefix: config.assetPrefix,
     generateEtags: config.generateEtags ? 'true' : '',
-    poweredByHeader: config.poweredByHeader,
+    poweredByHeader: config.poweredByHeader ? 'true' : '',
     canonicalBase: config.amp.canonicalBase || '',
     basePath: config.basePath,
     runtimeConfig: hasRuntimeConfig
diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
index f8a7e7f41888cdd..2a0184f7ce1297e 100644
--- a/packages/next/server/config-shared.ts
+++ b/packages/next/server/config-shared.ts
@@ -58,6 +58,7 @@ export type NextConfig = { [key: string]: any } & {
   generateEtags?: boolean
   pageExtensions?: string[]
   compress?: boolean
+  poweredByHeader?: boolean
   images?: ImageConfig
   devIndicators?: {
     buildActivity?: boolean

From 08f551d45cf10895c71d8a0d686253a0093c3991 Mon Sep 17 00:00:00 2001
From: Stefan Probst <stefanprobst@kolabnow.com>
Date: Mon, 9 Aug 2021 10:33:48 +0200
Subject: [PATCH 2/3] chore: add missing webpack field to NextConfig type

---
 packages/next/server/config-shared.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
index 2a0184f7ce1297e..86750ecb695226f 100644
--- a/packages/next/server/config-shared.ts
+++ b/packages/next/server/config-shared.ts
@@ -1,6 +1,7 @@
 import os from 'os'
 import { Header, Redirect, Rewrite } from '../lib/load-custom-routes'
 import { ImageConfig, imageConfigDefault } from './image-config'
+import type webpack from 'webpack'
 
 type NoOptionals<T> = {
   [P in keyof T]-?: T[P]
@@ -48,6 +49,22 @@ export type NextConfig = { [key: string]: any } & {
   webpack5?: false
   excludeDefaultMomentLocales?: boolean
 
+  webpack?:
+    | ((
+        config: webpack.Configuration,
+        context: {
+          dir: string
+          dev: boolean
+          isServer: boolean
+          buildId: string
+          config: NextConfigComplete
+          defaultLoaders: { babel: webpack.RuleSetUseItem }
+          totalPages: number
+          webpack: typeof webpack
+        }
+      ) => webpack.Configuration)
+    | null
+
   trailingSlash?: boolean
   env?: { [key: string]: string }
   distDir?: string

From f84b96e9312e6af762643015937c63156f3c17a9 Mon Sep 17 00:00:00 2001
From: Stefan Probst <stefanprobst@kolabnow.com>
Date: Thu, 12 Aug 2021 15:37:54 +0200
Subject: [PATCH 3/3] fix: don't use webpack type

---
 packages/next/server/config-shared.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
index 86750ecb695226f..91eb7c7a25ddaf5 100644
--- a/packages/next/server/config-shared.ts
+++ b/packages/next/server/config-shared.ts
@@ -1,7 +1,6 @@
 import os from 'os'
 import { Header, Redirect, Rewrite } from '../lib/load-custom-routes'
 import { ImageConfig, imageConfigDefault } from './image-config'
-import type webpack from 'webpack'
 
 type NoOptionals<T> = {
   [P in keyof T]-?: T[P]
@@ -51,18 +50,18 @@ export type NextConfig = { [key: string]: any } & {
 
   webpack?:
     | ((
-        config: webpack.Configuration,
+        config: any,
         context: {
           dir: string
           dev: boolean
           isServer: boolean
           buildId: string
           config: NextConfigComplete
-          defaultLoaders: { babel: webpack.RuleSetUseItem }
+          defaultLoaders: { babel: any }
           totalPages: number
-          webpack: typeof webpack
+          webpack: any
         }
-      ) => webpack.Configuration)
+      ) => any)
     | null
 
   trailingSlash?: boolean