fix(api.js): fix @ts-expect-error usage, closes #2249 (#2250)

tauri-apps · Jul 19, 2021 · dd52e73 · dd52e73
1 parent e3f9916
commit dd52e73
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.changes/api-ts-expect-error.md b/.changes/api-ts-expect-error.md
@@ -0,0 +1,4 @@
+---
+"api": patch
+---
+Fix `@ts-expect` error usage
diff --git a/core/tauri/scripts/bundle.js b/core/tauri/scripts/bundle.js
diff --git a/tooling/api/src/window.ts b/tooling/api/src/window.ts
@@ -195,8 +195,8 @@ enum UserAttentionType {
  * @return The current WebviewWindow.
  */
 function getCurrent(): WebviewWindow {
-  // @ts-expect-error
   return new WebviewWindow(window.__TAURI__.__currentWindow.label, {
+    // @ts-expect-error
     skip: true
   })
 }
@@ -207,9 +207,12 @@ function getCurrent(): WebviewWindow {
  * @return The list of WebviewWindow.
  */
 function getAll(): WebviewWindow[] {
-  // @ts-expect-error
   return window.__TAURI__.__windows.map(
-    (w) => new WebviewWindow(w, { skip: true })
+    (w) =>
+      new WebviewWindow(w.label, {
+        // @ts-expect-error
+        skip: true
+      })
   )
 }