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

chore(deps-dev): bump the electron group across 1 directory with 5 updates #242

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@lichtblick/suite-desktop": "workspace:*",
"@lichtblick/tsconfig": "1.0.0",
"@types/ws": "^8",
"electron": "25.8.4",
"electron": "33.0.2",
"playwright": "1.37.1",
"webpack": "5.95.0",
"ws": "8.18.0"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,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.0.2",
"electron-builder": "25.1.8",
"eslint": "8.50.0",
"eslint-config-prettier": "9.1.0",
"eslint-import-resolver-webpack": "0.13.8",
Expand Down
2 changes: 1 addition & 1 deletion packages/suite-base/src/players/UserScriptPlayer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
if (!messagesByTopic[outTopic]) {
messagesByTopic[outTopic] = [];
}
messagesByTopic[outTopic]?.push(outputMessage);
messagesByTopic[outTopic].push(outputMessage);

Check failure on line 330 in packages/suite-base/src/players/UserScriptPlayer/index.ts

View workflow job for this annotation

GitHub Actions / packages (ubuntu-20.04)

Object is possibly 'undefined'.

Check failure on line 330 in packages/suite-base/src/players/UserScriptPlayer/index.ts

View workflow job for this annotation

GitHub Actions / packages (ubuntu-20.04)

Object is possibly 'undefined'.

Check failure on line 330 in packages/suite-base/src/players/UserScriptPlayer/index.ts

View workflow job for this annotation

GitHub Actions / packages (ubuntu-20.04)

Object is possibly 'undefined'.

Check failure on line 330 in packages/suite-base/src/players/UserScriptPlayer/index.ts

View workflow job for this annotation

GitHub Actions / packages (ubuntu-20.04)

Object is possibly 'undefined'.
}
}
}
Expand Down
4 changes: 1 addition & 3 deletions packages/suite-base/src/util/VirtualLRUBuffer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,8 @@
}
}
const block = this.#blocks[index];
if (!block) {
throw new Error("invariant violation - no block at index");
}

return block;

Check failure on line 165 in packages/suite-base/src/util/VirtualLRUBuffer.ts

View workflow job for this annotation

GitHub Actions / packages (ubuntu-20.04)

Type 'Uint8Array | undefined' is not assignable to type 'Uint8Array'.
}

// For a given position, calculate `blockIndex` (which block is this position in);
Expand Down
21 changes: 15 additions & 6 deletions packages/suite-base/src/util/layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,22 @@ function getLayoutWithNewPanelIds(
return undefined;
}
const newLayout: Record<string, unknown> = {};
for (const key in layout) {
if (typeof layout[key] === "object" && !Array.isArray(layout[key])) {
newLayout[key] = getLayoutWithNewPanelIds(layout[key] as IndexableMosaic, panelIdMap);
} else if (typeof layout[key] === "string" && panelIdMap[layout[key] as string] != undefined) {
newLayout[key] = panelIdMap[layout[key] as string];
for (const key in layout as IndexableMosaic) {
if (
typeof (layout as IndexableMosaic)[key] === "object" &&
!Array.isArray((layout as IndexableMosaic)[key])
) {
newLayout[key] = getLayoutWithNewPanelIds(
(layout as IndexableMosaic)[key] as IndexableMosaic,
panelIdMap,
);
} else if (
typeof (layout as IndexableMosaic)[key] === "string" &&
panelIdMap[(layout as IndexableMosaic)[key] as string] != undefined
) {
newLayout[key] = panelIdMap[(layout as IndexableMosaic)[key] as string];
} else {
newLayout[key] = layout[key];
newLayout[key] = (layout as IndexableMosaic)[key];
}
}
return newLayout as unknown as MosaicNode<string>;
Expand Down
10 changes: 5 additions & 5 deletions packages/suite-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
"@types/tinycolor2": "1.4.4",
"@types/utif": "^3.0.2",
"@xmldom/xmldom": "0.8.10",
"app-builder-lib": "24.13.3",
"app-builder-lib": "25.1.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.0.2",
"electron-builder": "25.1.8",
"electron-devtools-installer": "3.2.0",
"electron-squirrel-startup": "1.0.0",
"electron-updater": "6.3.0-alpha.6",
"electron-squirrel-startup": "1.0.1",
"electron-updater": "6.3.9",
"esbuild-loader": "2.21.0",
"eventemitter3": "5.0.1",
"fork-ts-checker-webpack-plugin": "9.0.2",
Expand Down
2 changes: 2 additions & 0 deletions packages/suite-desktop/src/afterPack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { exec } from "@actions/exec";
import { downloadTool, extractZip } from "@actions/tool-cache";
import type MacPackager from "app-builder-lib/out/macPackager";

Check failure on line 10 in packages/suite-desktop/src/afterPack.ts

View workflow job for this annotation

GitHub Actions / packages (ubuntu-20.04)

'MacPackager' is declared but its value is never read.
import { log, Arch } from "builder-util";
import crypto from "crypto";
import { AfterPackContext } from "electron-builder";
Expand All @@ -16,7 +16,9 @@
import plist, { PlistObject } from "plist";

async function getKeychainFile(context: AfterPackContext): Promise<string | undefined> {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
const macPackager = context.packager as unknown as MacPackager;

Check failure on line 20 in packages/suite-desktop/src/afterPack.ts

View workflow job for this annotation

GitHub Actions / packages (ubuntu-20.04)

Cannot use namespace 'MacPackager' as a type.

if ((macPackager as Partial<typeof macPackager>).codeSigningInfo == undefined) {
log.error("No code signing info available.");
return;
Expand Down
Loading
Loading