From 7110ca96eae91f6db485b01c8a38dcc17b190a5d Mon Sep 17 00:00:00 2001
From: endiliey <endiliey@gmail.com>
Date: Wed, 30 Oct 2019 12:28:31 +0700
Subject: [PATCH 1/2] fix(v2): regression from prioritizing core node_modules
 logic

---
 packages/docusaurus-theme-classic/src/theme/Navbar/index.js | 1 +
 packages/docusaurus/src/webpack/base.ts                     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
index fd4f323679cb..260b826a8296 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
@@ -23,6 +23,7 @@ import styles from './styles.module.css';
 
 function NavLink(props) {
   const toUrl = useBaseUrl(props.to);
+  console.log(toUrl);
   return (
     <Link
       className="navbar__item navbar__link"
diff --git a/packages/docusaurus/src/webpack/base.ts b/packages/docusaurus/src/webpack/base.ts
index ce6ea57a04a1..2b20a055453f 100644
--- a/packages/docusaurus/src/webpack/base.ts
+++ b/packages/docusaurus/src/webpack/base.ts
@@ -54,9 +54,11 @@ export function createBaseConfig(
       // We want `@docusaurus/core` own dependencies/`node_modules` to "win" if there is conflict
       // Example: if there is core-js@3 in user's own node_modules, but core depends on
       // core-js@2, we should use core-js@2.
-      modules: module.paths.concat([
+      modules: [
+        path.resolve(__dirname, '..', '..', 'node_modules'),
+        'node_modules',
         path.resolve(fs.realpathSync(process.cwd()), 'node_modules'),
-      ]),
+      ],
     },
     optimization: {
       removeAvailableModules: false,

From 556f94989150dbe26af71e3d3527d119c7982e5e Mon Sep 17 00:00:00 2001
From: endiliey <endiliey@gmail.com>
Date: Wed, 30 Oct 2019 12:50:47 +0700
Subject: [PATCH 2/2] nits

---
 packages/docusaurus-theme-classic/src/theme/Navbar/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
index 260b826a8296..fd4f323679cb 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/index.js
@@ -23,7 +23,6 @@ import styles from './styles.module.css';
 
 function NavLink(props) {
   const toUrl = useBaseUrl(props.to);
-  console.log(toUrl);
   return (
     <Link
       className="navbar__item navbar__link"