Skip to content

Commit f60ed51

Browse files
committed
Merge branch 'master' of github.com:UltimateHackingKeyboard/agent
2 parents e7930d1 + b82ea73 commit f60ed51

22 files changed

+3141
-3462
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
os: [ubuntu-latest, windows-latest, macOS-latest]
23+
os: [ubuntu-latest, windows-latest, macos-13]
2424

2525
steps:
2626
- name: Dump GitHub context

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.18.0
1+
20.18.1

.vscode/launch.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
],
1515
"type": "node",
1616
"envFile": "${workspaceFolder}/.env",
17-
"runtimeVersion": "20.18.0"
17+
"runtimeVersion": "20.18.1"
1818
},
1919
{
2020
"name": "Debug Main Process",
@@ -30,7 +30,7 @@
3030
"DEBUG": "*"
3131
},
3232
"sourceMaps": true,
33-
"runtimeVersion": "20.18.0"
33+
"runtimeVersion": "20.18.1"
3434
}
3535
]
3636
}

package-lock.json

+53-204
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+5-8
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,30 @@
1515
},
1616
"license": "See in LICENSE",
1717
"engines": {
18-
"node": ">=20.18.0 <21.0.0",
18+
"node": ">=20.18.1 <21.0.0",
1919
"npm": ">=10.8.2 <11.0.0"
2020
},
2121
"devDependencies": {
2222
"@lerna/legacy-package-management": "8.1.9",
2323
"@types/command-line-args": "5.2.3",
2424
"@types/command-line-usage": "5.0.4",
2525
"@types/decompress": "4.2.7",
26-
"@types/electron-devtools-installer": "2.0.2",
2726
"@types/file-saver": "2.0.7",
2827
"@types/jasmine": "5.1.4",
2928
"@types/lodash": "4.17.10",
30-
"@types/node": "20.16.10",
29+
"@types/node": "20.17.10",
3130
"@types/tmp": "0.2.6",
3231
"@types/yargs": "17.0.33",
33-
"@typescript-eslint/eslint-plugin": "7.11.0",
34-
"@typescript-eslint/parser": "7.11.0",
32+
"@typescript-eslint/eslint-plugin": "7.18.0",
33+
"@typescript-eslint/parser": "7.18.0",
3534
"check-node-version": "4.2.1",
3635
"copy-webpack-plugin": "12.0.2",
3736
"cross-env": "7.0.3",
3837
"decompress": "4.2.1",
3938
"decompress-targz": "^4.1.1",
4039
"desm": "1.3.0",
41-
"electron": "33.2.0",
40+
"electron": "33.3.0",
4241
"electron-builder": "25.1.8",
43-
"electron-debug": "1.5.0",
44-
"electron-devtools-installer": "2.2.3",
4542
"electron-log": "4.4.8",
4643
"electron-settings": "4.0.4",
4744
"electron-updater": "6.3.9",

packages/kboot/package-lock.json

+17-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/kboot/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"license": "See in LICENSE",
1414
"dependencies": {
15-
"debug": "^4.3.4",
15+
"debug": "^4.4.0",
1616
"byte-data": "^19.0.1",
1717
"tslib": "^2.8.1"
1818
},

packages/mcumgr/package-lock.json

+14-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/mcumgr/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"license": "See in LICENSE",
2020
"description": "Micro controller manager utility",
2121
"dependencies": {
22-
"debug": "^4.3.4"
22+
"debug": "^4.4.0"
2323
},
2424
"peerDependencies": {
2525
"serialport": ">= 12.0.0"

packages/uhk-agent/package-lock.json

+25-25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/uhk-agent/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
},
1212
"license": "See in LICENSE",
1313
"dependencies": {
14-
"@fastify/static": "8.0.2",
14+
"@fastify/static": "8.0.3",
1515
"command-line-args": "6.0.1",
1616
"command-line-usage": "7.0.3",
1717
"electron-is-dev": "3.0.1",
1818
"decompress": "4.2.1",
1919
"decompress-bzip2": "4.0.0",
2020
"decompress-targz": "4.1.1",
21-
"fastify": "5.1.0",
21+
"fastify": "5.2.0",
2222
"fs-extra": "11.2.0",
2323
"get-port": "7.1.0",
2424
"node-hid": "3.1.2",

packages/uhk-agent/src/dev-extension.ts

-20
This file was deleted.

packages/uhk-agent/src/electron-main.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ systemPreferences.getAnimationSettings().prefersReducedMotion = false;
1313
import * as path from 'path';
1414
import * as url from 'url';
1515
import { UhkHidDevice, UhkOperations } from 'uhk-usb';
16-
// import { ElectronDataStorageRepositoryService } from './services/electron-datastorage-repository.service';
16+
1717
import { getLogOptions } from 'uhk-common';
1818
import { DeviceService } from './services/device.service';
1919
import { ElectronLogService } from './services/logger.service';
@@ -26,8 +26,6 @@ import { setMenu } from './electron-menu';
2626
import { printUsbDevices } from './util';
2727
import { loadWindowState, saveWindowState } from './util/window';
2828
import { getWindowBackgroundColor, options, cliUsage, reenumerateAndExit } from './util';
29-
// import './dev-extension';
30-
// require('electron-debug')({ showDevTools: true, enabled: true });
3129

3230
if (options.help) {
3331
console.log(cliUsage);

0 commit comments

Comments
 (0)