chore(xo-core): update NoVnc typescript type (#7900)

Use type definitions from DefinitelyTyped instead of using custom declaration
vatesfr · Aug 9, 2024 · 700149d · 700149d
1 parent 06af045
commit 700149d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 350 deletions.
diff --git a/@xen-orchestra/lite/env.d.ts b/@xen-orchestra/lite/env.d.ts
@@ -1,6 +1,7 @@
 /// <reference types="vite/client" />
 /// <reference types="json-rpc-2.0/dist" />
 /// <reference types="vite-plugin-pages/client" />
+/// <reference types="novnc__novnc" />
 
 declare const XO_LITE_VERSION: string
 declare const XO_LITE_GIT_HEAD: string
diff --git a/@xen-orchestra/lite/src/components/RemoteConsole.vue b/@xen-orchestra/lite/src/components/RemoteConsole.vue
@@ -61,9 +61,7 @@ const clearVncClient = () => {
   vncClient.removeEventListener('disconnect', handleDisconnectionEvent)
   vncClient.removeEventListener('connect', handleConnectionEvent)
 
-  if (vncClient._rfbConnectionState !== 'disconnected') {
-    vncClient.disconnect()
-  }
+  vncClient.disconnect()
 
   vncClient = undefined
 }

diff --git a/@xen-orchestra/web-core/env.d.ts b/@xen-orchestra/web-core/env.d.ts
@@ -1 +1,2 @@
+/// <reference types="novnc__novnc" />
 /// <reference types="vite/client" />
diff --git a/@xen-orchestra/web-core/lib/types/novnc.d.ts b/@xen-orchestra/web-core/lib/types/novnc.d.ts
diff --git a/@xen-orchestra/web-core/package.json b/@xen-orchestra/web-core/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
-    "@types/novnc__novnc": "^1.3.5",
+    "@types/novnc__novnc": "^1.5.0",
     "@vue/tsconfig": "^0.5.1",
     "pinia": "^2.1.7",
     "vue": "^3.4.13",

diff --git a/yarn.lock b/yarn.lock
@@ -4305,10 +4305,10 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
   integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
 
-"@types/novnc__novnc@^1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/novnc__novnc/-/novnc__novnc-1.3.5.tgz#af41a2fd01fc50e40306d1e62d44a0035e7fad25"
-  integrity sha512-iMYzwgNDVmSlkqTKh6tkz25Tir2i2h1Jlhja0e6ycL3GPP+HCuhPA3uzZrVLrgKUEj1RaDhI3KGMPI47bV0jQw==
+"@types/novnc__novnc@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@types/novnc__novnc/-/novnc__novnc-1.5.0.tgz#5f58687f0fa6591b75e91eb75237520da440dbb4"
+  integrity sha512-9DrDJK1hUT6Cbp4t03IsU/DsR6ndnIrDgZVrzITvspldHQ7n81F3wUDfq89zmPM3wg4GErH11IQa0QuTgLMf+w==
 
 "@types/ps-tree@^1.1.2":
   version "1.1.6"