From 086271b73e8d1b24de2aa478a1421924bfc1218b Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Mon, 19 Aug 2024 23:37:43 -0300 Subject: [PATCH 1/5] fix(ci): install Linux dependencies on covector workflow --- .github/workflows/covector-version-or-publish.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml index 18c105717c9..4108ff4a601 100644 --- a/.github/workflows/covector-version-or-publish.yml +++ b/.github/workflows/covector-version-or-publish.yml @@ -87,6 +87,11 @@ jobs: git config --global user.name "${{ github.event.pusher.name }}" git config --global user.email "${{ github.event.pusher.email }}" + - name: install Linux dependencies + run: | + sudo apt-get update + sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev + - name: covector version or publish (publish when no change files present) uses: jbolda/covector/packages/action@covector-v0 id: covector From da381e07f3770988fe6d0859a02331b87cc6723f Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Tue, 20 Aug 2024 13:49:17 -0300 Subject: [PATCH 2/5] feat(core): resources on mobile apps (#10696) * feat(core): resources on mobile apps * resources dir on android --- .changes/inject-mobile-resources.md | 6 +++++ .changes/resource-dir-android.md | 5 ++++ .changes/resource-dir-ios.md | 5 ++++ core/tauri-utils/src/platform.rs | 14 +++++++++++ .../src/main/java/app/tauri/PathPlugin.kt | 5 ++-- examples/api/src-tauri/Cargo.lock | 16 ++++++------- tooling/cli/src/helpers/fs.rs | 21 ++++++++++++++++ tooling/cli/src/helpers/mod.rs | 1 + tooling/cli/src/mobile/android/build.rs | 4 ++-- tooling/cli/src/mobile/android/dev.rs | 4 ++-- tooling/cli/src/mobile/android/mod.rs | 21 ++++++++++++++-- tooling/cli/src/mobile/ios/build.rs | 4 ++-- tooling/cli/src/mobile/ios/dev.rs | 4 ++-- tooling/cli/src/mobile/ios/mod.rs | 24 ++++++++++++++++--- 14 files changed, 111 insertions(+), 23 deletions(-) create mode 100644 .changes/inject-mobile-resources.md create mode 100644 .changes/resource-dir-android.md create mode 100644 .changes/resource-dir-ios.md create mode 100644 tooling/cli/src/helpers/fs.rs diff --git a/.changes/inject-mobile-resources.md b/.changes/inject-mobile-resources.md new file mode 100644 index 00000000000..6d83411c66e --- /dev/null +++ b/.changes/inject-mobile-resources.md @@ -0,0 +1,6 @@ +--- +"tauri-cli": patch:feat +"@tauri-apps/cli": patch:feat +--- + +Inject configured resources on mobile apps. diff --git a/.changes/resource-dir-android.md b/.changes/resource-dir-android.md new file mode 100644 index 00000000000..05480021b2f --- /dev/null +++ b/.changes/resource-dir-android.md @@ -0,0 +1,5 @@ +--- +"tauri-utils": patch:bug +--- + +Implemented `resource_dir` on Android, which returns a URI that needs to be resolved using [AssetManager::open](https://developer.android.com/reference/android/content/res/AssetManager#open(java.lang.String,%20int)). This will be handled by the file system plugin. diff --git a/.changes/resource-dir-ios.md b/.changes/resource-dir-ios.md new file mode 100644 index 00000000000..e4650a698b6 --- /dev/null +++ b/.changes/resource-dir-ios.md @@ -0,0 +1,5 @@ +--- +"tauri-utils": patch:bug +--- + +Fix `resource_dir` on iOS. diff --git a/core/tauri-utils/src/platform.rs b/core/tauri-utils/src/platform.rs index 5b0040264b9..81df60b9c12 100644 --- a/core/tauri-utils/src/platform.rs +++ b/core/tauri-utils/src/platform.rs @@ -15,6 +15,9 @@ use crate::{Env, PackageInfo}; mod starting_binary; +#[cfg(target_os = "android")] +pub const ANDROID_ASSET_PROTOCOL_URI_PREFIX: &str = "asset://localhost/"; + /// Platform target. #[derive(PartialEq, Eq, Copy, Debug, Clone, Serialize, Deserialize)] #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))] @@ -256,7 +259,13 @@ fn is_cargo_output_directory(path: &Path) -> bool { /// `${exe_dir}/../lib/${exe_name}`. /// /// On MacOS, it's `${exe_dir}../Resources` (inside .app). +/// +/// On iOS, it's `${exe_dir}/assets`. +/// +/// Android uses a special URI prefix that is resolved by the Tauri file system plugin `asset://localhost/` pub fn resource_dir(package_info: &PackageInfo, env: &Env) -> crate::Result { + #[cfg(target_os = "android")] + return Ok(PathBuf::from(ANDROID_ASSET_PROTOCOL_URI_PREFIX)); let exe = current_exe()?; resource_dir_from(exe, package_info, env) } @@ -320,6 +329,11 @@ fn resource_dir_from>( .map_err(Into::into); } + #[cfg(target_os = "ios")] + { + res = exe_dir.join("assets").canonicalize().map_err(Into::into); + } + res } diff --git a/core/tauri/mobile/android/src/main/java/app/tauri/PathPlugin.kt b/core/tauri/mobile/android/src/main/java/app/tauri/PathPlugin.kt index e33a9597e77..ec72d008ad0 100644 --- a/core/tauri/mobile/android/src/main/java/app/tauri/PathPlugin.kt +++ b/core/tauri/mobile/android/src/main/java/app/tauri/PathPlugin.kt @@ -12,6 +12,8 @@ import app.tauri.plugin.Plugin import app.tauri.plugin.Invoke import app.tauri.plugin.JSObject +const val TAURI_ASSETS_DIRECTORY_URI = "asset://localhost/" + @TauriPlugin class PathPlugin(private val activity: Activity): Plugin(activity) { private fun resolvePath(invoke: Invoke, path: String?) { @@ -67,8 +69,7 @@ class PathPlugin(private val activity: Activity): Plugin(activity) { @Command fun getResourcesDir(invoke: Invoke) { - // TODO - resolvePath(invoke, activity.cacheDir.absolutePath) + resolvePath(invoke, TAURI_ASSETS_DIRECTORY_URI) } @Command diff --git a/examples/api/src-tauri/Cargo.lock b/examples/api/src-tauri/Cargo.lock index 8590b744012..8273f8e9879 100644 --- a/examples/api/src-tauri/Cargo.lock +++ b/examples/api/src-tauri/Cargo.lock @@ -3221,7 +3221,7 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" dependencies = [ "anyhow", "bytes", @@ -3271,7 +3271,7 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" dependencies = [ "anyhow", "cargo_toml", @@ -3293,7 +3293,7 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" dependencies = [ "base64 0.22.1", "brotli", @@ -3318,7 +3318,7 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3330,7 +3330,7 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" dependencies = [ "anyhow", "glob", @@ -3356,7 +3356,7 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" dependencies = [ "dpi", "gtk", @@ -3373,7 +3373,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" dependencies = [ "cocoa 0.26.0", "gtk", @@ -3395,7 +3395,7 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" dependencies = [ "aes-gcm", "brotli", diff --git a/tooling/cli/src/helpers/fs.rs b/tooling/cli/src/helpers/fs.rs new file mode 100644 index 00000000000..dd7491db13d --- /dev/null +++ b/tooling/cli/src/helpers/fs.rs @@ -0,0 +1,21 @@ +// Copyright 2019-2024 Tauri Programme within The Commons Conservancy +// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: MIT + +use anyhow::Result; +use std::path::Path; + +pub fn copy_file(from: impl AsRef, to: impl AsRef) -> Result<()> { + let from = from.as_ref(); + let to = to.as_ref(); + if !from.exists() { + return Err(anyhow::anyhow!("{:?} does not exist", from)); + } + if !from.is_file() { + return Err(anyhow::anyhow!("{:?} is not a file", from)); + } + let dest_dir = to.parent().expect("No data in parent"); + std::fs::create_dir_all(dest_dir)?; + std::fs::copy(from, to)?; + Ok(()) +} diff --git a/tooling/cli/src/helpers/mod.rs b/tooling/cli/src/helpers/mod.rs index 58bdd06edd9..e67929439c0 100644 --- a/tooling/cli/src/helpers/mod.rs +++ b/tooling/cli/src/helpers/mod.rs @@ -8,6 +8,7 @@ pub mod cargo_manifest; pub mod config; pub mod flock; pub mod framework; +pub mod fs; pub mod npm; pub mod plugins; pub mod prompts; diff --git a/tooling/cli/src/mobile/android/build.rs b/tooling/cli/src/mobile/android/build.rs index ad29b1de38a..557f4e1a890 100644 --- a/tooling/cli/src/mobile/android/build.rs +++ b/tooling/cli/src/mobile/android/build.rs @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT use super::{ - configure_cargo, delete_codegen_vars, ensure_init, env, get_app, get_config, inject_assets, + configure_cargo, delete_codegen_vars, ensure_init, env, get_app, get_config, inject_resources, log_finished, open_and_wait, MobileTarget, OptionsHandle, }; use crate::{ @@ -209,7 +209,7 @@ fn run_build( cli_options, )?; - inject_assets(config, tauri_config.lock().unwrap().as_ref().unwrap())?; + inject_resources(config, tauri_config.lock().unwrap().as_ref().unwrap())?; let apk_outputs = if options.apk { apk::build( diff --git a/tooling/cli/src/mobile/android/dev.rs b/tooling/cli/src/mobile/android/dev.rs index bb22c3fde9f..89b666127b8 100644 --- a/tooling/cli/src/mobile/android/dev.rs +++ b/tooling/cli/src/mobile/android/dev.rs @@ -4,7 +4,7 @@ use super::{ configure_cargo, delete_codegen_vars, device_prompt, ensure_init, env, get_app, get_config, - inject_assets, open_and_wait, MobileTarget, + inject_resources, open_and_wait, MobileTarget, }; use crate::{ dev::Options as DevOptions, @@ -244,7 +244,7 @@ fn run_dev( cli_options, )?; - inject_assets(config, tauri_config.lock().unwrap().as_ref().unwrap())?; + inject_resources(config, tauri_config.lock().unwrap().as_ref().unwrap())?; if open { open_and_wait(config, &env) diff --git a/tooling/cli/src/mobile/android/mod.rs b/tooling/cli/src/mobile/android/mod.rs index ebbecfb3fe6..9a4ff0ee591 100644 --- a/tooling/cli/src/mobile/android/mod.rs +++ b/tooling/cli/src/mobile/android/mod.rs @@ -25,6 +25,7 @@ use std::{ time::Duration, }; use sublime_fuzzy::best_match; +use tauri_utils::resources::ResourcePaths; use super::{ ensure_init, get_app, @@ -32,7 +33,10 @@ use super::{ log_finished, read_options, CliOptions, OptionsHandle, Target as MobileTarget, MIN_DEVICE_MATCH_SCORE, }; -use crate::{helpers::config::Config as TauriConfig, Result}; +use crate::{ + helpers::config::{BundleResources, Config as TauriConfig}, + Result, +}; mod android_studio_script; mod build; @@ -296,7 +300,7 @@ fn open_and_wait(config: &AndroidConfig, env: &Env) -> ! { } } -fn inject_assets(config: &AndroidConfig, tauri_config: &TauriConfig) -> Result<()> { +fn inject_resources(config: &AndroidConfig, tauri_config: &TauriConfig) -> Result<()> { let asset_dir = config .project_dir() .join("app/src/main") @@ -308,5 +312,18 @@ fn inject_assets(config: &AndroidConfig, tauri_config: &TauriConfig) -> Result<( serde_json::to_string(&tauri_config)?, )?; + let resources = match &tauri_config.bundle.resources { + Some(BundleResources::List(paths)) => Some(ResourcePaths::new(paths.as_slice(), true)), + Some(BundleResources::Map(map)) => Some(ResourcePaths::from_map(map, true)), + None => None, + }; + if let Some(resources) = resources { + for resource in resources.iter() { + let resource = resource?; + let dest = asset_dir.join(resource.target()); + crate::helpers::fs::copy_file(resource.path(), dest)?; + } + } + Ok(()) } diff --git a/tooling/cli/src/mobile/ios/build.rs b/tooling/cli/src/mobile/ios/build.rs index 74e1a3ef958..f3022473613 100644 --- a/tooling/cli/src/mobile/ios/build.rs +++ b/tooling/cli/src/mobile/ios/build.rs @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT use super::{ - configure_cargo, detect_target_ok, ensure_init, env, get_app, get_config, inject_assets, + configure_cargo, detect_target_ok, ensure_init, env, get_app, get_config, inject_resources, log_finished, merge_plist, open_and_wait, MobileTarget, OptionsHandle, }; use crate::{ @@ -164,7 +164,7 @@ pub fn command(options: Options, noise_level: NoiseLevel) -> Result<()> { config.project_dir(), MobileTarget::Ios, )?; - inject_assets(&config)?; + inject_resources(&config, tauri_config.lock().unwrap().as_ref().unwrap())?; let info_plist_path = config .project_dir() diff --git a/tooling/cli/src/mobile/ios/dev.rs b/tooling/cli/src/mobile/ios/dev.rs index a3ee3b6c81b..d8b382eac2c 100644 --- a/tooling/cli/src/mobile/ios/dev.rs +++ b/tooling/cli/src/mobile/ios/dev.rs @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT use super::{ - configure_cargo, device_prompt, ensure_init, env, get_app, get_config, inject_assets, + configure_cargo, device_prompt, ensure_init, env, get_app, get_config, inject_resources, merge_plist, open_and_wait, MobileTarget, }; use crate::{ @@ -179,7 +179,7 @@ fn run_command(options: Options, noise_level: NoiseLevel) -> Result<()> { config.project_dir(), MobileTarget::Ios, )?; - inject_assets(&config)?; + inject_resources(&config, tauri_config.lock().unwrap().as_ref().unwrap())?; let info_plist_path = config .project_dir() diff --git a/tooling/cli/src/mobile/ios/mod.rs b/tooling/cli/src/mobile/ios/mod.rs index 9e53853a866..44c5a7baf8f 100644 --- a/tooling/cli/src/mobile/ios/mod.rs +++ b/tooling/cli/src/mobile/ios/mod.rs @@ -20,6 +20,7 @@ use cargo_mobile2::{ }; use clap::{Parser, Subcommand}; use sublime_fuzzy::best_match; +use tauri_utils::resources::ResourcePaths; use super::{ ensure_init, env, get_app, @@ -28,7 +29,10 @@ use super::{ MIN_DEVICE_MATCH_SCORE, }; use crate::{ - helpers::{app_paths::tauri_dir, config::Config as TauriConfig}, + helpers::{ + app_paths::tauri_dir, + config::{BundleResources, Config as TauriConfig}, + }, Result, }; @@ -304,9 +308,23 @@ fn open_and_wait(config: &AppleConfig, env: &Env) -> ! { } } -fn inject_assets(config: &AppleConfig) -> Result<()> { +fn inject_resources(config: &AppleConfig, tauri_config: &TauriConfig) -> Result<()> { let asset_dir = config.project_dir().join(DEFAULT_ASSET_DIR); - create_dir_all(asset_dir)?; + create_dir_all(&asset_dir)?; + + let resources = match &tauri_config.bundle.resources { + Some(BundleResources::List(paths)) => Some(ResourcePaths::new(paths.as_slice(), true)), + Some(BundleResources::Map(map)) => Some(ResourcePaths::from_map(map, true)), + None => None, + }; + if let Some(resources) = resources { + for resource in resources.iter() { + let resource = resource?; + let dest = asset_dir.join(resource.target()); + crate::helpers::fs::copy_file(resource.path(), dest)?; + } + } + Ok(()) } From 1a60822a4220b6dbb1ad7295a2e37d6c3004edad Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Tue, 20 Aug 2024 14:09:50 -0300 Subject: [PATCH 3/5] fix(cli): `add` should use 2.0.0-rc for known plugins (#10699) changes the CLI `add` command to match the CLI major and pre requirements for known plugins this is required because right now adding the deep-link plugin installs the v1 plugin (latest version known by cargo as the v2 is still in RC), even though we're running the v2 CLI --- .changes/fix-cli-add-plugin-version.md | 6 ++++ tooling/cli/src/add.rs | 2 ++ tooling/cli/src/helpers/plugins.rs | 36 +++++++++++++++++++ .../cli/src/migrate/migrations/v1/frontend.rs | 4 +-- .../cli/src/migrate/migrations/v1/manifest.rs | 4 +-- 5 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 .changes/fix-cli-add-plugin-version.md diff --git a/.changes/fix-cli-add-plugin-version.md b/.changes/fix-cli-add-plugin-version.md new file mode 100644 index 00000000000..3c0db7e0722 --- /dev/null +++ b/.changes/fix-cli-add-plugin-version.md @@ -0,0 +1,6 @@ +--- +'tauri-cli': 'patch:bug' +'@tauri-apps/cli': 'patch:bug' +--- + +Changed the `add` command to use a version requirement that matches the CLI's stable and prerelease numbers. diff --git a/tooling/cli/src/add.rs b/tooling/cli/src/add.rs index 08635c589f6..7b488b5fcc5 100644 --- a/tooling/cli/src/add.rs +++ b/tooling/cli/src/add.rs @@ -68,6 +68,8 @@ pub fn run(options: Options) -> Result<()> { .then_some(r#"cfg(any(target_os = "android", target_os = "ios"))"#) }); + let version = version.or(metadata.version_req.as_deref()); + cargo::install_one(cargo::CargoInstallOptions { name: &crate_name, version, diff --git a/tooling/cli/src/helpers/plugins.rs b/tooling/cli/src/helpers/plugins.rs index 52280635bae..9c676150aeb 100644 --- a/tooling/cli/src/helpers/plugins.rs +++ b/tooling/cli/src/helpers/plugins.rs @@ -10,6 +10,7 @@ pub struct PluginMetadata { pub mobile_only: bool, pub rust_only: bool, pub builder: bool, + pub version_req: Option, } // known plugins with particular cases @@ -55,5 +56,40 @@ pub fn known_plugins() -> HashMap<&'static str, PluginMetadata> { plugins.entry(p).or_default().rust_only = true; } + // known, but no particular config + for p in [ + "geolocation", + "deep-link", + "dialog", + "fs", + "http", + "notification", + "os", + "process", + "shell", + "upload", + "websocket", + ] { + plugins.entry(p).or_default(); + } + + let version_req = version_req(); + for plugin in plugins.values_mut() { + plugin.version_req.replace(version_req.clone()); + } + plugins } + +fn version_req() -> String { + let pre = env!("CARGO_PKG_VERSION_PRE"); + if pre.is_empty() { + env!("CARGO_PKG_VERSION_MAJOR").to_string() + } else { + format!( + "{}.0.0-{}", + env!("CARGO_PKG_VERSION_MAJOR"), + pre.split('.').next().unwrap() + ) + } +} diff --git a/tooling/cli/src/migrate/migrations/v1/frontend.rs b/tooling/cli/src/migrate/migrations/v1/frontend.rs index b68b59eb0f4..5afba76da92 100644 --- a/tooling/cli/src/migrate/migrations/v1/frontend.rs +++ b/tooling/cli/src/migrate/migrations/v1/frontend.rs @@ -65,10 +65,8 @@ pub fn migrate(app_dir: &Path) -> Result> { format!("{}.0.0", env!("CARGO_PKG_VERSION_MAJOR")) } else { format!( - "{}.{}.{}-{}.0", + "{}.0.0-{}.0", env!("CARGO_PKG_VERSION_MAJOR"), - env!("CARGO_PKG_VERSION_MINOR"), - env!("CARGO_PKG_VERSION_PATCH"), pre.split('.').next().unwrap() ) }; diff --git a/tooling/cli/src/migrate/migrations/v1/manifest.rs b/tooling/cli/src/migrate/migrations/v1/manifest.rs index 73acd1111c9..9a83d985dec 100644 --- a/tooling/cli/src/migrate/migrations/v1/manifest.rs +++ b/tooling/cli/src/migrate/migrations/v1/manifest.rs @@ -198,10 +198,8 @@ fn dependency_version() -> String { env!("CARGO_PKG_VERSION_MAJOR").to_string() } else { format!( - "{}.{}.{}-{}", + "{}.0.0-{}", env!("CARGO_PKG_VERSION_MAJOR"), - env!("CARGO_PKG_VERSION_MINOR"), - env!("CARGO_PKG_VERSION_PATCH"), pre.split('.').next().unwrap() ) } From 762cf31a113f33cd524c8f6fa52ca47db8ea3705 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:25:20 -0300 Subject: [PATCH 4/5] apply version updates (#10698) Co-authored-by: lucasfernog --- .changes/pre.json | 4 ++++ Cargo.lock | 16 ++++++++-------- core/tauri-build/CHANGELOG.md | 7 +++++++ core/tauri-build/Cargo.toml | 6 +++--- core/tauri-codegen/CHANGELOG.md | 6 ++++++ core/tauri-codegen/Cargo.toml | 4 ++-- core/tauri-macros/CHANGELOG.md | 7 +++++++ core/tauri-macros/Cargo.toml | 6 +++--- core/tauri-plugin/CHANGELOG.md | 6 ++++++ core/tauri-plugin/Cargo.toml | 4 ++-- core/tauri-runtime-wry/CHANGELOG.md | 7 +++++++ core/tauri-runtime-wry/Cargo.toml | 6 +++--- core/tauri-runtime/CHANGELOG.md | 6 ++++++ core/tauri-runtime/Cargo.toml | 4 ++-- core/tauri-utils/CHANGELOG.md | 7 +++++++ core/tauri-utils/Cargo.toml | 2 +- core/tauri/CHANGELOG.md | 10 ++++++++++ core/tauri/Cargo.toml | 14 +++++++------- tooling/bundler/CHANGELOG.md | 6 ++++++ tooling/bundler/Cargo.toml | 4 ++-- tooling/cli/CHANGELOG.md | 15 +++++++++++++++ tooling/cli/Cargo.lock | 10 +++++----- tooling/cli/Cargo.toml | 6 +++--- tooling/cli/metadata-v2.json | 8 ++++---- tooling/cli/node/CHANGELOG.md | 14 ++++++++++++++ tooling/cli/node/package.json | 2 +- 26 files changed, 141 insertions(+), 46 deletions(-) diff --git a/.changes/pre.json b/.changes/pre.json index b84a7ccef7a..cede81e694c 100644 --- a/.changes/pre.json +++ b/.changes/pre.json @@ -28,6 +28,7 @@ ".changes/enhance-permission-error-message.md", ".changes/feat-remove-target-sdk.md", ".changes/fix-adb.md", + ".changes/fix-cli-add-plugin-version.md", ".changes/fix-cli-dev-server-android.md", ".changes/fix-cli-panic-bun.md", ".changes/fix-colon-in-file-path.md", @@ -46,6 +47,7 @@ ".changes/get-window-async.md", ".changes/improve-cli-init.md", ".changes/infer-signing-identity.md", + ".changes/inject-mobile-resources.md", ".changes/ios-custom-project-template.md", ".changes/ios-default-minversion.md", ".changes/ios-frameworks.md", @@ -63,6 +65,8 @@ ".changes/refactor-ipc-response.md", ".changes/remove-open-command.md", ".changes/remove-unsecure-configs.md", + ".changes/resource-dir-android.md", + ".changes/resource-dir-ios.md", ".changes/resources-map-becoming-dirs.md", ".changes/universal-bin-build-fails.md", ".changes/update-tao-wry.md", diff --git a/Cargo.lock b/Cargo.lock index d0005e7e401..c91439cc5fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3791,7 +3791,7 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "anyhow", "bytes", @@ -3860,7 +3860,7 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "anyhow", "cargo_toml", @@ -3882,7 +3882,7 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "base64 0.22.1", "brotli", @@ -3919,7 +3919,7 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3931,7 +3931,7 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "anyhow", "glob", @@ -3946,7 +3946,7 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "dpi", "gtk", @@ -3963,7 +3963,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "cocoa 0.26.0", "gtk", @@ -3986,7 +3986,7 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "aes-gcm", "brotli", diff --git a/core/tauri-build/CHANGELOG.md b/core/tauri-build/CHANGELOG.md index aa5170fa8d7..7e553743a1c 100644 --- a/core/tauri-build/CHANGELOG.md +++ b/core/tauri-build/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## \[2.0.0-rc.5] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-rc.5` +- Upgraded to `tauri-codegen@2.0.0-rc.5` + ## \[2.0.0-rc.4] ### Bug Fixes diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml index 3f0d3d2576f..d5062670f67 100644 --- a/core/tauri-build/Cargo.toml +++ b/core/tauri-build/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-build" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" description = "build time code to pair with https://crates.io/crates/tauri" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" @@ -28,8 +28,8 @@ rustdoc-args = [ "--cfg", "docsrs" ] [dependencies] anyhow = "1" quote = { version = "1", optional = true } -tauri-codegen = { version = "2.0.0-rc.4", path = "../tauri-codegen", optional = true } -tauri-utils = { version = "2.0.0-rc.4", path = "../tauri-utils", features = [ "build", "resources" ] } +tauri-codegen = { version = "2.0.0-rc.5", path = "../tauri-codegen", optional = true } +tauri-utils = { version = "2.0.0-rc.5", path = "../tauri-utils", features = [ "build", "resources" ] } cargo_toml = "0.17" serde = "1" serde_json = "1" diff --git a/core/tauri-codegen/CHANGELOG.md b/core/tauri-codegen/CHANGELOG.md index f83b47d7007..d2898047032 100644 --- a/core/tauri-codegen/CHANGELOG.md +++ b/core/tauri-codegen/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-rc.5] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-rc.5` + ## \[2.0.0-rc.4] ### Dependencies diff --git a/core/tauri-codegen/Cargo.toml b/core/tauri-codegen/Cargo.toml index 7d85dc17a82..5142aabc09d 100644 --- a/core/tauri-codegen/Cargo.toml +++ b/core/tauri-codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-codegen" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" @@ -20,7 +20,7 @@ quote = "1" syn = "2" serde = { version = "1", features = [ "derive" ] } serde_json = "1" -tauri-utils = { version = "2.0.0-rc.4", path = "../tauri-utils", features = [ "build" ] } +tauri-utils = { version = "2.0.0-rc.5", path = "../tauri-utils", features = [ "build" ] } thiserror = "1" walkdir = "2" brotli = { version = "6", optional = true, default-features = false, features = [ "std" ] } diff --git a/core/tauri-macros/CHANGELOG.md b/core/tauri-macros/CHANGELOG.md index fd275faf0f8..1afa25c4833 100644 --- a/core/tauri-macros/CHANGELOG.md +++ b/core/tauri-macros/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## \[2.0.0-rc.5] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-rc.5` +- Upgraded to `tauri-codegen@2.0.0-rc.5` + ## \[2.0.0-rc.4] ### Dependencies diff --git a/core/tauri-macros/Cargo.toml b/core/tauri-macros/Cargo.toml index 5fbcc33f752..a740f8ee10f 100644 --- a/core/tauri-macros/Cargo.toml +++ b/core/tauri-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-macros" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" description = "Macros for the tauri crate." exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" @@ -20,8 +20,8 @@ proc-macro2 = { version = "1", features = [ "span-locations" ] } quote = "1" syn = { version = "2", features = [ "full" ] } heck = "0.5" -tauri-codegen = { version = "2.0.0-rc.4", default-features = false, path = "../tauri-codegen" } -tauri-utils = { version = "2.0.0-rc.4", path = "../tauri-utils" } +tauri-codegen = { version = "2.0.0-rc.5", default-features = false, path = "../tauri-codegen" } +tauri-utils = { version = "2.0.0-rc.5", path = "../tauri-utils" } [features] custom-protocol = [ ] diff --git a/core/tauri-plugin/CHANGELOG.md b/core/tauri-plugin/CHANGELOG.md index 830ebd222bd..3170d6e9211 100644 --- a/core/tauri-plugin/CHANGELOG.md +++ b/core/tauri-plugin/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-rc.5] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-rc.5` + ## \[2.0.0-rc.4] ### Dependencies diff --git a/core/tauri-plugin/Cargo.toml b/core/tauri-plugin/Cargo.toml index 87d6c9da11f..ade251c0f3a 100644 --- a/core/tauri-plugin/Cargo.toml +++ b/core/tauri-plugin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" description = "Build script and runtime Tauri plugin definitions" authors = { workspace = true } homepage = { workspace = true } @@ -30,7 +30,7 @@ runtime = [ ] [dependencies] anyhow = { version = "1", optional = true } serde = { version = "1", optional = true } -tauri-utils = { version = "2.0.0-rc.4", default-features = false, features = [ "build" ], path = "../tauri-utils" } +tauri-utils = { version = "2.0.0-rc.5", default-features = false, features = [ "build" ], path = "../tauri-utils" } serde_json = { version = "1", optional = true } glob = { version = "0.3", optional = true } toml = { version = "0.8", optional = true } diff --git a/core/tauri-runtime-wry/CHANGELOG.md b/core/tauri-runtime-wry/CHANGELOG.md index 35c812eefd5..7dab768233c 100644 --- a/core/tauri-runtime-wry/CHANGELOG.md +++ b/core/tauri-runtime-wry/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## \[2.0.0-rc.5] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-rc.5` +- Upgraded to `tauri-runtime@2.0.0-rc.5` + ## \[2.0.0-rc.4] ### Dependencies diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index 58ad6adca4f..335b02f4b43 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-runtime-wry" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" description = "Wry bindings to the Tauri runtime" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" @@ -19,8 +19,8 @@ rustdoc-args = [ "--cfg", "docsrs" ] [dependencies] wry = { version = "0.42", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] } tao = { version = "0.29", default-features = false, features = [ "rwh_06" ] } -tauri-runtime = { version = "2.0.0-rc.4", path = "../tauri-runtime" } -tauri-utils = { version = "2.0.0-rc.4", path = "../tauri-utils" } +tauri-runtime = { version = "2.0.0-rc.5", path = "../tauri-runtime" } +tauri-utils = { version = "2.0.0-rc.5", path = "../tauri-utils" } raw-window-handle = "0.6" http = "1.1" url = "2" diff --git a/core/tauri-runtime/CHANGELOG.md b/core/tauri-runtime/CHANGELOG.md index 7a1368290f3..a764ebf97df 100644 --- a/core/tauri-runtime/CHANGELOG.md +++ b/core/tauri-runtime/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-rc.5] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-rc.5` + ## \[2.0.0-rc.4] ### Dependencies diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml index f969de70f32..77c01840982 100644 --- a/core/tauri-runtime/Cargo.toml +++ b/core/tauri-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-runtime" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" description = "Runtime for Tauri applications" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" @@ -29,7 +29,7 @@ targets = [ serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" thiserror = "1.0" -tauri-utils = { version = "2.0.0-rc.4", path = "../tauri-utils" } +tauri-utils = { version = "2.0.0-rc.5", path = "../tauri-utils" } http = "1.1" raw-window-handle = "0.6" url = { version = "2" } diff --git a/core/tauri-utils/CHANGELOG.md b/core/tauri-utils/CHANGELOG.md index 582f5fc919a..b1d16eee64d 100644 --- a/core/tauri-utils/CHANGELOG.md +++ b/core/tauri-utils/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## \[2.0.0-rc.5] + +### Bug Fixes + +- [`da381e07f`](https://www.github.com/tauri-apps/tauri/commit/da381e07f3770988fe6d0859a02331b87cc6723f) ([#10696](https://www.github.com/tauri-apps/tauri/pull/10696) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Implemented `resource_dir` on Android, which returns a URI that needs to be resolved using [AssetManager::open](https://developer.android.com/reference/android/content/res/AssetManager#open\(java.lang.String,%20int\)). This will be handled by the file system plugin. +- [`da381e07f`](https://www.github.com/tauri-apps/tauri/commit/da381e07f3770988fe6d0859a02331b87cc6723f) ([#10696](https://www.github.com/tauri-apps/tauri/pull/10696) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Fix `resource_dir` on iOS. + ## \[2.0.0-rc.4] ### New Features diff --git a/core/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml index 8b9169195e8..bcfcf8a6742 100644 --- a/core/tauri-utils/Cargo.toml +++ b/core/tauri-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-utils" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" description = "Utilities for Tauri" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" diff --git a/core/tauri/CHANGELOG.md b/core/tauri/CHANGELOG.md index 09f50a92dd7..eed2f60ec4e 100644 --- a/core/tauri/CHANGELOG.md +++ b/core/tauri/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## \[2.0.0-rc.5] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-rc.5` +- Upgraded to `tauri-runtime@2.0.0-rc.5` +- Upgraded to `tauri-runtime-wry@2.0.0-rc.5` +- Upgraded to `tauri-macros@2.0.0-rc.5` +- Upgraded to `tauri-build@2.0.0-rc.5` + ## \[2.0.0-rc.4] ### Enhancements diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 2cbb5be2c6e..93537d8a54d 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" description = "Make tiny, secure apps for all desktop platforms with Tauri" exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ] readme = "README.md" @@ -51,10 +51,10 @@ uuid = { version = "1", features = [ "v4" ], optional = true } url = "2" anyhow = "1.0" thiserror = "1.0" -tauri-runtime = { version = "2.0.0-rc.4", path = "../tauri-runtime" } -tauri-macros = { version = "2.0.0-rc.4", path = "../tauri-macros" } -tauri-utils = { version = "2.0.0-rc.4", features = [ "resources" ], path = "../tauri-utils" } -tauri-runtime-wry = { version = "2.0.0-rc.4", path = "../tauri-runtime-wry", optional = true } +tauri-runtime = { version = "2.0.0-rc.5", path = "../tauri-runtime" } +tauri-macros = { version = "2.0.0-rc.5", path = "../tauri-macros" } +tauri-utils = { version = "2.0.0-rc.5", features = [ "resources" ], path = "../tauri-utils" } +tauri-runtime-wry = { version = "2.0.0-rc.5", path = "../tauri-runtime-wry", optional = true } getrandom = "0.2" serde_repr = "0.1" state = "0.6" @@ -110,8 +110,8 @@ swift-rs = "1.0.6" [build-dependencies] heck = "0.5" -tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-rc.4" } -tauri-utils = { path = "../tauri-utils/", version = "2.0.0-rc.4", features = [ "build" ] } +tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-rc.5" } +tauri-utils = { path = "../tauri-utils/", version = "2.0.0-rc.5", features = [ "build" ] } [dev-dependencies] proptest = "1.4.0" diff --git a/tooling/bundler/CHANGELOG.md b/tooling/bundler/CHANGELOG.md index 7d8c459417f..b428f962a1e 100644 --- a/tooling/bundler/CHANGELOG.md +++ b/tooling/bundler/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.1-rc.4] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-rc.5` + ## \[2.0.1-rc.3] ### New Features diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml index 69d323c3bde..e1a23d38f7e 100644 --- a/tooling/bundler/Cargo.toml +++ b/tooling/bundler/Cargo.toml @@ -2,7 +2,7 @@ workspace = { } [package] name = "tauri-bundler" -version = "2.0.1-rc.3" +version = "2.0.1-rc.4" authors = [ "George Burton ", "Tauri Programme within The Commons Conservancy" @@ -17,7 +17,7 @@ rust-version = "1.70" exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ] [dependencies] -tauri-utils = { version = "2.0.0-rc.4", path = "../../core/tauri-utils", features = [ "resources" ] } +tauri-utils = { version = "2.0.0-rc.5", path = "../../core/tauri-utils", features = [ "resources" ] } image = "0.25.0" flate2 = "1.0" anyhow = "1.0" diff --git a/tooling/cli/CHANGELOG.md b/tooling/cli/CHANGELOG.md index 50983929b16..084e0d64962 100644 --- a/tooling/cli/CHANGELOG.md +++ b/tooling/cli/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## \[2.0.0-rc.6] + +### New Features + +- [`da381e07f`](https://www.github.com/tauri-apps/tauri/commit/da381e07f3770988fe6d0859a02331b87cc6723f) ([#10696](https://www.github.com/tauri-apps/tauri/pull/10696) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Inject configured resources on mobile apps. + +### Bug Fixes + +- [`1a60822a4`](https://www.github.com/tauri-apps/tauri/commit/1a60822a4220b6dbb1ad7295a2e37d6c3004edad) ([#10699](https://www.github.com/tauri-apps/tauri/pull/10699) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Changed the `add` command to use a version requirement that matches the CLI's stable and prerelease numbers. + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-rc.5` +- Upgraded to `tauri-bundler@2.0.1-rc.4` + ## \[2.0.0-rc.5] ### New Features diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 73c0f338d71..8748a72901e 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -5339,7 +5339,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri-bundler" -version = "2.0.1-rc.3" +version = "2.0.1-rc.4" dependencies = [ "anyhow", "ar", @@ -5368,7 +5368,7 @@ dependencies = [ "tar", "tauri-icns", "tauri-macos-sign", - "tauri-utils 2.0.0-rc.4", + "tauri-utils 2.0.0-rc.5", "tempfile", "thiserror", "time", @@ -5382,7 +5382,7 @@ dependencies = [ [[package]] name = "tauri-cli" -version = "2.0.0-rc.5" +version = "2.0.0-rc.6" dependencies = [ "anyhow", "axum", @@ -5442,7 +5442,7 @@ dependencies = [ "tauri-icns", "tauri-macos-sign", "tauri-utils 1.5.4", - "tauri-utils 2.0.0-rc.4", + "tauri-utils 2.0.0-rc.5", "tokio", "toml 0.8.10", "toml_edit 0.22.6", @@ -5523,7 +5523,7 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "aes-gcm", "ctor", diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index a2724a2b0ac..376548e4b73 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -3,7 +3,7 @@ members = [ "node" ] [package] name = "tauri-cli" -version = "2.0.0-rc.5" +version = "2.0.0-rc.6" authors = [ "Tauri Programme within The Commons Conservancy" ] edition = "2021" rust-version = "1.70" @@ -48,7 +48,7 @@ sublime_fuzzy = "0.7" clap_complete = "4" clap = { version = "4.5", features = [ "derive", "env" ] } anyhow = "1.0" -tauri-bundler = { version = "2.0.1-rc.3", default-features = false, path = "../bundler" } +tauri-bundler = { version = "2.0.1-rc.4", default-features = false, path = "../bundler" } colored = "2.1" serde = { version = "1.0", features = [ "derive" ] } serde_json = { version = "1.0", features = [ "preserve_order" ] } @@ -58,7 +58,7 @@ shared_child = "1.0" duct = "0.13" toml_edit = { version = "0.22", features = [ "serde" ] } json-patch = "2.0" -tauri-utils = { version = "2.0.0-rc.4", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } +tauri-utils = { version = "2.0.0-rc.5", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } tauri-utils-v1 = { version = "1", package = "tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } toml = "0.8" jsonschema = "0.18" diff --git a/tooling/cli/metadata-v2.json b/tooling/cli/metadata-v2.json index 622445e0143..f193168a07b 100644 --- a/tooling/cli/metadata-v2.json +++ b/tooling/cli/metadata-v2.json @@ -1,9 +1,9 @@ { "cli.js": { - "version": "2.0.0-rc.5", + "version": "2.0.0-rc.6", "node": ">= 10.0.0" }, - "tauri": "2.0.0-rc.4", - "tauri-build": "2.0.0-rc.4", - "tauri-plugin": "2.0.0-rc.4" + "tauri": "2.0.0-rc.5", + "tauri-build": "2.0.0-rc.5", + "tauri-plugin": "2.0.0-rc.5" } diff --git a/tooling/cli/node/CHANGELOG.md b/tooling/cli/node/CHANGELOG.md index 1c2a6f84aa8..49f92bf1722 100644 --- a/tooling/cli/node/CHANGELOG.md +++ b/tooling/cli/node/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## \[2.0.0-rc.6] + +### New Features + +- [`da381e07f`](https://www.github.com/tauri-apps/tauri/commit/da381e07f3770988fe6d0859a02331b87cc6723f) ([#10696](https://www.github.com/tauri-apps/tauri/pull/10696) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Inject configured resources on mobile apps. + +### Bug Fixes + +- [`1a60822a4`](https://www.github.com/tauri-apps/tauri/commit/1a60822a4220b6dbb1ad7295a2e37d6c3004edad) ([#10699](https://www.github.com/tauri-apps/tauri/pull/10699) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Changed the `add` command to use a version requirement that matches the CLI's stable and prerelease numbers. + +### Dependencies + +- Upgraded to `tauri-cli@2.0.0-rc.6` + ## \[2.0.0-rc.5] ### New Features diff --git a/tooling/cli/node/package.json b/tooling/cli/node/package.json index 1eaf3827aaf..0c9a9cb5ef0 100644 --- a/tooling/cli/node/package.json +++ b/tooling/cli/node/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/cli", - "version": "2.0.0-rc.5", + "version": "2.0.0-rc.6", "description": "Command line interface for building Tauri apps", "funding": { "type": "opencollective", From 9bcff3cd7997fe13425a21b577f93317831f77fa Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Wed, 21 Aug 2024 09:08:16 -0300 Subject: [PATCH 5/5] fix(core): properly remove isolation script from DOM (#10703) --- .changes/fix-android-remove-current-script.md | 5 +++++ core/tauri-utils/src/pattern/isolation.js | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changes/fix-android-remove-current-script.md diff --git a/.changes/fix-android-remove-current-script.md b/.changes/fix-android-remove-current-script.md new file mode 100644 index 00000000000..ddf70c521a9 --- /dev/null +++ b/.changes/fix-android-remove-current-script.md @@ -0,0 +1,5 @@ +--- +"tauri-utils": patch:bug +--- + +Properly remove isolation script on Android. diff --git a/core/tauri-utils/src/pattern/isolation.js b/core/tauri-utils/src/pattern/isolation.js index b0b1370b52e..9a44611c630 100644 --- a/core/tauri-utils/src/pattern/isolation.js +++ b/core/tauri-utils/src/pattern/isolation.js @@ -149,6 +149,6 @@ } setTimeout(waitUntilReady, readyIntervalMs) - - document.currentScript.remove() })() + +document.currentScript?.remove()