refactor(about_window): enable sandbox on the about window

team-apm · Oct 30, 2023 · 3774420 · 3774420
1 parent efc45eb
commit 3774420
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -414,7 +414,6 @@ async function launch() {
       icon: icon,
       webPreferences: {
         preload: ABOUT_WINDOW_PRELOAD_WEBPACK_ENTRY,
-        sandbox: false,
       },
     });
     aboutWindow.once('close', () => {

diff --git a/src/renderer/about/about_preload.ts b/src/renderer/about/about_preload.ts
@@ -1,9 +1,9 @@
-import log from 'electron-log';
-import 'source-map-support/register';
-import { app, openDialog } from '../../lib/ipcWrapper';
-import replaceText from '../../lib/replaceText';
+// import log from 'electron-log';
+// import 'source-map-support/register';
+import { contextBridge } from 'electron';
+import { app } from '../../lib/ipcWrapper';
 
-log.catchErrors({
+/* log.catchErrors({
   onError: async () => {
     await openDialog(
       'エラー',
@@ -13,16 +13,10 @@ log.catchErrors({
       'error',
     );
   },
-});
+}); */
 
-window.addEventListener('click', () => {
-  window.close();
-});
-
-window.addEventListener('DOMContentLoaded', async () => {
-  const appVersion = await app.getVersion();
-  replaceText('app-version', appVersion);
-  for (const dependency of ['chrome', 'node', 'electron']) {
-    replaceText(`${dependency}-version`, process.versions[dependency]);
-  }
-});
+contextBridge.exposeInMainWorld(
+  'appVersion',
+  async () => await app.getVersion(),
+);
+contextBridge.exposeInMainWorld('versions', process.versions);
diff --git a/src/renderer/about/about_renderer.ts b/src/renderer/about/about_renderer.ts
@@ -1,3 +1,18 @@
 import '../../../node_modules/bootstrap/dist/css/bootstrap.min.css';
 import '../main.css';
 import './about.css';
+import replaceText from '../../lib/replaceText';
+
+declare const appVersion: () => Promise<string>;
+declare const versions: { [key: string]: string };
+
+window.addEventListener('click', () => {
+  window.close();
+});
+
+window.addEventListener('DOMContentLoaded', async () => {
+  replaceText('app-version', await appVersion());
+  for (const dependency of ['chrome', 'node', 'electron']) {
+    replaceText(`${dependency}-version`, versions[dependency]);
+  }
+});