3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-05-14 17:47:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(v2): prioritize node_modules resolve (#1057)

Browse source
This commit is contained in:
Endilie Yacop Sucipto 2018-10-23 19:15:57 +08:00 • committed by Yangshun Tay
parent 5d60739f7c
commit d8e5f315f1
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
v2/lib/webpack/base.js
View file

@ -43,13 +43,10 @@ module.exports = function createBaseConfig(props, isServer) {
.set('@build', outDir) .set('@build', outDir)
.set('@generated', path.resolve(__dirname, '../core/generated')) .set('@generated', path.resolve(__dirname, '../core/generated'))
.set('@core', path.resolve(__dirname, '../core')) .set('@core', path.resolve(__dirname, '../core'))
// For loading docs from custom paths where React is not available. .end()
// TODO(yangshun): Change loader to convert return HTML instead of React component. .modules // prioritize our own node modules
.set( .add(path.resolve(__dirname, '../../node_modules'))
'DOCUSAURUS_NODE_MODULES_PATH_DO_NOT_USE_OR_YOU_WILL_BE_FIRED', .add('node_modules');
path.resolve(__dirname, '../../node_modules/'),
)
.end();
function applyBabel(rule) { function applyBabel(rule) {
rule rule

2
v2/lib/webpack/loader/markdown.js
View file

@ -66,7 +66,7 @@ module.exports = function(fileString) {
/* Return a React component */ /* Return a React component */
return ` 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'; import Markdown from '@theme/Markdown';
export default () => ( export default () => (
<Markdown siteConfig={${JSON.stringify(siteConfig)}}> <Markdown siteConfig={${JSON.stringify(siteConfig)}}>