Merge branch 'release/2.0.0-beta.8' into feature/2.x

Dockerfile

@@ -19,8 +19,8 @@ RUN apt-get update -y && \
 
 # Install the Electron dependencies.
 RUN apt-get update -y && \
-    apt-get install -y xorg gconf2 gconf-service libnotify4 libappindicator1 libxtst6 \
-                       libxss1 libasound2 libgl1-mesa-glx libgl1-mesa-dri && \
+    apt-get install -y xorg gconf2 gconf-service libnotify4 libappindicator1 libxtst6 libxss1 libasound2 \
+                       libgl1-mesa-glx libgl1-mesa-dri && \
     rm -rf /var/lib/apt/lists && \
     rm -rf /var/cache/apt
 

electron-builder.yml

@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/electron-userland/electron-builder/master/packages/app-builder-lib/scheme.json
 appId: org.sleepingcats.${name}
 productName: BridgeCmdr
-copyright: 'Copyright ©2019 ${author}'
+copyright: 'Copyright ©2019-2024 ${author}'
 artifactName: ${name}-${version}-${arch}.${ext}
 directories:
   buildResources: resources
@@ -39,5 +39,5 @@ linux:
 buildDependenciesFromSource: true
 npmRebuild: true
 publish:
-  provider: generic
-  url: http://localplex.home.sleepingcats.org:9001/bridgecmdr/
+  provider: github
+  protocol: https

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bridgecmdr",
   "productName": "BridgeCmdr",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.8",
   "description": "Controller for professional A/V monitors and switches",
   "packageManager": "[email protected]",
   "type": "module",
@@ -131,7 +131,6 @@
     "stream-browserify": "^3.0.0",
     "tslib": "^2.7.0",
     "type-fest": "^4.26.0",
-    "typed-emitter": "^2.1.0",
     "typescript": "^5.5.4",
     "typescript-eslint-parser-for-extra-files": "^0.7.0",
     "util": "^0.12.5",
@@ -145,7 +144,7 @@
     "vue-eslint-parser": "^9.4.3",
     "vue-i18n": "^9.14.0",
     "vue-router": "^4.4.3",
-    "vue-tsc": "^2.1.2",
+    "vue-tsc": "^2.1.5",
     "vuetify": "^3.7.1",
     "xdg-basedir": "^5.1.0",
     "zod": "^3.23.8"

src/main/system/updater.ts

@@ -9,17 +9,12 @@ import { ipcHandle, ipcProxy, isNodeError, logError } from '../utilities'
 import type { AppUpdater } from '../../preload/api'
 import type { WebContents } from 'electron'
 import type { UpdateCheckResult, ProgressInfo, CancellationToken } from 'electron-updater'
-import type { Simplify } from 'type-fest'
-import type TypedEmitter from 'typed-emitter'
-import type { EventMap } from 'typed-emitter'
 
-type TypedEventEmitter<T extends EventMap> = TypedEmitter<T>
+interface AppAutoUpdaterEventMap {
+  progress: [progress: ProgressInfo]
+}
 
-type ProgressHandler = (progress: ProgressInfo) => void
-
-type AutoUpdaterEvents = Simplify<{
-  progress: ProgressHandler
-}>
+type ProgressHandler = (...args: AppAutoUpdaterEventMap['progress']) => void
 
 const useUpdater = memo(() => {
   /** The internal application updater for AppImage. */
@@ -28,14 +23,14 @@ const useUpdater = memo(() => {
   autoUpdater.forceDevUpdateConfig = true
   // FIXME: Find some way to prevent if from logging
   // errors that are caught and handled.
-  // autoUpdater.logger = Logger
+  //autoUpdater.logger = Logger
 
   /**
    * Application auto update.
    *
    * We are using a class for EventEmitter's sake, it wants to return this which must be compatible with the API.
    */
-  class AppAutoUpdater extends (EventEmitter as new () => TypedEventEmitter<AutoUpdaterEvents>) implements AppUpdater {
+  class AppAutoUpdater extends EventEmitter<AppAutoUpdaterEventMap> implements AppUpdater {
     #checkPromise: Promise<UpdateCheckResult | null> | undefined = undefined
     #cancelToken: CancellationToken | undefined = undefined
     #donwloadPromise: Promise<string[]> | undefined = undefined

yarn.lock

@@ -1560,10 +1560,10 @@
     "@typescript-eslint/parser" "^7.1.1"
     vue-eslint-parser "^9.3.1"
 
-"@vue/[email protected].2":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-2.1.2.tgz#98e7864ab4a928293a88ebf7b427d773e1a40e2e"
-  integrity sha512-tt2J7C+l0J/T5PaLhJ0jvCCi0JNwu3e8azWTYxW3jmAW5B/dac0g5UxmI7l59CQgCGFotqUqI3tXjfZgoWNtog==
+"@vue/[email protected].5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-2.1.5.tgz#239742775d7829062d06d1fd02fc102e4bf1ff25"
+  integrity sha512-YwF5+2v+rnue2/17wP84tnZgaB2hUM4C1U+115vVGrDAPGhBf7YG0nPv1SO0yUeEpYMYtED4ClamkXAwpoz2Yw==
   dependencies:
     "@volar/language-core" "~2.4.1"
     "@vue/compiler-dom" "^3.4.0"
@@ -5446,13 +5446,6 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rxjs@^7.5.2:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-array-concat@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
@@ -6071,7 +6064,7 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^2.1.0, tslib@^2.6.2, tslib@^2.6.3, tslib@^2.7.0:
+tslib@^2.6.2, tslib@^2.6.3, tslib@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
   integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
@@ -6152,13 +6145,6 @@ typed-array-length@^1.0.6:
     is-typed-array "^1.1.13"
     possible-typed-array-names "^1.0.0"
 
-typed-emitter@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/typed-emitter/-/typed-emitter-2.1.0.tgz#ca78e3d8ef1476f228f548d62e04e3d4d3fd77fb"
-  integrity sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==
-  optionalDependencies:
-    rxjs "^7.5.2"
-
 typescript-eslint-parser-for-extra-files@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/typescript-eslint-parser-for-extra-files/-/typescript-eslint-parser-for-extra-files-0.7.0.tgz#4d7655c6e627352a7a14ffb58dde9d88fde8313e"
@@ -6460,13 +6446,13 @@ vue-router@^4.4.3:
   dependencies:
     "@vue/devtools-api" "^6.6.3"
 
-vue-tsc@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-2.1.2.tgz#93e3bc5133766fcd4bc3e5cb8b998ea9b159038b"
-  integrity sha512-PH1BDxWT3eaPhl73elyZj6DV0nR3K4IFoUM1sGzMXXQneovVUwHQytdSyAHiED5MtEINGSHpL/Hs9ch+c/tDTw==
+vue-tsc@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-2.1.5.tgz#1488b9ddc7c65b1655cad3cbd9eb34195b933545"
+  integrity sha512-r4uljp8HQkGXPnNHR0qKkoE/g5OYYycr9Kfblxg0pLaPAxVr7SU/wmYhD7Y/ETApDl4+ZwvgFgn3RTOE7Xgy0Q==
   dependencies:
     "@volar/typescript" "~2.4.1"
-    "@vue/language-core" "2.1.2"
+    "@vue/language-core" "2.1.5"
     semver "^7.5.4"
 
 vue@^3.4.38: