Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/react-scripts/config/webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
6 changes: 5 additions & 1 deletion packages/react-scripts/config/webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down