chore(deps): Bump electron to 19 for setBackgroundColor fix

Since https://github.com/electron/electron/pull/33435 has landed in
electron 19 alpha, but not in 18, moving to 19 lets us remove the
workarounds for setBackgroundColor.

Signed-off-by: Kristóf Marussy <kristof@marussy.com>

8 files changed, 20 insertions, 104 deletions

diff --git a/package.json b/package.json
index 1ade0bb..adeb6ff 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@vitejs/plugin-react": "^1.3.1",
     "chokidar": "^3.5.3",
     "cross-env": "^7.0.3",
-    "electron": "18.0.3",
+    "electron": "^19.0.0-alpha.1",
     "electron-builder": "^23.0.6",
     "esbuild": "^0.14.36",
     "eslint": "^8.13.0",
diff --git a/packages/main/package.json b/packages/main/package.json
index 4ebc994..b8e00c8 100644
--- a/packages/main/package.json
+++ b/packages/main/package.json
@@ -12,7 +12,7 @@
     "@sophie/shared": "workspace:*",
     "chalk": "^5.0.1",
     "deep-equal": "^2.0.5",
-    "electron": "18.0.3",
+    "electron": "^19.0.0-alpha.1",
     "fs-extra": "^10.0.1",
     "i18next": "^21.6.16",
     "json5": "^2.2.1",
diff --git a/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts b/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts
index 6144d89..edc6592 100644
--- a/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts
+++ b/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts
@@ -153,7 +153,6 @@ export default class ElectronMainWindow implements MainWindow {
     }
     if (serviceView instanceof ElectronServiceView) {
       this.browserWindow.setBrowserView(serviceView.browserView);
-      serviceView.browserView.setBackgroundColor('#fff');
       return;
     }
     throw new TypeError(
diff --git a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
index 340c523..2e64269 100644
--- a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
+++ b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts
@@ -55,6 +55,8 @@ export default class ElectronServiceView implements ServiceView {
       },
     });
 
+    this.browserView.setBackgroundColor('#fff');
+
     const { webContents } = this.browserView;
 
     function setLocation(url: string) {
diff --git a/packages/preload/package.json b/packages/preload/package.json
index ce6d433..5e5f0bf 100644
--- a/packages/preload/package.json
+++ b/packages/preload/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@sophie/shared": "workspace:*",
-    "electron": "18.0.3",
+    "electron": "^19.0.0-alpha.1",
     "i18next": "^21.6.16",
     "loglevel": "^1.8.0",
     "mobx": "^6.5.0",
diff --git a/packages/service-preload/package.json b/packages/service-preload/package.json
index 4650f10..28d1129 100644
--- a/packages/service-preload/package.json
+++ b/packages/service-preload/package.json
@@ -10,8 +10,7 @@
   "dependencies": {
     "@sophie/service-inject": "workspace:*",
     "@sophie/service-shared": "workspace:*",
-    "color-string": "^1.9.0",
-    "electron": "18.0.3"
+    "electron": "^19.0.0-alpha.1"
   },
   "devDependencies": {
     "@types/color-string": "^1.5.2"
diff --git a/packages/service-preload/src/index.ts b/packages/service-preload/src/index.ts
index 99d02ec..eee8551 100644
--- a/packages/service-preload/src/index.ts
+++ b/packages/service-preload/src/index.ts
@@ -18,67 +18,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import colorString from 'color-string';
 import { webFrame } from 'electron';
 // eslint-disable-next-line import/no-unresolved -- Synthetic import provided by an eslint plugin.
 import injectSource from 'sophie-src:@sophie/service-inject';
 
-const DEFAULT_BG_COLOR = '#fff';
-
-/**
- * Styles a HTML element such that its background is opaque.
- *
- * If there is an existing background color, it will be made maximally opaque.
- *
- * If there is a background image, transparent areas will be colored `DEFAULT_BG_COLOR`.
- *
- * If the element was completely transparent, the function returns `false` instead.
- * This allows leaving a `html` element transparent to let the background of the `body`
- * element render in its palce.
- *
- * @param element The HTML element to style.
- * @returns `true` if the background was made opaque.
- * @see https://www.w3.org/TR/css-backgrounds-3/#body-background
- */
-function tryMakeOpaque(element: HTMLElement): boolean {
-  const style = getComputedStyle(element);
-  const bgColor = colorString.get.rgb(style.backgroundColor);
-  if (bgColor[3] > 0) {
-    if (bgColor[3] < 1) {
-      bgColor[3] = 1;
-      // eslint-disable-next-line no-param-reassign -- Deliberately add element style.
-      element.style.backgroundColor = colorString.to.rgb(bgColor);
-    }
-    return true;
-  }
-  if (style.backgroundImage !== 'none') {
-    // eslint-disable-next-line no-param-reassign -- Deliberately add element style.
-    element.style.backgroundColor = DEFAULT_BG_COLOR;
-    return true;
-  }
-  return false;
-}
-
-if (webFrame.parent === null) {
-  // Inject CSS to simulate `browserView.setBackgroundColor`.
-  // This is injected before the page loads, so the styles from the website will overwrite it.
-  document.addEventListener('DOMContentLoaded', () => {
-    if (
-      document.documentElement.style.contain === '' &&
-      document.body.style.contain === ''
-    ) {
-      if (
-        !tryMakeOpaque(document.documentElement) &&
-        !tryMakeOpaque(document.body)
-      ) {
-        document.body.style.backgroundColor = DEFAULT_BG_COLOR;
-      }
-    } else if (!tryMakeOpaque(document.documentElement)) {
-      document.documentElement.style.backgroundColor = DEFAULT_BG_COLOR;
-    }
-  });
-}
-
 /**
  * Executes the service inject script in the isolated world.
  *
diff --git a/yarn.lock b/yarn.lock
index b4ee4e1..a2b3cd1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -507,9 +507,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@electron/get@npm:^1.13.0":
-  version: 1.13.1
-  resolution: "@electron/get@npm:1.13.1"
+"@electron/get@npm:^1.14.1":
+  version: 1.14.1
+  resolution: "@electron/get@npm:1.14.1"
   dependencies:
     debug: ^4.1.1
     env-paths: ^2.2.0
@@ -525,7 +525,7 @@ __metadata:
       optional: true
     global-tunnel-ng:
       optional: true
-  checksum: ea9863b73e8aedefb19cfe9b849c585b8bda29e11b90189b115680da4e9ab0167405efe63e5d141da2d13cde24eacacfde62f730f2730d047e58819fe69352f8
+  checksum: 21fec5e82bbee8f9fa183b46e05675b137c3130c7999d3b2b34a0047d1a06ec3c76347b9bbdb9911ba9b2123697804e360a15dda9db614c0226d5d4dcc4d6d15
   languageName: node
   linkType: hard
 
@@ -1273,7 +1273,7 @@ __metadata:
     "@types/source-map-support": ^0.5.4
     chalk: ^5.0.1
     deep-equal: ^2.0.5
-    electron: 18.0.3
+    electron: ^19.0.0-alpha.1
     electron-devtools-installer: ^3.2.0
     esbuild: ^0.14.36
     fs-extra: ^10.0.1
@@ -1302,7 +1302,7 @@ __metadata:
     "@jest/globals": ^27.5.1
     "@sophie/shared": "workspace:*"
     "@types/jest": ^27.4.1
-    electron: 18.0.3
+    electron: ^19.0.0-alpha.1
     i18next: ^21.6.16
     jest: ^27.5.1
     jest-mock: ^27.5.1
@@ -1363,8 +1363,7 @@ __metadata:
     "@sophie/service-inject": "workspace:*"
     "@sophie/service-shared": "workspace:*"
     "@types/color-string": ^1.5.2
-    color-string: ^1.9.0
-    electron: 18.0.3
+    electron: ^19.0.0-alpha.1
   languageName: unknown
   linkType: soft
 
@@ -2876,23 +2875,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"color-name@npm:^1.0.0, color-name@npm:~1.1.4":
+"color-name@npm:~1.1.4":
   version: 1.1.4
   resolution: "color-name@npm:1.1.4"
   checksum: b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610
   languageName: node
   linkType: hard
 
-"color-string@npm:^1.9.0":
-  version: 1.9.0
-  resolution: "color-string@npm:1.9.0"
-  dependencies:
-    color-name: ^1.0.0
-    simple-swizzle: ^0.2.2
-  checksum: 93c6678b847f8cfa47d19677fd19e1d4b19d7a33f100644400357c298266080b5bca64e5f874fa8ac8cc0aa0606ad44f7a838b4e6fd05e6affea190a68555bb4
-  languageName: node
-  linkType: hard
-
 "color-support@npm:^1.1.2":
   version: 1.1.3
   resolution: "color-support@npm:1.1.3"
@@ -3528,16 +3517,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron@npm:18.0.3":
-  version: 18.0.3
-  resolution: "electron@npm:18.0.3"
+"electron@npm:^19.0.0-alpha.1":
+  version: 19.0.0-alpha.1
+  resolution: "electron@npm:19.0.0-alpha.1"
   dependencies:
-    "@electron/get": ^1.13.0
+    "@electron/get": ^1.14.1
     "@types/node": ^16.11.26
     extract-zip: ^1.0.3
   bin:
     electron: cli.js
-  checksum: 3a3e21748d44c7e83719808b3a8494895c9f9ef76aed644fe792ec45d6009d3177077253ae88f9a22a0abb2add166ec8cd13435e1961d15516d00002441f7a1d
+  checksum: 47cc4d9e34246e787421ca1dfa5a0b98c02f4d2882d6074d55a14492bff1a590c467e6c6d647a80eca27265bd7d5cc1b13876ee958525c2dc0daafe7e9cccb93
   languageName: node
   linkType: hard
 
@@ -5236,13 +5225,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-arrayish@npm:^0.3.1":
-  version: 0.3.2
-  resolution: "is-arrayish@npm:0.3.2"
-  checksum: 977e64f54d91c8f169b59afcd80ff19227e9f5c791fa28fa2e5bce355cbaf6c2c356711b734656e80c9dd4a854dd7efcf7894402f1031dfc5de5d620775b4d5f
-  languageName: node
-  linkType: hard
-
 "is-bigint@npm:^1.0.1":
   version: 1.0.4
   resolution: "is-bigint@npm:1.0.4"
@@ -8142,15 +8124,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-swizzle@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "simple-swizzle@npm:0.2.2"
-  dependencies:
-    is-arrayish: ^0.3.1
-  checksum: a7f3f2ab5c76c4472d5c578df892e857323e452d9f392e1b5cf74b74db66e6294a1e1b8b390b519fa1b96b5b613f2a37db6cffef52c3f1f8f3c5ea64eb2d54c0
-  languageName: node
-  linkType: hard
-
 "sisteransi@npm:^1.0.5":
   version: 1.0.5
   resolution: "sisteransi@npm:1.0.5"
@@ -8242,7 +8215,7 @@ __metadata:
     "@vitejs/plugin-react": ^1.3.1
     chokidar: ^3.5.3
     cross-env: ^7.0.3
-    electron: 18.0.3
+    electron: ^19.0.0-alpha.1
     electron-builder: ^23.0.6
     esbuild: ^0.14.36
     eslint: ^8.13.0