mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ELECTRON_DISABLE_OLD_STYLE_MODULES env

Browse source
This commit is contained in:
Cheng Zhao 2015-11-12 17:02:04 +08:00
parent c2c09daa23
commit f9d7e7ce55
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/lib/init.coffee
View file

@ -13,12 +13,13 @@ require path.resolve(__dirname, '..', '..', 'common', 'lib', 'reset-search-paths
# Import common settings. # Import common settings.
require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init') require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')
# Add browser/api/lib to module search paths, which contains javascript part of # Expose public APIs.
# Electron's built-in libraries.
globalPaths = Module.globalPaths globalPaths = Module.globalPaths
globalPaths.push path.resolve(__dirname, '..', 'api', 'lib')
globalPaths.push path.resolve(__dirname, '..', 'api', 'lib', 'exports') globalPaths.push path.resolve(__dirname, '..', 'api', 'lib', 'exports')
unless process.env.ELECTRON_DISABLE_OLD_STYLE_MODULES
globalPaths.push path.resolve(__dirname, '..', 'api', 'lib')
if process.platform is 'win32' if process.platform is 'win32'
# Redirect node's console to use our own implementations, since node can not # Redirect node's console to use our own implementations, since node can not
# handle console output when running as GUI program. # handle console output when running as GUI program.

1
atom/common/lib/init.coffee
View file

@ -9,6 +9,7 @@ process.atomBinding = (name) ->
catch e catch e
process.binding "atom_common_#{name}" if /No such module/.test e.message process.binding "atom_common_#{name}" if /No such module/.test e.message
unless process.env.ELECTRON_DISABLE_OLD_STYLE_MODULES
# Add common/api/lib to module search paths. # Add common/api/lib to module search paths.
Module.globalPaths.push path.resolve(__dirname, '..', 'api', 'lib') Module.globalPaths.push path.resolve(__dirname, '..', 'api', 'lib')

7
atom/renderer/lib/init.coffee
View file

@ -13,12 +13,13 @@ require path.resolve(__dirname, '..', '..', 'common', 'lib', 'reset-search-paths
# Import common settings. # Import common settings.
require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init') require path.resolve(__dirname, '..', '..', 'common', 'lib', 'init')
# Add renderer/api/lib to require's search paths, which contains javascript part # Expose public APIs.
# of Atom's built-in libraries.
globalPaths = Module.globalPaths globalPaths = Module.globalPaths
globalPaths.push path.resolve(__dirname, '..', 'api', 'lib')
globalPaths.push path.resolve(__dirname, '..', 'api', 'lib', 'exports') globalPaths.push path.resolve(__dirname, '..', 'api', 'lib', 'exports')
unless process.env.ELECTRON_DISABLE_OLD_STYLE_MODULES
globalPaths.push path.resolve(__dirname, '..', 'api', 'lib')
# The global variable will be used by ipc for event dispatching # The global variable will be used by ipc for event dispatching
v8Util = process.atomBinding 'v8_util' v8Util = process.atomBinding 'v8_util'
v8Util.setHiddenValue global, 'ipc', new events.EventEmitter v8Util.setHiddenValue global, 'ipc', new events.EventEmitter