From 0c2e2bca924f6ff43951dba5d7e2e2c0a74fa13d Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Wed, 28 Oct 2020 16:48:20 +0100
Subject: [PATCH] refactor: don't send ipcRenderer.sendSync() returnValue as an
 array (#26178)

---
 lib/browser/api/web-contents.ts       | 2 +-
 lib/renderer/api/ipc-renderer.ts      | 2 +-
 lib/renderer/ipc-renderer-internal.ts | 2 +-
 spec-main/chromium-spec.ts            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/browser/api/web-contents.ts b/lib/browser/api/web-contents.ts
index 3b065f413b62..4b4f8b16097f 100644
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -457,7 +457,7 @@ const addReplyInternalToEvent = (event: any) => {
 
 const addReturnValueToEvent = (event: any) => {
   Object.defineProperty(event, 'returnValue', {
-    set: (value) => event.sendReply([value]),
+    set: (value) => event.sendReply(value),
     get: () => {}
   });
 };
diff --git a/lib/renderer/api/ipc-renderer.ts b/lib/renderer/api/ipc-renderer.ts
index 49a94a4d800d..9f05f915d0b5 100644
--- a/lib/renderer/api/ipc-renderer.ts
+++ b/lib/renderer/api/ipc-renderer.ts
@@ -10,7 +10,7 @@ ipcRenderer.send = function (channel, ...args) {
 };
 
 ipcRenderer.sendSync = function (channel, ...args) {
-  return ipc.sendSync(internal, channel, args)[0];
+  return ipc.sendSync(internal, channel, args);
 };
 
 ipcRenderer.sendToHost = function (channel, ...args) {
diff --git a/lib/renderer/ipc-renderer-internal.ts b/lib/renderer/ipc-renderer-internal.ts
index bacc2c5720d3..dcb3d6fbd99a 100644
--- a/lib/renderer/ipc-renderer-internal.ts
+++ b/lib/renderer/ipc-renderer-internal.ts
@@ -10,7 +10,7 @@ ipcRendererInternal.send = function (channel, ...args) {
 };
 
 ipcRendererInternal.sendSync = function (channel, ...args) {
-  return ipc.sendSync(internal, channel, args)[0];
+  return ipc.sendSync(internal, channel, args);
 };
 
 ipcRendererInternal.sendTo = function (webContentsId, channel, ...args) {
diff --git a/spec-main/chromium-spec.ts b/spec-main/chromium-spec.ts
index 4e7c0aa769ab..5989328b0be9 100644
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -790,7 +790,7 @@ describe('chromium features', () => {
         });
         expect(await w.webContents.executeJavaScript(`(${function () {
           const { ipc } = process._linkedBinding('electron_renderer_ipc');
-          return ipc.sendSync(true, 'GUEST_WINDOW_MANAGER_WINDOW_OPEN', ['', '', ''])[0];
+          return ipc.sendSync(true, 'GUEST_WINDOW_MANAGER_WINDOW_OPEN', ['', '', '']);
         }})()`)).to.be.null();
         const exception = await uncaughtException;
         expect(exception.message).to.match(/denied: expected native window\.open/);