From 3809cee4d60d80ee0c77bd99c7afc80d9e9c91af Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Tue, 19 Mar 2024 18:04:32 +0000 Subject: [PATCH] refactor: only inject API IIFE script when withGlobalTauri is true (#1071) * refactor: only inject API IIFE script when withGlobalTauri is true * fmt * update tauri Committed via a GitHub action: https://github.com/tauri-apps/plugins-workspace/actions/runs/8347963398 Co-authored-by: lucasfernog --- src/api-iife.js => api-iife.js | 0 build.rs | 4 +++- node_modules/@tauri-apps/api | 2 +- package.json | 2 +- permissions/schemas/schema.json | 10 +++------- src/lib.rs | 1 - 6 files changed, 8 insertions(+), 11 deletions(-) rename src/api-iife.js => api-iife.js (100%) diff --git a/src/api-iife.js b/api-iife.js similarity index 100% rename from src/api-iife.js rename to api-iife.js diff --git a/build.rs b/build.rs index e9d6cfd..e412b34 100644 --- a/build.rs +++ b/build.rs @@ -5,5 +5,7 @@ const COMMANDS: &[&str] = &["exit", "restart"]; fn main() { - tauri_plugin::Builder::new(COMMANDS).build(); + tauri_plugin::Builder::new(COMMANDS) + .global_api_script_path("./api-iife.js") + .build(); } diff --git a/node_modules/@tauri-apps/api b/node_modules/@tauri-apps/api index 77f7c7f..c58cf25 120000 --- a/node_modules/@tauri-apps/api +++ b/node_modules/@tauri-apps/api @@ -1 +1 @@ -../../../../node_modules/.pnpm/@tauri-apps+api@2.0.0-beta.4/node_modules/@tauri-apps/api \ No newline at end of file +../../../../node_modules/.pnpm/@tauri-apps+api@2.0.0-beta.6/node_modules/@tauri-apps/api \ No newline at end of file diff --git a/package.json b/package.json index 2e9ff28..0e21d80 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-beta.4" + "@tauri-apps/api": "2.0.0-beta.6" } } diff --git a/permissions/schemas/schema.json b/permissions/schemas/schema.json index a8fbdcc..98a1b34 100644 --- a/permissions/schemas/schema.json +++ b/permissions/schemas/schema.json @@ -139,14 +139,10 @@ }, "platforms": { "description": "Target platforms this permission applies. By default all platforms are affected by this permission.", - "default": [ - "linux", - "macOS", - "windows", - "android", - "iOS" + "type": [ + "array", + "null" ], - "type": "array", "items": { "$ref": "#/definitions/Target" } diff --git a/src/lib.rs b/src/lib.rs index 2de8291..e0e948f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,7 +20,6 @@ mod commands; pub fn init() -> TauriPlugin { Builder::new("process") - .js_init_script(include_str!("api-iife.js").to_string()) .invoke_handler(tauri::generate_handler![commands::exit, commands::restart]) .build() }