From 60ec4def1e3627f9691c2d7544971358cf0f81aa Mon Sep 17 00:00:00 2001
From: Arunoda Susiripala <arunoda.susiripala@gmail.com>
Date: Sun, 15 Jan 2017 21:40:14 -0800
Subject: [PATCH] Add NODE_PATH support for resolveLoaders as well. (#778)

* Add NODE_PATH support for resolveLoaders as well.

* Remove unwanted code.
---
 server/build/webpack.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/server/build/webpack.js b/server/build/webpack.js
index 84fe71dda9672..4ce5ea762cfe8 100644
--- 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,