Skip to content

Commit cad5ef5

Browse files
deps: Bump Electron version and @electron-forge packages (#775)
1 parent 0d040df commit cad5ef5

File tree

7 files changed

+662
-732
lines changed

7 files changed

+662
-732
lines changed

forge.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ const config: ForgeConfig = {
9999
config: 'vite.preload.config.ts',
100100
},
101101
{
102+
entry: 'extension/src/frontend/index.ts',
102103
config: 'vite.extension.config.mts',
103104
},
104105
],

package-lock.json

Lines changed: 646 additions & 717 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
"prepare": "husky && husky install"
2424
},
2525
"devDependencies": {
26-
"@electron-forge/cli": "^7.4.0",
27-
"@electron-forge/maker-deb": "^7.4.0",
28-
"@electron-forge/maker-dmg": "^7.4.0",
29-
"@electron-forge/maker-rpm": "^7.4.0",
30-
"@electron-forge/maker-squirrel": "^7.4.0",
31-
"@electron-forge/maker-zip": "^7.4.0",
32-
"@electron-forge/plugin-auto-unpack-natives": "^7.4.0",
33-
"@electron-forge/plugin-fuses": "^7.4.0",
34-
"@electron-forge/plugin-vite": "^7.4.0",
35-
"@electron-forge/publisher-github": "^7.4.0",
26+
"@electron-forge/cli": "^7.8.1",
27+
"@electron-forge/maker-deb": "^7.8.1",
28+
"@electron-forge/maker-dmg": "^7.8.1",
29+
"@electron-forge/maker-rpm": "^7.8.1",
30+
"@electron-forge/maker-squirrel": "^7.8.1",
31+
"@electron-forge/maker-zip": "^7.8.1",
32+
"@electron-forge/plugin-auto-unpack-natives": "^7.8.1",
33+
"@electron-forge/plugin-fuses": "^7.8.1",
34+
"@electron-forge/plugin-vite": "^7.8.1",
35+
"@electron-forge/publisher-github": "^7.8.1",
3636
"@electron/fuses": "^1.8.0",
3737
"@tanstack/eslint-plugin-query": "^5.53.0",
3838
"@testing-library/react": "^16.0.1",
@@ -51,7 +51,7 @@
5151
"@typescript-eslint/parser": "^7.16.1",
5252
"@typescript-eslint/types": "^8.21.0",
5353
"dotenv": "^16.4.7",
54-
"electron": "30.0.8",
54+
"electron": "37.2.4",
5555
"eslint": "^8.57.0",
5656
"eslint-config-prettier": "^9.1.0",
5757
"eslint-import-resolver-typescript": "^3.6.1",

src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ const createSplashWindow = async () => {
103103
const createWindow = async () => {
104104
const icon = getAppIcon(process.env.NODE_ENV === 'development')
105105
if (getPlatform() === 'mac') {
106-
app.dock.setIcon(icon)
106+
app.dock?.setIcon(icon)
107107
}
108108
app.setName('Grafana k6 Studio')
109109

vite.base.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export function getBuildDefine(env: ConfigEnv<'build'>) {
5454
const { command, forgeConfig } = env
5555
const names = forgeConfig.renderer
5656
.filter(({ name }) => name != null)
57-
.map(({ name }) => name!)
57+
.map(({ name }) => name)
5858
const defineKeys = getDefineKeys(names)
5959
const define = Object.entries(defineKeys).reduce(
6060
(acc, [name, keys]) => {

vite.main.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export default defineConfig((env) => {
4040
const config: UserConfig = {
4141
build: {
4242
lib: {
43-
entry: forgeConfigSelf.entry!,
43+
entry: forgeConfigSelf.entry,
4444
fileName: () => '[name].js',
4545
formats: ['cjs'],
4646
},

vite.preload.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default defineConfig((env) => {
1414
rollupOptions: {
1515
external,
1616
// Preload scripts may contain Web assets, so use the `build.rollupOptions.input` instead `build.lib.entry`.
17-
input: forgeConfigSelf.entry!,
17+
input: forgeConfigSelf.entry,
1818
output: {
1919
format: 'cjs',
2020
// It should not be split chunks.

0 commit comments

Comments
 (0)