diff --git a/packages/uhk-agent/src/electron-main.ts b/packages/uhk-agent/src/electron-main.ts index a65b0ce8f61..6ea335164f9 100644 --- a/packages/uhk-agent/src/electron-main.ts +++ b/packages/uhk-agent/src/electron-main.ts @@ -102,7 +102,6 @@ async function createWindow() { height: loadedWindowState.height, webPreferences: { contextIsolation: false, - nodeIntegration: true, spellcheck: false, preload: path.join(__dirname, 'preload.js') }, diff --git a/packages/uhk-agent/src/preload.js b/packages/uhk-agent/src/preload.js index 912bb5e519a..e9fff96798c 100644 --- a/packages/uhk-agent/src/preload.js +++ b/packages/uhk-agent/src/preload.js @@ -1,5 +1,9 @@ const { ipcRenderer } = require('electron') +window.electron = { + ipcRenderer +} + ipcRenderer .invoke('app-get-config', 'application-settings') .then(appSettings => { diff --git a/packages/uhk-common/src/util/index.ts b/packages/uhk-common/src/util/index.ts index 6fc5c529d48..adcd2de5165 100644 --- a/packages/uhk-common/src/util/index.ts +++ b/packages/uhk-common/src/util/index.ts @@ -41,6 +41,6 @@ export function capitalizeFirstLetter(text: string): string { return text.charAt(0).toUpperCase() + text.slice(1); } -export function runInElectron() { - return window && (window).process && (window).process.type; +export function runInElectron(): boolean { + return !!(window as any)?.electron; } diff --git a/packages/uhk-web/angular.json b/packages/uhk-web/angular.json index 9c7941b8d07..d92fcdf7447 100644 --- a/packages/uhk-web/angular.json +++ b/packages/uhk-web/angular.json @@ -120,15 +120,8 @@ }, "architect": { "build": { - "builder": "@angular-builders/custom-webpack:browser", + "builder": "@angular-devkit/build-angular:browser", "options": { - "customWebpackConfig": { - "path": "./webpack.config.js", - "mergeStrategies": { - "target": "replace", - "node": "replace" - } - }, "baseHref": "", "optimization": false, "sourceMap": true, diff --git a/packages/uhk-web/package-lock.json b/packages/uhk-web/package-lock.json index a81be46a34c..2d7023f2d9f 100644 --- a/packages/uhk-web/package-lock.json +++ b/packages/uhk-web/package-lock.json @@ -12,7 +12,6 @@ "file-saver": "2.0.5" }, "devDependencies": { - "@angular-builders/custom-webpack": "20.0.0", "@angular-devkit/build-angular": "20.3.25", "@angular/animations": "20.3.19", "@angular/cdk": "20.2.14", @@ -298,43 +297,6 @@ "node": ">=6.0.0" } }, - "node_modules/@angular-builders/common": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@angular-builders/common/-/common-4.0.0.tgz", - "integrity": "sha512-bepZI1KdXUVhDGqHOudZQJwucSbZWxfWzM+EHFXUoExUO0u7XEuHTF5bhtQZ+YU+ZK2Ayl26QbI/26Yj72vcFQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@angular-devkit/core": "^20.0.0", - "ts-node": "^10.0.0", - "tsconfig-paths": "^4.2.0" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" - } - }, - "node_modules/@angular-builders/custom-webpack": { - "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-20.0.0.tgz", - "integrity": "sha512-aw7zXG5vhsYCPLR/eOThcyWLJZ9MEh49wYaj0LouBctJsAdR6Pgg3ksubrejLI5oiUWxM9Ywu4BGwmf3QaUYqg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@angular-builders/common": "4.0.0", - "@angular-devkit/architect": ">=0.2000.0 < 0.2100.0", - "@angular-devkit/build-angular": "^20.0.0", - "@angular-devkit/core": "^20.0.0", - "@angular/build": "^20.0.0", - "lodash": "^4.17.15", - "webpack-merge": "^6.0.0" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" - }, - "peerDependencies": { - "@angular/compiler-cli": "^20.0.0" - } - }, "node_modules/@angular-devkit/architect": { "version": "0.2003.25", "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2003.25.tgz", @@ -2703,30 +2665,6 @@ "node": ">=6.9.0" } }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, "node_modules/@discoveryjs/json-ext": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz", @@ -6307,34 +6245,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/@tsconfig/node10": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.12.tgz", - "integrity": "sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", - "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "dev": true, - "license": "MIT" - }, "node_modules/@tufjs/canonical-json": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz", @@ -7173,19 +7083,6 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/acorn-walk": { - "version": "8.3.5", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz", - "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==", - "dev": true, - "license": "MIT", - "dependencies": { - "acorn": "^8.11.0" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/adjust-sourcemap-loader": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz", @@ -7446,13 +7343,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true, - "license": "MIT" - }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -8398,13 +8288,6 @@ } } }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true, - "license": "MIT" - }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -8631,16 +8514,6 @@ "dev": true, "license": "MIT" }, - "node_modules/diff": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz", - "integrity": "sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/dns-packet": { "version": "5.6.1", "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", @@ -11157,13 +11030,6 @@ "semver": "bin/semver" } }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true, - "license": "ISC" - }, "node_modules/make-fetch-happen": { "version": "15.0.5", "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.5.tgz", @@ -14081,16 +13947,6 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", @@ -14343,65 +14199,6 @@ "dev": true, "license": "MIT" }, - "node_modules/ts-node": { - "version": "10.9.2", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", - "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, - "node_modules/tsconfig-paths": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", - "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "json5": "^2.2.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -14645,13 +14442,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true, - "license": "MIT" - }, "node_modules/validate-npm-package-name": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.2.tgz", @@ -16247,16 +16037,6 @@ "node": "^20.19.0 || ^22.12.0 || >=23" } }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/packages/uhk-web/package.json b/packages/uhk-web/package.json index 9727134dbb6..04b88334bec 100644 --- a/packages/uhk-web/package.json +++ b/packages/uhk-web/package.json @@ -16,7 +16,6 @@ "private": true, "license": "See in LICENSE", "devDependencies": { - "@angular-builders/custom-webpack": "20.0.0", "@angular-devkit/build-angular": "20.3.25", "@angular/animations": "20.3.19", "@angular/cdk": "20.2.14", diff --git a/packages/uhk-web/src/renderer/services/electron-datastorage-repository.service.ts b/packages/uhk-web/src/renderer/services/electron-datastorage-repository.service.ts index 478e22b7c7b..1edc969ec2b 100644 --- a/packages/uhk-web/src/renderer/services/electron-datastorage-repository.service.ts +++ b/packages/uhk-web/src/renderer/services/electron-datastorage-repository.service.ts @@ -1,5 +1,3 @@ -import { ipcRenderer } from 'electron'; - import { ApplicationSettings, IpcEvents, UhkDeviceProduct, UserConfiguration } from 'uhk-common'; import { Observable, from, of } from 'rxjs'; @@ -7,7 +5,7 @@ import { DataStorageRepositoryService } from '../../app/services/datastorage-rep export class ElectronDataStorageRepositoryService extends DataStorageRepositoryService { static async getValue(key: string): Promise { - const value = await ipcRenderer.invoke(IpcEvents.app.getConfig, key); + const value = await (window as any).electron.ipcRenderer.invoke(IpcEvents.app.getConfig, key); if (!value) { return null; } @@ -16,7 +14,7 @@ export class ElectronDataStorageRepositoryService extends DataStorageRepositoryS } static async saveValue(key: string, value: any): Promise { - await ipcRenderer.invoke(IpcEvents.app.setConfig, key, JSON.stringify(value)); + await (window as any).electron.ipcRenderer.invoke(IpcEvents.app.setConfig, key, JSON.stringify(value)); return null; } diff --git a/packages/uhk-web/src/renderer/services/ipc-uhk-renderer.ts b/packages/uhk-web/src/renderer/services/ipc-uhk-renderer.ts index 10afb4f5799..79d64c953c4 100644 --- a/packages/uhk-web/src/renderer/services/ipc-uhk-renderer.ts +++ b/packages/uhk-web/src/renderer/services/ipc-uhk-renderer.ts @@ -1,14 +1,12 @@ -import { ipcRenderer } from 'electron'; - import { IpcCommonRenderer } from '../../app/services/ipc-common-renderer'; export class IpcUhkRenderer implements IpcCommonRenderer { public send(channel: string, ...args: any[]): void { - ipcRenderer.send(channel, args); + (window as any).electron.ipcRenderer.send(channel, args); } - public on(channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => void): this { - ipcRenderer.on(channel, listener); + public on(channel: string, listener: (_, ...args: any[]) => void): this { + (window as any).electron.ipcRenderer.on(channel, listener); return this; } diff --git a/packages/uhk-web/webpack.config.js b/packages/uhk-web/webpack.config.js deleted file mode 100644 index a13ffcdca92..00000000000 --- a/packages/uhk-web/webpack.config.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - "target": "electron-renderer", - "node": false, -};