Fix importing linked packages (facebook#1884)

Resolves facebook#1661
Pong420 · Mar 23, 2017 · 853d88f · 853d88f
1 parent 995b750
commit 853d88f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
@@ -82,7 +82,9 @@ module.exports = {
     // We use `fallback` instead of `root` because we want `node_modules` to "win"
     // if there any conflicts. This matches Node resolution mechanism.
     // https://github.com/facebookincubator/create-react-app/issues/253
-    fallback: paths.nodePaths,
+    // We also fallback to the app's node_modules to support hoisted modules in a
+    // linked package workflow.
+    fallback: [paths.appNodeModules].concat(paths.nodePaths),
     // These are the reasonable defaults supported by the Node ecosystem.
     // We also include JSX as a common component filename extension to support
     // some tools, although we do not recommend using it, see:
@@ -99,6 +101,8 @@ module.exports = {
   // directory of `react-scripts` itself rather than the project directory.
   resolveLoader: {
     root: paths.ownNodeModules,
+    // Fallback to any hoisted modules when dealing with linked libraries
+    fallback: paths.appNodeModules,
     moduleTemplates: ['*-loader']
   },
   // @remove-on-eject-end

diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
@@ -86,7 +86,9 @@ module.exports = {
     // We use `fallback` instead of `root` because we want `node_modules` to "win"
     // if there any conflicts. This matches Node resolution mechanism.
     // https://github.com/facebookincubator/create-react-app/issues/253
-    fallback: paths.nodePaths,
+    // We also fallback to the app's node_modules to support hoisted modules in a
+    // linked package workflow.
+    fallback: [paths.appNodeModules].concat(paths.nodePaths),
     // These are the reasonable defaults supported by the Node ecosystem.
     // We also include JSX as a common component filename extension to support
     // some tools, although we do not recommend using it, see:
@@ -103,6 +105,8 @@ module.exports = {
   // directory of `react-scripts` itself rather than the project directory.
   resolveLoader: {
     root: paths.ownNodeModules,
+    // Fallback to any hoisted modules when dealing with linked libraries
+    fallback: paths.appNodeModules,
     moduleTemplates: ['*-loader']
   },
   // @remove-on-eject-end