Skip to content

Commit

Permalink
Update electron to 31.4.0 (#336)
Browse files Browse the repository at this point in the history
and some other dependencies.

Also update node version on CI

With this newer versions of electron the following OS are not supported
anymore:
- Windows 7, 8 and 8.1
- macOS 10.13 and 10.14
  • Loading branch information
ficristo authored Aug 21, 2024
1 parent d86a338 commit a9a420d
Show file tree
Hide file tree
Showing 7 changed files with 14,371 additions and 19,247 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.x

- name: Checkout submodules
run: git submodule update --init --recursive
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.x

- name: Checkout submodules
run: git submodule update --init --recursive
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.x

- name: Checkout submodules
run: git submodule update --init --recursive
Expand Down
10 changes: 6 additions & 4 deletions app/main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { app, BrowserWindow, BrowserWindowConstructorOptions, ipcMain } from "electron";
import { app, BrowserWindow, BrowserWindowConstructorOptions, ipcMain, type IpcMainEvent } from "electron";
// tslint:disable-next-line:no-submodule-imports
import * as electronRemote from "@electron/remote/main";
import AutoUpdater from "./auto-updater";
Expand All @@ -23,7 +23,7 @@ process.on("uncaughtException", (err: Error) => {
});

const ipclog = getLogger("ipc-log");
ipcMain.on("log", function (event: Event, ...args: Array<any>) {
ipcMain.on("log", function (event: IpcMainEvent, ...args: Array<any>) {
ipclog.info(...args);
});

Expand Down Expand Up @@ -221,7 +221,8 @@ export function openMainBracketsWindow(query: {} | string = {}): BrowserWindow {
nodeIntegration: false,
nodeIntegrationInSubFrames: true,
preload: pathLib.resolve(__dirname, "preload.js"),
contextIsolation: false
contextIsolation: false,
sandbox: false,
}
};

Expand Down Expand Up @@ -296,7 +297,8 @@ export function openMainBracketsWindow(query: {} | string = {}): BrowserWindow {
nodeIntegration: false,
nodeIntegrationInSubFrames: true,
preload: pathLib.resolve(__dirname, "preload.js"),
contextIsolation: false
contextIsolation: false,
sandbox: false,
}
}
};
Expand Down
Loading

0 comments on commit a9a420d

Please sign in to comment.