diff --git a/wowup-electron/app/preload.ts b/wowup-electron/app/preload.ts index 4b7098a..d99b72f 100644 --- a/wowup-electron/app/preload.ts +++ b/wowup-electron/app/preload.ts @@ -63,8 +63,8 @@ function rendererInvoke(channel: string, ...args: any[]): Promise { /* eslint-enable @typescript-eslint/no-unsafe-argument */ } -function rendererOff(event: string | symbol, listener: (...args: any[]) => void) { - ipcRenderer.off(event, listener); +function rendererOff(channel: string, listener: (...args: any[]) => void) { + ipcRenderer.off(channel, listener); } function rendererOn(channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void) { diff --git a/wowup-electron/package-lock.json b/wowup-electron/package-lock.json index 31b91e0..92291a0 100644 --- a/wowup-electron/package-lock.json +++ b/wowup-electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "wowup-cf", - "version": "2.11.0-beta.6", + "version": "2.11.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "wowup-cf", - "version": "2.11.0-beta.6", + "version": "2.11.0", "hasInstallScript": true, "dependencies": { "@angular/material": "^16.2.0", @@ -82,6 +82,7 @@ "curseforge-v2": "1.2.0", "del": "7.1.0", "dotenv": "16.3.1", + "electron": "28.2.1", "electron-builder": "24.9.1", "electron-notarize": "1.2.2", "electron-reload": "2.0.0-alpha.1", @@ -13101,12 +13102,11 @@ } }, "node_modules/electron": { - "version": "26.2.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-26.2.0.tgz", - "integrity": "sha512-H6Z0sYTtLcybHCQT1yti/8BK+vN5/ZfoekKcdrfZMh5mVf2Z7psFVs6nBhXPzIOyRE/gdb6NcOppnUsGc3NJVQ==", + "version": "28.2.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-28.2.1.tgz", + "integrity": "sha512-wlzXf+OvOiVlBf9dcSeMMf7Q+N6DG+wtgFbMK0sA/JpIJcdosRbLMQwLg/LTwNVKIbmayqFLDp4FmmFkEMhbYA==", "dev": true, "hasInstallScript": true, - "peer": true, "dependencies": { "@electron/get": "^2.0.0", "@types/node": "^18.11.18", @@ -13718,7 +13718,6 @@ "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==", "dev": true, - "peer": true, "dependencies": { "debug": "^4.1.1", "env-paths": "^2.2.0", @@ -13740,7 +13739,6 @@ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -13753,7 +13751,6 @@ "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", "dev": true, - "peer": true, "dependencies": { "defer-to-connect": "^2.0.0" }, @@ -13766,7 +13763,6 @@ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", "dev": true, - "peer": true, "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -13785,7 +13781,6 @@ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", "dev": true, - "peer": true, "dependencies": { "mimic-response": "^3.1.0" }, @@ -13801,7 +13796,6 @@ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", "dev": true, - "peer": true, "engines": { "node": ">=10" } @@ -13811,7 +13805,6 @@ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "dev": true, - "peer": true, "dependencies": { "debug": "^4.1.1", "get-stream": "^5.1.0", @@ -13832,7 +13825,6 @@ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, - "peer": true, "dependencies": { "pump": "^3.0.0" }, @@ -13848,7 +13840,6 @@ "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", "dev": true, - "peer": true, "dependencies": { "@sindresorhus/is": "^4.0.0", "@szmarczak/http-timer": "^4.0.5", @@ -13874,7 +13865,6 @@ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -13884,7 +13874,6 @@ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -13897,7 +13886,6 @@ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -13910,7 +13898,6 @@ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -13920,7 +13907,6 @@ "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", "dev": true, - "peer": true, "dependencies": { "lowercase-keys": "^2.0.0" }, @@ -13933,7 +13919,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "peer": true, "bin": { "semver": "bin/semver.js" } diff --git a/wowup-electron/package.json b/wowup-electron/package.json index effaf37..3283145 100644 --- a/wowup-electron/package.json +++ b/wowup-electron/package.json @@ -1,6 +1,6 @@ { "name": "wowup-cf", - "version": "2.11.0", + "version": "2.11.1", "private": true, "description": "World of Warcraft addon updater", "keywords": [ @@ -130,6 +130,7 @@ "curseforge-v2": "1.2.0", "del": "7.1.0", "dotenv": "16.3.1", + "electron": "28.2.1", "electron-builder": "24.9.1", "electron-notarize": "1.2.2", "electron-reload": "2.0.0-alpha.1", diff --git a/wowup-electron/src/app/app.component.spec.ts b/wowup-electron/src/app/app.component.spec.ts index 9fcbdbd..d33b716 100644 --- a/wowup-electron/src/app/app.component.spec.ts +++ b/wowup-electron/src/app/app.component.spec.ts @@ -4,7 +4,7 @@ import { BehaviorSubject, Observable, Subject } from "rxjs"; import { OverlayContainer, OverlayModule } from "@angular/cdk/overlay"; import { HttpClient, HttpClientModule } from "@angular/common/http"; import { TestBed } from "@angular/core/testing"; -import { MatLegacyDialog as MatDialog } from "@angular/material/legacy-dialog"; +import { MatDialog } from "@angular/material/dialog"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { RouterTestingModule } from "@angular/router/testing"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; @@ -45,7 +45,7 @@ describe("AppComponent", () => { ["updateForClientType", "updateForAllClientTypes"], { persistUpdateInformationToWowUpAddon: () => {}, - } + }, ); addonServiceSpy = jasmine.createSpyObj("AddonService", ["processAutoUpdates", "syncAllClients"], { @@ -57,7 +57,7 @@ describe("AppComponent", () => { { getAdRequiredProviders: () => [], }, - {} + {}, ); warcraftInstallationService = jasmine.createSpyObj("WarcraftInstallationService", [""], { diff --git a/wowup-electron/src/app/components/addons/addon-detail/addon-detail.component.spec.ts b/wowup-electron/src/app/components/addons/addon-detail/addon-detail.component.spec.ts index 5d875da..1f98952 100644 --- a/wowup-electron/src/app/components/addons/addon-detail/addon-detail.component.spec.ts +++ b/wowup-electron/src/app/components/addons/addon-detail/addon-detail.component.spec.ts @@ -4,7 +4,7 @@ import { Subject } from "rxjs"; import { HttpClient, HttpClientModule } from "@angular/common/http"; import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; import { TestBed } from "@angular/core/testing"; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from "@angular/material/legacy-dialog"; +import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; @@ -43,7 +43,7 @@ describe("AddonDetailComponent", () => { { addonInstalled$: new Subject().asObservable(), getChangelog: () => "", - } + }, ); addonUiService = jasmine.createSpyObj("AddonUiService", [""], {}); diff --git a/wowup-electron/src/app/components/addons/addon-update-button/addon-update-button.component.spec.ts b/wowup-electron/src/app/components/addons/addon-update-button/addon-update-button.component.spec.ts index dcb0fbc..650b167 100644 --- a/wowup-electron/src/app/components/addons/addon-update-button/addon-update-button.component.spec.ts +++ b/wowup-electron/src/app/components/addons/addon-update-button/addon-update-button.component.spec.ts @@ -3,7 +3,7 @@ import { Subject } from "rxjs"; import { HttpClient, HttpClientModule } from "@angular/common/http"; import { TestBed } from "@angular/core/testing"; -import { MatLegacyDialog as MatDialog } from "@angular/material/legacy-dialog"; +import { MatDialog } from "@angular/material/dialog"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; diff --git a/wowup-electron/src/app/components/addons/install-from-protocol-dialog/install-from-protocol-dialog.component.spec.ts b/wowup-electron/src/app/components/addons/install-from-protocol-dialog/install-from-protocol-dialog.component.spec.ts index fcd570f..672342f 100644 --- a/wowup-electron/src/app/components/addons/install-from-protocol-dialog/install-from-protocol-dialog.component.spec.ts +++ b/wowup-electron/src/app/components/addons/install-from-protocol-dialog/install-from-protocol-dialog.component.spec.ts @@ -1,7 +1,7 @@ import { HttpClient, HttpClientModule } from "@angular/common/http"; import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from "@angular/material/legacy-dialog"; +import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-compiler"; @@ -31,7 +31,7 @@ describe("InstallFromProtocolDialogComponent", () => { { getAddonForProtocol: () => Promise.resolve(undefined), }, - {} + {}, ); sessionService = jasmine.createSpyObj("SessionService", [""], {}); diff --git a/wowup-electron/src/app/components/addons/install-from-url-dialog/install-from-url-dialog.component.spec.ts b/wowup-electron/src/app/components/addons/install-from-url-dialog/install-from-url-dialog.component.spec.ts index 8ec5039..c0f9751 100644 --- a/wowup-electron/src/app/components/addons/install-from-url-dialog/install-from-url-dialog.component.spec.ts +++ b/wowup-electron/src/app/components/addons/install-from-url-dialog/install-from-url-dialog.component.spec.ts @@ -2,7 +2,7 @@ import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-comp import { HttpClient, HttpClientModule } from "@angular/common/http"; import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { MatLegacyDialogRef as MatDialogRef } from "@angular/material/legacy-dialog"; +import { MatDialogRef } from "@angular/material/dialog"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; diff --git a/wowup-electron/src/app/components/addons/my-addon-status-cell/my-addon-status-cell.component.spec.ts b/wowup-electron/src/app/components/addons/my-addon-status-cell/my-addon-status-cell.component.spec.ts index c674c28..dfe0285 100644 --- a/wowup-electron/src/app/components/addons/my-addon-status-cell/my-addon-status-cell.component.spec.ts +++ b/wowup-electron/src/app/components/addons/my-addon-status-cell/my-addon-status-cell.component.spec.ts @@ -3,7 +3,7 @@ import { Subject } from "rxjs"; import { HttpClient, HttpClientModule } from "@angular/common/http"; import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { MatLegacyDialog as MatDialog } from "@angular/material/legacy-dialog"; +import { MatDialog } from "@angular/material/dialog"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; @@ -27,7 +27,7 @@ describe("MyAddonStatusCellComponent", () => { { addonInstalled$: new Subject().asObservable(), addonRemoved$: new Subject().asObservable(), - } + }, ); await TestBed.configureTestingModule({ diff --git a/wowup-electron/src/app/components/common/alert-dialog/alert-dialog.component.spec.ts b/wowup-electron/src/app/components/common/alert-dialog/alert-dialog.component.spec.ts index 90cbdea..4dd8f00 100644 --- a/wowup-electron/src/app/components/common/alert-dialog/alert-dialog.component.spec.ts +++ b/wowup-electron/src/app/components/common/alert-dialog/alert-dialog.component.spec.ts @@ -2,7 +2,7 @@ import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-comp import { HttpClient, HttpClientModule } from "@angular/common/http"; import { TestBed } from "@angular/core/testing"; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from "@angular/material/legacy-dialog"; +import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; diff --git a/wowup-electron/src/app/components/common/centered-snackbar/centered-snackbar.component.spec.ts b/wowup-electron/src/app/components/common/centered-snackbar/centered-snackbar.component.spec.ts index 63b4e27..d29a096 100644 --- a/wowup-electron/src/app/components/common/centered-snackbar/centered-snackbar.component.spec.ts +++ b/wowup-electron/src/app/components/common/centered-snackbar/centered-snackbar.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { MAT_LEGACY_SNACK_BAR_DATA as MAT_SNACK_BAR_DATA } from "@angular/material/legacy-snack-bar"; +import { MAT_SNACK_BAR_DATA } from "@angular/material/snack-bar"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { MatModule } from "../../../modules/mat-module"; diff --git a/wowup-electron/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts b/wowup-electron/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts index 009af9f..5d8a664 100644 --- a/wowup-electron/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts +++ b/wowup-electron/src/app/components/common/confirm-dialog/confirm-dialog.component.spec.ts @@ -2,7 +2,7 @@ import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-comp import { HttpClient, HttpClientModule } from "@angular/common/http"; import { TestBed } from "@angular/core/testing"; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from "@angular/material/legacy-dialog"; +import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; diff --git a/wowup-electron/src/app/components/common/external-url-confirmation-dialog/external-url-confirmation-dialog.component.spec.ts b/wowup-electron/src/app/components/common/external-url-confirmation-dialog/external-url-confirmation-dialog.component.spec.ts index de97f6d..083f85b 100644 --- a/wowup-electron/src/app/components/common/external-url-confirmation-dialog/external-url-confirmation-dialog.component.spec.ts +++ b/wowup-electron/src/app/components/common/external-url-confirmation-dialog/external-url-confirmation-dialog.component.spec.ts @@ -1,6 +1,6 @@ import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from "@angular/material/legacy-dialog"; +import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog"; import { WowUpService } from "../../../services/wowup/wowup.service"; import { getStandardImports } from "../../../tests/test-helpers"; diff --git a/wowup-electron/src/app/components/common/telemetry-dialog/telemetry-dialog.component.spec.ts b/wowup-electron/src/app/components/common/telemetry-dialog/telemetry-dialog.component.spec.ts index fcac040..f1a1148 100644 --- a/wowup-electron/src/app/components/common/telemetry-dialog/telemetry-dialog.component.spec.ts +++ b/wowup-electron/src/app/components/common/telemetry-dialog/telemetry-dialog.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { TelemetryDialogComponent } from "./telemetry-dialog.component"; -import { MatLegacyDialogRef as MatDialogRef } from "@angular/material/legacy-dialog"; +import { MatDialogRef } from "@angular/material/dialog"; import { HttpClient, HttpClientModule } from "@angular/common/http"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; import { httpLoaderFactory } from "../../../app.module"; diff --git a/wowup-electron/src/app/components/options/options-app-section/options-app-section.component.spec.ts b/wowup-electron/src/app/components/options/options-app-section/options-app-section.component.spec.ts index 2467bbe..4903178 100644 --- a/wowup-electron/src/app/components/options/options-app-section/options-app-section.component.spec.ts +++ b/wowup-electron/src/app/components/options/options-app-section/options-app-section.component.spec.ts @@ -3,7 +3,7 @@ import { BehaviorSubject } from "rxjs"; import { HttpClientModule } from "@angular/common/http"; import { ComponentFixture, TestBed } from "@angular/core/testing"; import { FormsModule } from "@angular/forms"; -import { MatLegacyDialog as MatDialog } from "@angular/material/legacy-dialog"; +import { MatDialog } from "@angular/material/dialog"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { ElectronService } from "../../../services"; @@ -53,7 +53,7 @@ describe("OptionsAppSectionComponent", () => { isWin: false, isLinux: true, isMac: false, - } + }, ); wowUpServiceSpy = jasmine.createSpyObj("WowUpService", ["getStartWithSystem"], { diff --git a/wowup-electron/src/app/components/options/options-wow-section/options-wow-section.component.spec.ts b/wowup-electron/src/app/components/options/options-wow-section/options-wow-section.component.spec.ts index 014505d..1787260 100644 --- a/wowup-electron/src/app/components/options/options-wow-section/options-wow-section.component.spec.ts +++ b/wowup-electron/src/app/components/options/options-wow-section/options-wow-section.component.spec.ts @@ -3,7 +3,7 @@ import { BehaviorSubject } from "rxjs"; import { HttpClient, HttpClientModule } from "@angular/common/http"; import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { MatLegacyDialog as MatDialog, MatLegacyDialogModule as MatDialogModule } from "@angular/material/legacy-dialog"; +import { MatDialog, MatDialogModule } from "@angular/material/dialog"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; @@ -34,7 +34,7 @@ describe("OptionsWowSectionComponent", () => { }, { products$: new BehaviorSubject([]).asObservable(), - } + }, ); wowUpServiceSpy = jasmine.createSpyObj( @@ -45,7 +45,7 @@ describe("OptionsWowSectionComponent", () => { }, { wowUpReleaseChannel: WowUpReleaseChannelType.Stable, - } + }, ); warcraftInstallationService = jasmine.createSpyObj("WarcraftInstallationService", [""], { diff --git a/wowup-electron/src/app/components/options/wow-client-options/wow-client-options.component.spec.ts b/wowup-electron/src/app/components/options/wow-client-options/wow-client-options.component.spec.ts index 439fdc5..d945649 100644 --- a/wowup-electron/src/app/components/options/wow-client-options/wow-client-options.component.spec.ts +++ b/wowup-electron/src/app/components/options/wow-client-options/wow-client-options.component.spec.ts @@ -2,7 +2,7 @@ import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-comp import { HttpClient, HttpClientModule } from "@angular/common/http"; import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { MatLegacyDialog as MatDialog } from "@angular/material/legacy-dialog"; +import { MatDialog } from "@angular/material/dialog"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; diff --git a/wowup-electron/src/app/directives/external-link.directive.spec.ts b/wowup-electron/src/app/directives/external-link.directive.spec.ts index 86370c0..ef6f942 100644 --- a/wowup-electron/src/app/directives/external-link.directive.spec.ts +++ b/wowup-electron/src/app/directives/external-link.directive.spec.ts @@ -3,7 +3,7 @@ import { ExternalLinkDirective } from "./external-link.directive"; import { Component } from "@angular/core"; import { getStandardImports, mockPreload } from "../tests/test-helpers"; import { WowUpService } from "../services/wowup/wowup.service"; -import { MatLegacyDialog as MatDialog } from "@angular/material/legacy-dialog"; +import { MatDialog } from "@angular/material/dialog"; import { LinkService } from "../services/links/link.service"; @Component({ diff --git a/wowup-electron/src/app/pages/get-addons/get-addons.component.spec.ts b/wowup-electron/src/app/pages/get-addons/get-addons.component.spec.ts index 5d85e2c..141711d 100644 --- a/wowup-electron/src/app/pages/get-addons/get-addons.component.spec.ts +++ b/wowup-electron/src/app/pages/get-addons/get-addons.component.spec.ts @@ -5,7 +5,7 @@ import { OverlayModule } from "@angular/cdk/overlay"; import { HttpClient, HttpClientModule } from "@angular/common/http"; import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { MatLegacyDialog as MatDialog } from "@angular/material/legacy-dialog"; +import { MatDialog } from "@angular/material/dialog"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; diff --git a/wowup-electron/src/app/pages/home/home.component.spec.ts b/wowup-electron/src/app/pages/home/home.component.spec.ts index f052ebd..003939e 100644 --- a/wowup-electron/src/app/pages/home/home.component.spec.ts +++ b/wowup-electron/src/app/pages/home/home.component.spec.ts @@ -9,7 +9,7 @@ import { httpLoaderFactory } from "../../app.module"; import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-compiler"; import { BehaviorSubject, Observable, Subject } from "rxjs"; import { HomeComponent } from "./home.component"; -import { MatLegacySnackBar as MatSnackBar } from "@angular/material/legacy-snack-bar"; +import { MatSnackBar } from "@angular/material/snack-bar"; import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { AddonScanError, AddonSyncError } from "../../errors"; diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.spec.ts b/wowup-electron/src/app/pages/my-addons/my-addons.component.spec.ts index 1f79a36..41918e4 100644 --- a/wowup-electron/src/app/pages/my-addons/my-addons.component.spec.ts +++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.spec.ts @@ -5,7 +5,7 @@ import { OverlayModule } from "@angular/cdk/overlay"; import { HttpClient, HttpClientModule } from "@angular/common/http"; import { CUSTOM_ELEMENTS_SCHEMA, ElementRef } from "@angular/core"; import { ComponentFixture, TestBed } from "@angular/core/testing"; -import { MatLegacyDialog as MatDialog } from "@angular/material/legacy-dialog"; +import { MatDialog } from "@angular/material/dialog"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; diff --git a/wowup-electron/src/app/services/electron/electron.service.ts b/wowup-electron/src/app/services/electron/electron.service.ts index 5df5b9d..e412644 100644 --- a/wowup-electron/src/app/services/electron/electron.service.ts +++ b/wowup-electron/src/app/services/electron/electron.service.ts @@ -346,8 +346,8 @@ export class ElectronService { window.wowup.rendererOn(channel, listener); } - public off(event: string | symbol, listener: (...args: any[]) => void): void { - window.wowup.rendererOff(event, listener); + public off(channel: string, listener: (...args: any[]) => void): void { + window.wowup.rendererOff(channel, listener); } public send(channel: string, ...args: any[]): void { diff --git a/wowup-electron/src/common/wowup.d.ts b/wowup-electron/src/common/wowup.d.ts index 3614b20..b6f5c0a 100644 --- a/wowup-electron/src/common/wowup.d.ts +++ b/wowup-electron/src/common/wowup.d.ts @@ -116,7 +116,7 @@ declare global { rendererSend: (channel: string, ...args: any[]) => void; rendererSendSync: (channel: string, ...args: any[]) => any; rendererInvoke: (channel: string, ...args: any[]) => Promise; - rendererOff: (event: string | symbol, listener: (...args: any[]) => void) => void; + rendererOff: (channel: string, listener: (...args: any[]) => void) => void; rendererOn: (channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void) => void; openExternal: (url: string, options?: OpenExternalOptions) => Promise; openPath: (path: string) => Promise;