Merge pull request #83 from easyops-cn/steve/fix-webpack-v5

fix(): support webpack v5 since docusaurus v2 alpha 75
easyops-cn · May 8, 2021 · ec0d818 · ec0d818
2 parents f0de00f + 5d1810b
commit ec0d818
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/client/theme/SearchBar/SearchBar.tsx b/src/client/theme/SearchBar/SearchBar.tsx
@@ -25,9 +25,16 @@ import LoadingRing from "../LoadingRing/LoadingRing";
 import styles from "./SearchBar.module.css";
 
 async function fetchAutoCompleteJS(): Promise<any> {
-  const autoComplete = await import("@easyops-cn/autocomplete.js");
-  autoComplete.noConflict();
-  return autoComplete.default;
+  const autoCompleteModule = await import("@easyops-cn/autocomplete.js");
+  const autoComplete = autoCompleteModule.default;
+  if (autoComplete.noConflict) {
+    // For webpack v5 since docusaurus v2.0.0-alpha.75
+    autoComplete.noConflict();
+  } else if (autoCompleteModule.noConflict) {
+    // For webpack v4 before docusaurus v2.0.0-alpha.74
+    autoCompleteModule.noConflict();
+  }
+  return autoComplete;
 }
 
 const SEARCH_PARAM_HIGHLIGHT = "_highlight";