update webpack css include path, allow files to be loaded from the pr…

…oject root node_modules folder. (#178)
facebook · Jul 25, 2016 · d69ee27 · d69ee27
1 parent 90d49f8
commit d69ee27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
@@ -24,6 +24,7 @@ if (isInDebugMode) {
   relativePath = '../template';
 }
 var srcPath = path.resolve(__dirname, relativePath, 'src');
+var rootNodeModulesPath = path.resolve(__dirname, relativePath, 'node_modules');
 var nodeModulesPath = path.join(__dirname, '..', 'node_modules');
 var indexHtmlPath = path.resolve(__dirname, relativePath, 'index.html');
 var faviconPath = path.resolve(__dirname, relativePath, 'favicon.ico');
@@ -67,7 +68,7 @@ module.exports = {
       },
       {
         test: /\.css$/,
-        include: [srcPath, nodeModulesPath],
+        include: [srcPath, rootNodeModulesPath],
         loader: 'style!css!postcss'
       },
       {

diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
@@ -23,6 +23,7 @@ if (process.argv[2] === '--debug-template') {
   relativePath = '../template';
 }
 var srcPath = path.resolve(__dirname, relativePath, 'src');
+var rootNodeModulesPath = path.resolve(__dirname, relativePath, 'node_modules');
 var nodeModulesPath = path.join(__dirname, '..', 'node_modules');
 var indexHtmlPath = path.resolve(__dirname, relativePath, 'index.html');
 var faviconPath = path.resolve(__dirname, relativePath, 'favicon.ico');
@@ -68,7 +69,7 @@ module.exports = {
       },
       {
         test: /\.css$/,
-        include: [srcPath, nodeModulesPath],
+        include: [srcPath, rootNodeModulesPath],
         // Disable autoprefixer in css-loader itself:
         // https://github.com/webpack/css-loader/issues/281
         // We already have it thanks to postcss.