Merge pull request #686 from weseek/imprv/merge-resolve-modules

merge resolve.modules of webpack.dev with that of webpack.common

config/webpack.common.js

@@ -58,7 +58,7 @@ module.exports = (options) => {
     },
     resolve: {
       extensions: ['.js', '.jsx', '.json'],
-      modules: [helpers.root('node_modules')],
+      modules: ((options.resolve && options.resolve.modules) || []).concat([helpers.root('node_modules')]),
       alias: {
         '@root': helpers.root('/'),
         '@commons': helpers.root('src/lib'),

config/webpack.dev.js

@@ -24,8 +24,7 @@ module.exports = require('./webpack.common')({
     'js/dev': './src/client/js/dev',
   },
   resolve: {
-    // TODO merge in webpack.common.js
-    modules: [path.join(process.env.HOME, '.node_modules')],
+    modules: ['../node_modules'],
   },
   module: {
     rules: [