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>
facebook · Mar 22, 2022 · 6b3d94a · 6b3d94a
1 parent 1777fc4
commit 6b3d94a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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({