From 6b3d94a1551f8623c95363d0ebc0efcfff92f5c5 Mon Sep 17 00:00:00 2001
From: Yorkie Liu <yorkiefixer@gmail.com>
Date: Tue, 22 Mar 2022 11:53:11 +0800
Subject: [PATCH] feat(core): allow configureWebpack to return undefined
 (#6784)

* plugin: not acquire configureWebpack to return

* type fix

* add test

* remove type

Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
---
 packages/docusaurus/src/webpack/__tests__/utils.test.ts | 2 +-
 packages/docusaurus/src/webpack/utils.ts                | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/docusaurus/src/webpack/__tests__/utils.test.ts b/packages/docusaurus/src/webpack/__tests__/utils.test.ts
index 3b58b57d22..85a80f2ca5 100644
--- a/packages/docusaurus/src/webpack/__tests__/utils.test.ts
+++ b/packages/docusaurus/src/webpack/__tests__/utils.test.ts
@@ -74,7 +74,7 @@ describe('extending generated webpack config', () => {
           filename: 'new.bundle.js',
         };
       }
-      return {};
+      // Implicitly returning undefined to test null-safety
     };
 
     config = applyConfigureWebpack(configureWebpack, config, false, undefined, {
diff --git a/packages/docusaurus/src/webpack/utils.ts b/packages/docusaurus/src/webpack/utils.ts
index 14568c890d..f9626b8196 100644
--- a/packages/docusaurus/src/webpack/utils.ts
+++ b/packages/docusaurus/src/webpack/utils.ts
@@ -184,12 +184,8 @@ export function applyConfigureWebpack(
     getJSLoader: getCustomizableJSLoader(jsLoader),
   };
   if (typeof configureWebpack === 'function') {
-    const {mergeStrategy, ...res} = configureWebpack(
-      config,
-      isServer,
-      utils,
-      content,
-    );
+    const {mergeStrategy, ...res} =
+      configureWebpack(config, isServer, utils, content) ?? {};
     if (res && typeof res === 'object') {
       const customizeRules = mergeStrategy ?? {};
       return mergeWithCustomize({