From 2b870ad37999f304e275ff97731c85149bc780e2 Mon Sep 17 00:00:00 2001 From: PepijnSenders Date: Mon, 17 May 2021 17:28:33 -0400 Subject: [PATCH 1/2] Make next.config.js keys optional --- packages/next/next-server/server/config-shared.ts | 10 +++++----- packages/next/next-server/server/next-server.ts | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/next/next-server/server/config-shared.ts b/packages/next/next-server/server/config-shared.ts index 42976289ee886..7234dfeda8af2 100644 --- a/packages/next/next-server/server/config-shared.ts +++ b/packages/next/next-server/server/config-shared.ts @@ -57,12 +57,12 @@ export type NextConfig = { [key: string]: any } & { validator?: string skipValidation?: boolean } - turboMode: boolean + turboMode?: boolean eslint?: boolean - reactRoot: boolean - enableBlurryPlaceholder: boolean - disableOptimizedLoading: boolean - gzipSize: boolean + reactRoot?: boolean + enableBlurryPlaceholder?: boolean + disableOptimizedLoading?: boolean + gzipSize?: boolean } } diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts index edb480402608a..d43ba652e0d74 100644 --- a/packages/next/next-server/server/next-server.ts +++ b/packages/next/next-server/server/next-server.ts @@ -157,7 +157,7 @@ export default class Server { images: string fontManifest: FontManifest optimizeImages: boolean - disableOptimizedLoading: boolean + disableOptimizedLoading?: boolean optimizeCss: any locale?: string locales?: string[] @@ -219,7 +219,7 @@ export default class Server { optimizeImages: !!this.nextConfig.experimental.optimizeImages, optimizeCss: this.nextConfig.experimental.optimizeCss, disableOptimizedLoading: this.nextConfig.experimental - .disableOptimizedLoading, + ?.disableOptimizedLoading, domainLocales: this.nextConfig.i18n?.domains, distDir: this.distDir, } From be3123e1e9f10f80c6e2021c5b7ff64340d0d053 Mon Sep 17 00:00:00 2001 From: Pepijn Senders Date: Mon, 17 May 2021 17:54:22 -0400 Subject: [PATCH 2/2] Update next-server.ts --- packages/next/next-server/server/next-server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts index d43ba652e0d74..d9fb26c72d8bb 100644 --- a/packages/next/next-server/server/next-server.ts +++ b/packages/next/next-server/server/next-server.ts @@ -219,7 +219,7 @@ export default class Server { optimizeImages: !!this.nextConfig.experimental.optimizeImages, optimizeCss: this.nextConfig.experimental.optimizeCss, disableOptimizedLoading: this.nextConfig.experimental - ?.disableOptimizedLoading, + .disableOptimizedLoading, domainLocales: this.nextConfig.i18n?.domains, distDir: this.distDir, }