Просмотр исходного кода

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

utsushiiro 7 лет назад
Родитель
Сommit
be91cd4d6a
2 измененных файлов с 1 добавлено и 2 удалено
  1. 1 1
      config/webpack.common.js
  2. 0 1
      config/webpack.dev.js

+ 1 - 1
config/webpack.common.js

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

+ 0 - 1
config/webpack.dev.js

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