Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update electron to version 33 #303

Merged
merged 14 commits into from
Dec 13, 2024
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@ jobs:
if: matrix.os != 'ubuntu-20.04'
run: yarn run test:integration

# New version of playwright requires to install new browsers
- name: Install Playwright browsers
aneuwald-ctw marked this conversation as resolved.
Show resolved Hide resolved
if: matrix.os == 'ubuntu-20.04'
run: |
cd web
yarn playwright install

- name: test:web-integration
if: matrix.os == 'ubuntu-20.04'
run: yarn run test:web-integration
2 changes: 1 addition & 1 deletion desktop/integration-test/mapPanel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe("mapPanel", () => {
// Click on "Search panels" input field and type Map
const searchInput = app.renderer.getByPlaceholder("Search panels");
// await searchInput.click();
await searchInput.type("Map");
await searchInput.pressSequentially("Map");
await app.renderer.getByTestId("panel-menu-item Map").click();

const mapSettingsIcon = app.renderer.getByTestId("SettingsIcon").nth(0);
Expand Down
4 changes: 2 additions & 2 deletions desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"@lichtblick/suite-desktop": "workspace:*",
"@lichtblick/tsconfig": "1.0.0",
"@types/ws": "^8",
"electron": "25.8.4",
"playwright": "1.37.1",
"electron": "33.2.1",
"playwright": "1.49.1",
"ws": "8.18.0"
}
}
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@
"resolutions": {
"@types/node": "20.10.0",
"react-use": "patch:[email protected]#./patches/react-use.patch",
"react-dnd": "patch:react-dnd@npm:16.0.1#./patches/react-dnd.patch"
"react-dnd": "patch:react-dnd@npm:16.0.1#./patches/react-dnd.patch",
"@types/react": "18.3.12"
},
"devDependencies": {
"@actions/core": "1.10.1",
Expand Down Expand Up @@ -103,8 +104,8 @@
"babel-plugin-transform-import-meta": "2.2.1",
"cross-env": "7.0.3",
"depcheck": "1.4.7",
"electron": "25.8.4",
"electron-builder": "24.13.3",
"electron": "33.2.1",
"electron-builder": "25.1.8",
"eslint": "8.57",
"eslint-config-prettier": "9.1.0",
"eslint-import-resolver-webpack": "0.13.8",
Expand Down
6 changes: 3 additions & 3 deletions packages/suite-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@types/react-dom": "18.3.0",
"@types/react-hover-observer": "workspace:*",
"@types/react-transition-group": "^4.4.8",
"@types/react-virtualized": "9.21.29",
"@types/react-virtualized-auto-sizer": "1.0.4",
aneuwald-ctw marked this conversation as resolved.
Show resolved Hide resolved
"@types/react-window": "^1.8.5",
"@types/sanitize-html": "2.9.3",
"@types/seedrandom": "3.0.8",
Expand Down Expand Up @@ -161,8 +161,8 @@
"react-resize-detector": "10.0.1",
"react-transition-group": "4.4.5",
"react-use": "17.5.1",
"react-virtualized": "9.22.5",
"react-window": "1.8.9",
"react-virtualized-auto-sizer": "1.0.24",
"react-window": "1.8.10",
"readable-stream": "4.4.2",
"rehype-raw": "6.1.1",
"reselect": "5.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/suite-base/src/components/TopicList/TopicList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
import { MouseEvent, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { useLatest } from "react-use";
import { AutoSizer } from "react-virtualized";
import AutoSizer from "react-virtualized-auto-sizer";
import { ListChildComponentProps, VariableSizeList } from "react-window";
import { makeStyles } from "tss-react/mui";
import { useDebounce } from "use-debounce";
Expand Down
2 changes: 1 addition & 1 deletion packages/suite-base/src/panels/Log/LogList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { Fab } from "@mui/material";
import { CSSProperties, useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useResizeDetector } from "react-resize-detector";
import { useLatest } from "react-use";
import { AutoSizer } from "react-virtualized";
import AutoSizer from "react-virtualized-auto-sizer";
import { VariableSizeList as List } from "react-window";
import { makeStyles } from "tss-react/mui";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
import { produce } from "immer";
import * as _ from "lodash-es";
import { CSSProperties, useCallback, useEffect, useMemo } from "react";
import { AutoSizer } from "react-virtualized";
import AutoSizer from "react-virtualized-auto-sizer";
import { FixedSizeList as List } from "react-window";
import { makeStyles } from "tss-react/mui";

Expand Down
4 changes: 2 additions & 2 deletions packages/suite-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"async-mutex": "0.4.0",
"builder-util": "*",
"clean-webpack-plugin": "4.0.0",
"electron": "25.8.4",
"electron-builder": "24.13.3",
"electron": "33.2.1",
"electron-builder": "25.1.8",
"electron-devtools-installer": "3.2.0",
"electron-squirrel-startup": "1.0.0",
"electron-updater": "6.3.0-alpha.6",
Expand Down
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@lichtblick/suite-web": "workspace:*",
"@lichtblick/tsconfig": "1.0.0",
"@types/serve-handler": "^6",
"playwright": "1.37.1",
"playwright": "1.49.1",
"serve-handler": "6.1.6",
"webpack": "5.96.1",
"webpack-dev-server": "5.1.0"
Expand Down
Loading
Loading