Skip to content

Commit

Permalink
Merge branch 'master' of github.com:UltimateHackingKeyboard/agent
Browse files Browse the repository at this point in the history
  • Loading branch information
mondalaci committed Dec 15, 2024
2 parents e7930d1 + b82ea73 commit f60ed51
Show file tree
Hide file tree
Showing 22 changed files with 3,141 additions and 3,462 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
os: [ubuntu-latest, windows-latest, macos-13]

steps:
- name: Dump GitHub context
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.18.0
20.18.1
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"type": "node",
"envFile": "${workspaceFolder}/.env",
"runtimeVersion": "20.18.0"
"runtimeVersion": "20.18.1"
},
{
"name": "Debug Main Process",
Expand All @@ -30,7 +30,7 @@
"DEBUG": "*"
},
"sourceMaps": true,
"runtimeVersion": "20.18.0"
"runtimeVersion": "20.18.1"
}
]
}
257 changes: 53 additions & 204 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 5 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,30 @@
},
"license": "See in LICENSE",
"engines": {
"node": ">=20.18.0 <21.0.0",
"node": ">=20.18.1 <21.0.0",
"npm": ">=10.8.2 <11.0.0"
},
"devDependencies": {
"@lerna/legacy-package-management": "8.1.9",
"@types/command-line-args": "5.2.3",
"@types/command-line-usage": "5.0.4",
"@types/decompress": "4.2.7",
"@types/electron-devtools-installer": "2.0.2",
"@types/file-saver": "2.0.7",
"@types/jasmine": "5.1.4",
"@types/lodash": "4.17.10",
"@types/node": "20.16.10",
"@types/node": "20.17.10",
"@types/tmp": "0.2.6",
"@types/yargs": "17.0.33",
"@typescript-eslint/eslint-plugin": "7.11.0",
"@typescript-eslint/parser": "7.11.0",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"check-node-version": "4.2.1",
"copy-webpack-plugin": "12.0.2",
"cross-env": "7.0.3",
"decompress": "4.2.1",
"decompress-targz": "^4.1.1",
"desm": "1.3.0",
"electron": "33.2.0",
"electron": "33.3.0",
"electron-builder": "25.1.8",
"electron-debug": "1.5.0",
"electron-devtools-installer": "2.2.3",
"electron-log": "4.4.8",
"electron-settings": "4.0.4",
"electron-updater": "6.3.9",
Expand Down
32 changes: 17 additions & 15 deletions packages/kboot/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/kboot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"license": "See in LICENSE",
"dependencies": {
"debug": "^4.3.4",
"debug": "^4.4.0",
"byte-data": "^19.0.1",
"tslib": "^2.8.1"
},
Expand Down
20 changes: 14 additions & 6 deletions packages/mcumgr/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/mcumgr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"license": "See in LICENSE",
"description": "Micro controller manager utility",
"dependencies": {
"debug": "^4.3.4"
"debug": "^4.4.0"
},
"peerDependencies": {
"serialport": ">= 12.0.0"
Expand Down
50 changes: 25 additions & 25 deletions packages/uhk-agent/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/uhk-agent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
},
"license": "See in LICENSE",
"dependencies": {
"@fastify/static": "8.0.2",
"@fastify/static": "8.0.3",
"command-line-args": "6.0.1",
"command-line-usage": "7.0.3",
"electron-is-dev": "3.0.1",
"decompress": "4.2.1",
"decompress-bzip2": "4.0.0",
"decompress-targz": "4.1.1",
"fastify": "5.1.0",
"fastify": "5.2.0",
"fs-extra": "11.2.0",
"get-port": "7.1.0",
"node-hid": "3.1.2",
Expand Down
20 changes: 0 additions & 20 deletions packages/uhk-agent/src/dev-extension.ts

This file was deleted.

4 changes: 1 addition & 3 deletions packages/uhk-agent/src/electron-main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ systemPreferences.getAnimationSettings().prefersReducedMotion = false;
import * as path from 'path';
import * as url from 'url';
import { UhkHidDevice, UhkOperations } from 'uhk-usb';
// import { ElectronDataStorageRepositoryService } from './services/electron-datastorage-repository.service';

import { getLogOptions } from 'uhk-common';
import { DeviceService } from './services/device.service';
import { ElectronLogService } from './services/logger.service';
Expand All @@ -26,8 +26,6 @@ import { setMenu } from './electron-menu';
import { printUsbDevices } from './util';
import { loadWindowState, saveWindowState } from './util/window';
import { getWindowBackgroundColor, options, cliUsage, reenumerateAndExit } from './util';
// import './dev-extension';
// require('electron-debug')({ showDevTools: true, enabled: true });

if (options.help) {
console.log(cliUsage);
Expand Down
Loading

0 comments on commit f60ed51

Please sign in to comment.