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

Upgrade to node 8.2.0

Browse source
This commit is contained in:
Kevin Sawicki 2017-07-11 10:09:02 -07:00 committed by Aleksei Kuzmin
parent 9f8f95f4c9
commit 9d2aa6f1c7
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/node_debugger.cc
View file

@ -27,9 +27,9 @@ void NodeDebugger::Start() {
node::DebugOptions options; node::DebugOptions options;
for (auto& arg : base::CommandLine::ForCurrentProcess()->argv()) { for (auto& arg : base::CommandLine::ForCurrentProcess()->argv()) {
#if defined(OS_WIN) #if defined(OS_WIN)
options.ParseOption(base::UTF16ToUTF8(arg)); options.ParseOption("Electron", base::UTF16ToUTF8(arg));
#else #else
options.ParseOption(arg); options.ParseOption("Electron", arg);
#endif #endif
} }

3
atom/common/api/event_emitter_caller.cc
View file

@ -20,7 +20,8 @@ v8::Local<v8::Value> CallMethodWithArgs(v8::Isolate* isolate,
v8::MicrotasksScope::kRunMicrotasks); v8::MicrotasksScope::kRunMicrotasks);
// Use node::MakeCallback to call the callback, and it will also run pending // Use node::MakeCallback to call the callback, and it will also run pending
// tasks in Node.js. // tasks in Node.js.
return node::MakeCallback(isolate, obj, method, args->size(), &args->front()); return node::MakeCallback(isolate, obj, method, args->size(), &args->front(),
0, 0).ToLocalChecked();
} }
} // namespace internal } // namespace internal

2
common.gypi
View file

@ -43,7 +43,7 @@
'V8_BASE': '', 'V8_BASE': '',
'v8_postmortem_support': 'false', 'v8_postmortem_support': 'false',
'v8_enable_i18n_support': 'false', 'v8_enable_i18n_support': 'false',
'v8_inspector': 'true', 'v8_enable_inspector': '1',
}, },
# Settings to compile node under Windows. # Settings to compile node under Windows.
'target_defaults': { 'target_defaults': {

1
electron.gyp
View file

@ -233,6 +233,7 @@
# We need to access internal implementations of Node. # We need to access internal implementations of Node.
'NODE_WANT_INTERNALS=1', 'NODE_WANT_INTERNALS=1',
'NODE_SHARED_MODE', 'NODE_SHARED_MODE',
'HAVE_OPENSSL=1',
'HAVE_INSPECTOR=1', 'HAVE_INSPECTOR=1',
# This is defined in skia/skia_common.gypi. # This is defined in skia/skia_common.gypi.
'SK_SUPPORT_LEGACY_GETTOPDEVICE', 'SK_SUPPORT_LEGACY_GETTOPDEVICE',

2
vendor/node vendored

@ -1 +1 @@
Subproject commit dfa72e2c73e0442d27746e0f8716d0427f7f9b27 Subproject commit 9169f032c096294a00d9b73ad3df607c567240c5