Skip to content

Commit

Permalink
Merge branch 'tauri-apps:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
hixio-mh authored Nov 11, 2023
2 parents e8c91a9 + e9aa727 commit 4b4bb6e
Show file tree
Hide file tree
Showing 72 changed files with 2,872 additions and 2,356 deletions.
6 changes: 6 additions & 0 deletions .changes/cli-plugin-name-snake-case.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'tauri-cli': 'patch:bug'
'@tauri-apps/cli': 'patch:bug'
---

Ensure `tauri add` prints `rust_code` with plugin name in snake case.
5 changes: 5 additions & 0 deletions .changes/fix-api-package.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tauri-apps/api": patch:bug
---

Fix tslib missing in the distributed api package.
5 changes: 5 additions & 0 deletions .changes/fix-global-event.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri": patch:bug
---

Fixes global events not reaching to window listeners.
6 changes: 6 additions & 0 deletions .changes/fix-plugin-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@tauri-apps/cli": patch:bug
"tauri-cli": patch:bug
---

Fix invalid plugin template.
5 changes: 5 additions & 0 deletions .changes/fix-wix-output-filename-version.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri-bundler": 'patch:bug'
---

Use original version string on WiX output file name.
6 changes: 6 additions & 0 deletions .changes/icon-svg.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri-cli": patch:feat
"@tauri-apps/cli": patch:feat
---

Add suport to SVG input image for the `tauri icon` command.
16 changes: 16 additions & 0 deletions .changes/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
".changes/android-enhance-method-parse.md",
".changes/android-load-config.md",
".changes/android-on-new-intent.md",
".changes/android-onresume.md",
".changes/android-plugin-command-exception.md",
".changes/android-plugin-get-config-typed.md",
".changes/api-app.md",
".changes/api-ipc-refactor.md",
".changes/api-min-node-18.md",
Expand All @@ -24,6 +26,7 @@
".changes/app-plugin-core.md",
".changes/build-android-env-vars.md",
".changes/bump-1.3.md",
".changes/bump-1.5.md",
".changes/bundler-remove-dialog-option.md",
".changes/bundler-zip-deflate.md",
".changes/channel-api.md",
Expand Down Expand Up @@ -85,8 +88,10 @@
".changes/event-api-window-label.md",
".changes/file-associations-config.md",
".changes/file-associations.md",
".changes/fix-api-package.md",
".changes/fix-build-script-mobile-runner-npm.md",
".changes/fix-channel-data-request.md",
".changes/fix-clearmocks.md",
".changes/fix-dev-server-proxy-path.md",
".changes/fix-empty-identifier.md",
".changes/fix-icons-android.md",
Expand Down Expand Up @@ -114,6 +119,7 @@
".changes/force-colored-logs.md",
".changes/generate-tauri-activity.md",
".changes/gradle-8.md",
".changes/gtk018.md",
".changes/gtk16.md",
".changes/http-types-refactor.md",
".changes/improve-local-ip-detection.md",
Expand Down Expand Up @@ -156,6 +162,8 @@
".changes/mobile-lib-name.md",
".changes/mobile-open.md",
".changes/mobile-plugin-config.md",
".changes/mobile-plugin-resolve-object.md",
".changes/mobile-plugin-typed-invoke-args.md",
".changes/mobile-plugins.md",
".changes/mobile-webview-access.md",
".changes/mobile.md",
Expand All @@ -178,8 +186,10 @@
".changes/napi-rs.md",
".changes/npm-pass-args.md",
".changes/nsis-bulgarian.md",
".changes/nsis-german.md",
".changes/on-navigation-plugin.md",
".changes/on-new-intent.md",
".changes/on-page-load-hook.md",
".changes/only-proxy-on-mobile.md",
".changes/open-ts-overload.md",
".changes/package-info-crate-name.md",
Expand All @@ -193,9 +203,11 @@
".changes/plugin-setup-refactor.md",
".changes/plugin-template-examples-manifest.md",
".changes/pnpm-android.md",
".changes/prevent-ios-crash.md",
".changes/process-mod-refactor.md",
".changes/raw-encoding.md",
".changes/refactor-macros.md",
".changes/refactor-on-page-load.md",
".changes/refactor-setup.md",
".changes/refactor-tauri-android-dependency.md",
".changes/register_asynchronous_uri_scheme_protocol.md",
Expand Down Expand Up @@ -247,6 +259,7 @@
".changes/tauri-defaultvbox.md",
".changes/tauri-env-args.md",
".changes/tauri-env-vars.md",
".changes/tauri-event-system-apis.md",
".changes/tauri-extranous-result-types-removal.md",
".changes/tauri-libxdo-feat.md",
".changes/tauri-menu-tray-refactor.md",
Expand All @@ -272,15 +285,18 @@
".changes/ubuntu-20.04-cli.js.md",
".changes/ubuntu-20.04-cli.rs.md",
".changes/update-entitlements-api.md",
".changes/update-mobile-template.md",
".changes/validate-appimage.md",
".changes/window-effects-api.md",
".changes/window-effects-config.md",
".changes/window-effects.md",
".changes/window-on-message-refactor.md",
".changes/window-on-navigation-arg.md",
".changes/window-plugin-core.md",
".changes/windows-rs-0.51.md",
".changes/with-webview.md",
".changes/wry-0.32.md",
".changes/wry-0.34.md",
".changes/wry-navigate-method.md",
".changes/wry26.md"
]
Expand Down
6 changes: 6 additions & 0 deletions .changes/relative-mobile-args.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri-cli": patch:enhance
"@tauri-apps/cli": patch:enhance
---

Transform paths to relative to the mobile project for the IDE script runner script.
5 changes: 5 additions & 0 deletions .changes/tauri-build-resource-compiler.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri-build": 'patch:bug'
---

Fixed an issue that caused the resource compiler to not run on Windows when `package.version` was not set in `tauri.conf.json` preventing the app from starting.
11 changes: 11 additions & 0 deletions core/tauri-build/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## \[2.0.0-alpha.11]

### Enhancements

- [`c6c59cf2`](https://www.github.com/tauri-apps/tauri/commit/c6c59cf2373258b626b00a26f4de4331765dd487) Pull changes from Tauri 1.5 release.

### Dependencies

- Upgraded to `[email protected]`
- Upgraded to `[email protected]`

## \[2.0.0-alpha.10]

### New Features
Expand Down
8 changes: 4 additions & 4 deletions core/tauri-build/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-build"
version = "2.0.0-alpha.10"
version = "2.0.0-alpha.11"
description = "build time code to pair with https://crates.io/crates/tauri"
exclude = [ "CHANGELOG.md", "/target" ]
readme = "README.md"
Expand Down Expand Up @@ -28,9 +28,9 @@ rustdoc-args = [ "--cfg", "docsrs" ]
[dependencies]
anyhow = "1"
quote = { version = "1", optional = true }
tauri-codegen = { version = "2.0.0-alpha.9", path = "../tauri-codegen", optional = true }
tauri-utils = { version = "2.0.0-alpha.9", path = "../tauri-utils", features = [ "build", "resources" ] }
cargo_toml = "0.16"
tauri-codegen = { version = "2.0.0-alpha.10", path = "../tauri-codegen", optional = true }
tauri-utils = { version = "2.0.0-alpha.10", path = "../tauri-utils", features = [ "build", "resources" ] }
cargo_toml = "0.17"
serde = "1"
serde_json = "1"
heck = "0.4"
Expand Down
77 changes: 40 additions & 37 deletions core/tauri-build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -534,47 +534,50 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
.window_icon_path
.unwrap_or_else(|| find_icon(&config, |i| i.ends_with(".ico"), "icons/icon.ico"));

if target_triple.contains("windows") {
if window_icon_path.exists() {
let mut res = WindowsResource::new();

if let Some(manifest) = attributes.windows_attributes.app_manifest {
res.set_manifest(&manifest);
} else {
res.set_manifest(include_str!("window-app-manifest.xml"));
}
let mut res = WindowsResource::new();

if let Some(version_str) = &config.package.version {
if let Ok(v) = Version::parse(version_str) {
let version = v.major << 48 | v.minor << 32 | v.patch << 16;
res.set_version_info(VersionInfo::FILEVERSION, version);
res.set_version_info(VersionInfo::PRODUCTVERSION, version);
}
if let Some(product_name) = &config.package.product_name {
res.set("ProductName", product_name);
}
if let Some(short_description) = &config.tauri.bundle.short_description {
res.set("FileDescription", short_description);
}
if let Some(copyright) = &config.tauri.bundle.copyright {
res.set("LegalCopyright", copyright);
}
res.set_icon_with_id(&window_icon_path.display().to_string(), "32512");
res.compile().with_context(|| {
format!(
"failed to compile `{}` into a Windows Resource file during tauri-build",
window_icon_path.display()
)
})?;
}
} else {
return Err(anyhow!(format!(
"`{}` not found; required for generating a Windows Resource file during tauri-build",
window_icon_path.display()
)));
if let Some(manifest) = attributes.windows_attributes.app_manifest {
res.set_manifest(&manifest);
} else {
res.set_manifest(include_str!("window-app-manifest.xml"));
}

if let Some(version_str) = &config.package.version {
if let Ok(v) = Version::parse(version_str) {
let version = v.major << 48 | v.minor << 32 | v.patch << 16;
res.set_version_info(VersionInfo::FILEVERSION, version);
res.set_version_info(VersionInfo::PRODUCTVERSION, version);
}
}

if let Some(product_name) = &config.package.product_name {
res.set("ProductName", product_name);
}

if let Some(short_description) = &config.tauri.bundle.short_description {
res.set("FileDescription", short_description);
}

if let Some(copyright) = &config.tauri.bundle.copyright {
res.set("LegalCopyright", copyright);
}

if window_icon_path.exists() {
res.set_icon_with_id(&window_icon_path.display().to_string(), "32512");
} else {
return Err(anyhow!(format!(
"`{}` not found; required for generating a Windows Resource file during tauri-build",
window_icon_path.display()
)));
}

res.compile().with_context(|| {
format!(
"failed to compile `{}` into a Windows Resource file during tauri-build",
window_icon_path.display()
)
})?;

let target_env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
match target_env.as_str() {
"gnu" => {
Expand Down
10 changes: 10 additions & 0 deletions core/tauri-codegen/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## \[2.0.0-alpha.10]

### Enhancements

- [`c6c59cf2`](https://www.github.com/tauri-apps/tauri/commit/c6c59cf2373258b626b00a26f4de4331765dd487) Pull changes from Tauri 1.5 release.

### Dependencies

- Upgraded to `[email protected]`

## \[2.0.0-alpha.9]

### New Features
Expand Down
4 changes: 2 additions & 2 deletions core/tauri-codegen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-codegen"
version = "2.0.0-alpha.9"
version = "2.0.0-alpha.10"
description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`"
exclude = [ "CHANGELOG.md", "/target" ]
readme = "README.md"
Expand All @@ -19,7 +19,7 @@ proc-macro2 = "1"
quote = "1"
serde = { version = "1", features = [ "derive" ] }
serde_json = "1"
tauri-utils = { version = "2.0.0-alpha.9", path = "../tauri-utils", features = [ "build" ] }
tauri-utils = { version = "2.0.0-alpha.10", path = "../tauri-utils", features = [ "build" ] }
thiserror = "1"
walkdir = "2"
brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] }
Expand Down
2 changes: 1 addition & 1 deletion core/tauri-codegen/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ pub fn context_codegen(data: ContextData) -> Result<TokenStream, EmbeddedAssetsE
#[allow(unused_mut, clippy::let_and_return)]
let mut context = #root::Context::new(
#config,
::std::sync::Arc::new(#assets),
::std::boxed::Box::new(#assets),
#default_window_icon,
#app_icon,
#package_info,
Expand Down
11 changes: 11 additions & 0 deletions core/tauri-macros/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## \[2.0.0-alpha.10]

### Enhancements

- [`c6c59cf2`](https://www.github.com/tauri-apps/tauri/commit/c6c59cf2373258b626b00a26f4de4331765dd487) Pull changes from Tauri 1.5 release.

### Dependencies

- Upgraded to `[email protected]`
- Upgraded to `[email protected]`

## \[2.0.0-alpha.9]

### New Features
Expand Down
6 changes: 3 additions & 3 deletions core/tauri-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-macros"
version = "2.0.0-alpha.9"
version = "2.0.0-alpha.10"
description = "Macros for the tauri crate."
exclude = [ "CHANGELOG.md", "/target" ]
readme = "README.md"
Expand All @@ -20,8 +20,8 @@ proc-macro2 = "1"
quote = "1"
syn = { version = "1", features = [ "full" ] }
heck = "0.4"
tauri-codegen = { version = "2.0.0-alpha.9", default-features = false, path = "../tauri-codegen" }
tauri-utils = { version = "2.0.0-alpha.9", path = "../tauri-utils" }
tauri-codegen = { version = "2.0.0-alpha.10", default-features = false, path = "../tauri-codegen" }
tauri-utils = { version = "2.0.0-alpha.10", path = "../tauri-utils" }

[features]
custom-protocol = [ ]
Expand Down
18 changes: 18 additions & 0 deletions core/tauri-runtime-wry/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Changelog

## \[1.0.0-alpha.5]

### New Features

- [`74d2464d`](https://www.github.com/tauri-apps/tauri/commit/74d2464d0e490fae341ad73bdf2964cf215fe6c5)([#8116](https://www.github.com/tauri-apps/tauri/pull/8116)) Added `on_page_load` hook for `PendingWindow`.

### Enhancements

- [`c6c59cf2`](https://www.github.com/tauri-apps/tauri/commit/c6c59cf2373258b626b00a26f4de4331765dd487) Pull changes from Tauri 1.5 release.

### Dependencies

- Upgraded to `[email protected]`
- Upgraded to `[email protected]`
- [`9580df1d`](https://www.github.com/tauri-apps/tauri/commit/9580df1d7b027befb9e5f025ea2cbaf2dcc82c8e)([#8084](https://www.github.com/tauri-apps/tauri/pull/8084)) Upgrade `gtk` to 0.18.
- [`c7c2507d`](https://www.github.com/tauri-apps/tauri/commit/c7c2507da16a9beb71bf06745fe7ac1325ab7c2a)([#8035](https://www.github.com/tauri-apps/tauri/pull/8035)) Update `windows` to version `0.51` and `webview2-com` to version `0.27`
- [`9580df1d`](https://www.github.com/tauri-apps/tauri/commit/9580df1d7b027befb9e5f025ea2cbaf2dcc82c8e)([#8084](https://www.github.com/tauri-apps/tauri/pull/8084)) Updated to [email protected], removing the `dox` feature flag.

## \[1.0.0-alpha.4]

### New Features
Expand Down
6 changes: 3 additions & 3 deletions core/tauri-runtime-wry/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri-runtime-wry"
version = "1.0.0-alpha.4"
version = "1.0.0-alpha.5"
description = "Wry bindings to the Tauri runtime"
exclude = [ "CHANGELOG.md", "/target" ]
readme = "README.md"
Expand All @@ -14,8 +14,8 @@ rust-version = { workspace = true }

[dependencies]
wry = { version = "0.34.2", default-features = false, features = [ "tao", "file-drop", "protocol" ] }
tauri-runtime = { version = "1.0.0-alpha.3", path = "../tauri-runtime" }
tauri-utils = { version = "2.0.0-alpha.9", path = "../tauri-utils" }
tauri-runtime = { version = "1.0.0-alpha.4", path = "../tauri-runtime" }
tauri-utils = { version = "2.0.0-alpha.10", path = "../tauri-utils" }
raw-window-handle = "0.5"
http = "0.2"

Expand Down
Loading

0 comments on commit 4b4bb6e

Please sign in to comment.