From d8e5f315f1f67f651a3638ae07c78b76a2e0f2c5 Mon Sep 17 00:00:00 2001
From: Endilie Yacop Sucipto <endiliey@gmail.com>
Date: Tue, 23 Oct 2018 19:15:57 +0800
Subject: [PATCH] fix(v2): prioritize node_modules resolve (#1057)

---
 v2/lib/webpack/base.js            | 11 ++++-------
 v2/lib/webpack/loader/markdown.js |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/v2/lib/webpack/base.js b/v2/lib/webpack/base.js
index 2596b43f05..88fc422d4a 100644
--- a/v2/lib/webpack/base.js
+++ b/v2/lib/webpack/base.js
@@ -43,13 +43,10 @@ module.exports = function createBaseConfig(props, isServer) {
     .set('@build', outDir)
     .set('@generated', path.resolve(__dirname, '../core/generated'))
     .set('@core', path.resolve(__dirname, '../core'))
-    // For loading docs from custom paths where React is not available.
-    // TODO(yangshun): Change loader to convert return HTML instead of React component.
-    .set(
-      'DOCUSAURUS_NODE_MODULES_PATH_DO_NOT_USE_OR_YOU_WILL_BE_FIRED',
-      path.resolve(__dirname, '../../node_modules/'),
-    )
-    .end();
+    .end()
+    .modules // prioritize our own node modules
+    .add(path.resolve(__dirname, '../../node_modules'))
+    .add('node_modules');
 
   function applyBabel(rule) {
     rule
diff --git a/v2/lib/webpack/loader/markdown.js b/v2/lib/webpack/loader/markdown.js
index c38777a15c..42f398d16e 100644
--- a/v2/lib/webpack/loader/markdown.js
+++ b/v2/lib/webpack/loader/markdown.js
@@ -66,7 +66,7 @@ module.exports = function(fileString) {
 
   /* Return a React component */
   return `
-import React from 'DOCUSAURUS_NODE_MODULES_PATH_DO_NOT_USE_OR_YOU_WILL_BE_FIRED/react';
+import React from 'react';
 import Markdown from '@theme/Markdown';
 export default () => (
   <Markdown siteConfig={${JSON.stringify(siteConfig)}}>