chore: remove references to unused __TAURI_INTERNALS__.metadata (#11369)

tauri-apps · Oct 15, 2024 · 2e88633 · 2e88633
1 parent 25cc565
commit 2e88633
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/.changes/remove-unused-metadata-references.md b/.changes/remove-unused-metadata-references.md
@@ -0,0 +1,6 @@
+---
+"@tauri-apps/api": patch:changes
+"tauri": patch:changes
+---
+
+Remove references to no longer used `__TAURI_INTERNALS__.metadata.windows` and `__TAURI_INTERNALS__.metadata.webviews`.
diff --git a/crates/tauri/scripts/bundle.global.js b/crates/tauri/scripts/bundle.global.js
diff --git a/crates/tauri/src/manager/mod.rs b/crates/tauri/src/manager/mod.rs
@@ -631,12 +631,6 @@ impl<R: Runtime> AppManager<R> {
   #[cfg(desktop)]
   pub(crate) fn on_webview_close(&self, label: &str) {
     self.webview.webviews_lock().remove(label);
-
-    if let Ok(webview_labels_array) = serde_json::to_string(&self.webview.labels()) {
-      let _ = self.webview.eval_script_all(format!(
-          r#"(function () {{ const metadata = window.__TAURI_INTERNALS__.metadata; if (metadata != null) {{ metadata.webviews = {webview_labels_array}.map(function (label) {{ return {{ label: label }} }}) }} }})()"#,
-        ));
-    }
   }
 
   pub fn windows(&self) -> HashMap<String, Window<R>> {

diff --git a/packages/api/eslint.config.js b/packages/api/eslint.config.js
@@ -47,7 +47,15 @@ export default [
       '@typescript-eslint/default-param-last': 'off',
       '@typescript-eslint/strict-boolean-expressions': 0,
       'no-return-await': 'warn',
-      '@typescript-eslint/return-await': 'off'
+      '@typescript-eslint/return-await': 'off',
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_'
+        }
+      ]
     }
   }
 ]
diff --git a/packages/api/src/global.d.ts b/packages/api/src/global.d.ts
@@ -21,9 +21,7 @@ declare global {
         options?: InvokeOptions
       }) => void
       metadata: {
-        windows: WindowDef[]
         currentWindow: WindowDef
-        webviews: WebviewDef[]
         currentWebview: WebviewDef
       }
       plugins: {

diff --git a/packages/api/src/mocks.ts b/packages/api/src/mocks.ts
@@ -136,22 +136,16 @@ export function mockIPC(
  * ```
  *
  * @param current Label of window this JavaScript context is running in.
- * @param additionalWindows Label of additional windows the app has.
  *
  * @since 1.0.0
  */
 export function mockWindows(
   current: string,
-  ...additionalWindows: string[]
+  ..._additionalWindows: string[]
 ): void {
   mockInternals()
   window.__TAURI_INTERNALS__.metadata = {
-    windows: [current, ...additionalWindows].map((label) => ({ label })),
     currentWindow: { label: current },
-    webviews: [current, ...additionalWindows].map((label) => ({
-      windowLabel: label,
-      label
-    })),
     currentWebview: { windowLabel: current, label: current }
   }
 }