Add NODE_PATH support for resolveLoaders as well. (#778)

* Add NODE_PATH support for resolveLoaders as well. * Remove unwanted code.
vercel · Jan 16, 2017 · 60ec4de · 60ec4de
1 parent 0d6ceec
commit 60ec4de
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/server/build/webpack.js b/server/build/webpack.js
@@ -103,6 +103,10 @@ export default async function createCompiler (dir, { dev = false, quiet = false
     )
   }
 
+  const nodePathList = (process.env.NODE_PATH || '')
+    .split(process.platform === 'win32' ? ';' : ':')
+    .filter((p) => !!p)
+
   const mainBabelOptions = {
     babelrc: true,
     cacheDirectory: true,
@@ -185,18 +189,16 @@ export default async function createCompiler (dir, { dev = false, quiet = false
     resolve: {
       modules: [
         nextNodeModulesDir,
-        'node_modules'
-      ].concat(
-        (process.env.NODE_PATH || '')
-        .split(process.platform === 'win32' ? ';' : ':')
-        .filter((p) => !!p)
-      )
+        'node_modules',
+        ...nodePathList
+      ]
     },
     resolveLoader: {
       modules: [
         nextNodeModulesDir,
         'node_modules',
-        join(__dirname, 'loaders')
+        join(__dirname, 'loaders'),
+        ...nodePathList
       ]
     },
     plugins,