From 9fe326ebeb43ffb2c955945ca8b4a2135efb08c2 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sat, 3 Oct 2015 19:55:59 +0800
Subject: [PATCH] Clear node's global search paths

---
 atom/browser/lib/init.coffee  |  6 +++---
 atom/common/lib/init.coffee   | 13 ++-----------
 atom/renderer/lib/init.coffee |  6 +++---
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/atom/browser/lib/init.coffee b/atom/browser/lib/init.coffee
index 454baf0b8ac5..44ae29522ebf 100644
--- a/atom/browser/lib/init.coffee
+++ b/atom/browser/lib/init.coffee
@@ -7,14 +7,14 @@ Module = require 'module'
 # we need to restore it here.
 process.argv.splice 1, 1
 
+# Import common settings.
+require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')
+
 # Add browser/api/lib to module search paths, which contains javascript part of
 # Electron's built-in libraries.
 globalPaths = Module.globalPaths
 globalPaths.push path.resolve(__dirname, '..', 'api', 'lib')
 
-# Import common settings.
-require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')
-
 if process.platform is 'win32'
   # Redirect node's console to use our own implementations, since node can not
   # handle console output when running as GUI program.
diff --git a/atom/common/lib/init.coffee b/atom/common/lib/init.coffee
index acb635edeaa4..2bfea3d72afa 100644
--- a/atom/common/lib/init.coffee
+++ b/atom/common/lib/init.coffee
@@ -9,18 +9,9 @@ process.atomBinding = (name) ->
   catch e
     process.binding "atom_common_#{name}" if /No such module/.test e.message
 
-# Global module search paths.
+# Clear node's global search paths.
 globalPaths = Module.globalPaths
-
-# Don't lookup modules in user-defined search paths, see http://git.io/vf8sF.
-homeDir =
-  if process.platform is 'win32'
-    process.env.USERPROFILE
-  else
-    process.env.HOME
-if homeDir  # Node only add user-defined search paths when $HOME is defined.
-  userModulePath = path.resolve homeDir, '.node_modules'
-  globalPaths.splice globalPaths.indexOf(userModulePath), 2
+globalPaths.length = 0
 
 # Add common/api/lib to module search paths.
 globalPaths.push path.resolve(__dirname, '..', 'api', 'lib')
diff --git a/atom/renderer/lib/init.coffee b/atom/renderer/lib/init.coffee
index ff9b12ecbf3c..e5173fcd1ec8 100644
--- a/atom/renderer/lib/init.coffee
+++ b/atom/renderer/lib/init.coffee
@@ -7,14 +7,14 @@ Module = require 'module'
 # atom-renderer.js, we need to restore it here.
 process.argv.splice 1, 1
 
+# Import common settings.
+require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')
+
 # Add renderer/api/lib to require's search paths, which contains javascript part
 # of Atom's built-in libraries.
 globalPaths = Module.globalPaths
 globalPaths.push path.resolve(__dirname, '..', 'api', 'lib')
 
-# Import common settings.
-require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')
-
 # The global variable will be used by ipc for event dispatching
 v8Util = process.atomBinding 'v8_util'
 v8Util.setHiddenValue global, 'ipc', new events.EventEmitter