fix(api): global bundle broken code, closes #2289 (#2297)

tauri-apps · Jul 26, 2021 · 268450b · 268450b
1 parent 8216cba
commit 268450b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.changes/fix-global-tauri.md b/.changes/fix-global-tauri.md
@@ -0,0 +1,5 @@
+---
+"api": patch
+---
+
+Fixes the global bundle UMD code.
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
@@ -225,11 +225,11 @@ const localTauriEvents = ['tauri://created', 'tauri://error']
  */
 class WebviewWindowHandle {
   /** Window label. */
-  label: string
+  label: string | null
   /** Local event listeners. */
   listeners: { [key: string]: Array<EventCallback<any>> }
 
-  constructor(label: string) {
+  constructor(label: string | null) {
     this.label = label
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     this.listeners = Object.create(null)
@@ -1071,7 +1071,7 @@ class WindowManager extends WebviewWindowHandle {
  * ```
  */
 class WebviewWindow extends WindowManager {
-  constructor(label: string, options: WindowOptions = {}) {
+  constructor(label: string | null, options: WindowOptions = {}) {
     super(label)
     // @ts-expect-error
     if (!options?.skip) {
@@ -1108,7 +1108,7 @@ class WebviewWindow extends WindowManager {
 }
 
 /** The WebviewWindow for the current window. */
-const appWindow = new WebviewWindow(window.__TAURI__.__currentWindow.label, {
+const appWindow = new WebviewWindow(null, {
   // @ts-expect-error
   skip: true
 })