Skip to content

Commit 9d2aa6f

Browse files
kevinsawickialexeykuzmin
authored andcommitted
Upgrade to node 8.2.0
1 parent 9f8f95f commit 9d2aa6f

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

atom/browser/node_debugger.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ void NodeDebugger::Start() {
2727
node::DebugOptions options;
2828
for (auto& arg : base::CommandLine::ForCurrentProcess()->argv()) {
2929
#if defined(OS_WIN)
30-
options.ParseOption(base::UTF16ToUTF8(arg));
30+
options.ParseOption("Electron", base::UTF16ToUTF8(arg));
3131
#else
32-
options.ParseOption(arg);
32+
options.ParseOption("Electron", arg);
3333
#endif
3434
}
3535

atom/common/api/event_emitter_caller.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ v8::Local<v8::Value> CallMethodWithArgs(v8::Isolate* isolate,
2020
v8::MicrotasksScope::kRunMicrotasks);
2121
// Use node::MakeCallback to call the callback, and it will also run pending
2222
// tasks in Node.js.
23-
return node::MakeCallback(isolate, obj, method, args->size(), &args->front());
23+
return node::MakeCallback(isolate, obj, method, args->size(), &args->front(),
24+
0, 0).ToLocalChecked();
2425
}
2526

2627
} // namespace internal

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
'V8_BASE': '',
4444
'v8_postmortem_support': 'false',
4545
'v8_enable_i18n_support': 'false',
46-
'v8_inspector': 'true',
46+
'v8_enable_inspector': '1',
4747
},
4848
# Settings to compile node under Windows.
4949
'target_defaults': {

electron.gyp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@
233233
# We need to access internal implementations of Node.
234234
'NODE_WANT_INTERNALS=1',
235235
'NODE_SHARED_MODE',
236+
'HAVE_OPENSSL=1',
236237
'HAVE_INSPECTOR=1',
237238
# This is defined in skia/skia_common.gypi.
238239
'SK_SUPPORT_LEGACY_GETTOPDEVICE',

vendor/node

Submodule node updated 10805 files

0 commit comments

Comments
 (0)