Skip to content

Commit 7b377ff

Browse files
committed
Pin ESLint to 9.39.2 as 10.0.0 not working.
1 parent 2dedb6e commit 7b377ff

File tree

8 files changed

+354
-191
lines changed

8 files changed

+354
-191
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ setuptools==82.*
5555
SQLAlchemy==2.*
5656
sqlparse==0.*
5757
sshtunnel==0.*
58-
typer[all]==0.23.*
58+
typer[all]==0.24.*
5959
urllib3==1.26.*; python_version <= '3.9'
6060
urllib3==2.6.*; python_version > '3.9'
6161
user-agents==2.2.0

runtime/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"packageManager": "[email protected]",
1414
"devDependencies": {
1515
"electron": "40.4.1",
16-
"eslint": "^10.0.0",
16+
"eslint": "^9.39.2",
1717
"eslint-plugin-unused-imports": "^4.4.1"
1818
},
1919
"dependencies": {

runtime/src/js/autoUpdaterHandler.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/////////////////////////////////////////////////////////////
2+
//
3+
// pgAdmin 4 - PostgreSQL Tools
4+
//
5+
// Copyright (C) 2013 - 2026, The pgAdmin Development Team
6+
// This software is released under the PostgreSQL Licence
7+
//
8+
//////////////////////////////////////////////////////////////
9+
110
import { autoUpdater, ipcMain } from 'electron';
211
import { refreshMenus } from './menu.js';
312
import * as misc from './misc.js';
@@ -76,7 +85,7 @@ function handleSendDataForAppUpdate({
7685
data.product_name
7786
) {
7887
const ftpUrl = encodeURIComponent(
79-
`${data.auto_update_url}/pgadmin4-${data.upgrade_version}-${process.arch}.zip`
88+
`${data.auto_update_url}/pgadmin4-${data.upgrade_version}-${process.arch}.zip`,
8089
);
8190
let serverUrl = `${baseUrl}/misc/auto_update/${data.current_version_int}/${data.upgrade_version}/${data.upgrade_version_int}/${data.product_name}/${ftpUrl}/?key=${UUID}`;
8291

@@ -122,7 +131,7 @@ export function setupAutoUpdater({
122131
baseUrl,
123132
UUID,
124133
forceQuitAndInstallUpdate,
125-
})
134+
}),
126135
);
127136
}
128137
}

runtime/src/js/menu.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ function buildMenu(pgadminMenus, pgAdminMainScreen, configStore, callbacks) {
135135
{ type: 'separator' },
136136
...(isMac
137137
? [
138-
{ role: 'hide' },
139-
{ role: 'hideOthers' },
140-
{ role: 'unhide' },
141-
{ type: 'separator' },
142-
]
138+
{ role: 'hide' },
139+
{ role: 'hideOthers' },
140+
{ role: 'unhide' },
141+
{ type: 'separator' },
142+
]
143143
: []),
144144
{ role: 'quit' },
145145
],
@@ -172,7 +172,7 @@ function buildMenu(pgadminMenus, pgAdminMainScreen, configStore, callbacks) {
172172
{ type: 'separator' },
173173
].concat(isLinux ? [] : [{ role: 'togglefullscreen' }]),
174174
},
175-
{ role: 'windowMenu' }
175+
{ role: 'windowMenu' },
176176
);
177177

178178
template.push(pgadminMenus[pgadminMenus.length - 1]);

runtime/src/js/pgadmin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ function launchPgAdminWindow() {
372372

373373
setupMenu(pgAdminMainScreen, configStore, menuCallbacks);
374374

375-
setupDownloader()
375+
setupDownloader();
376376

377377
pgAdminMainScreen.loadURL(startPageUrl);
378378

@@ -452,7 +452,7 @@ function notifyUpdateInstalled() {
452452
}, 10000);
453453
} else {
454454
// If main screen not ready, wait and send after it's created
455-
app.once('browser-window-created', (event, window) => {
455+
app.once('browser-window-created', (_event, _window) => {
456456
misc.writeServerLog('[Auto-Updater]: Update installed successfully.');
457457
setTimeout(() => {
458458
pgAdminMainScreen.webContents.send('notifyAppAutoUpdate', {update_installed: true});

0 commit comments

Comments
 (0)