From a70e690fe794fa7c7dd77c0cb0b77c5340392c8c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2025 10:07:28 +0100 Subject: [PATCH] apply version updates (#12425) Co-authored-by: FabianLars <30730186+FabianLars@users.noreply.github.com> --- .changes/fix-bundler-msi-install-dir-lookup.md | 5 ----- .changes/fix-bundler-wix-dlls.md | 5 ----- .changes/fix-nsis-webviewloaderdll.md | 5 ----- .changes/initialization_scripts_order.md | 5 ----- Cargo.lock | 6 +++--- crates/tauri-bundler/CHANGELOG.md | 8 ++++++++ crates/tauri-bundler/Cargo.toml | 2 +- crates/tauri-cli/CHANGELOG.md | 6 ++++++ crates/tauri-cli/Cargo.toml | 4 ++-- crates/tauri-cli/config.schema.json | 2 +- crates/tauri-cli/metadata-v2.json | 4 ++-- crates/tauri-schema-generator/schemas/config.schema.json | 2 +- crates/tauri/CHANGELOG.md | 6 ++++++ crates/tauri/Cargo.toml | 2 +- packages/cli/CHANGELOG.md | 6 ++++++ packages/cli/package.json | 2 +- 16 files changed, 38 insertions(+), 32 deletions(-) delete mode 100644 .changes/fix-bundler-msi-install-dir-lookup.md delete mode 100644 .changes/fix-bundler-wix-dlls.md delete mode 100644 .changes/fix-nsis-webviewloaderdll.md delete mode 100644 .changes/initialization_scripts_order.md diff --git a/.changes/fix-bundler-msi-install-dir-lookup.md b/.changes/fix-bundler-msi-install-dir-lookup.md deleted file mode 100644 index b54662c80b29..000000000000 --- a/.changes/fix-bundler-msi-install-dir-lookup.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -tauri-bundler: 'patch:bug' ---- - -Fixed an issue that caused the `.msi` installer not to lookup the `INSTALLDIR` set in the `nsis` installer. diff --git a/.changes/fix-bundler-wix-dlls.md b/.changes/fix-bundler-wix-dlls.md deleted file mode 100644 index bbe9063a130a..000000000000 --- a/.changes/fix-bundler-wix-dlls.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -tauri-bundler: 'patch:bug' ---- - -Fixed an issue that caused the .msi installer to not contain root resources when there were .dll files present in the target directory. diff --git a/.changes/fix-nsis-webviewloaderdll.md b/.changes/fix-nsis-webviewloaderdll.md deleted file mode 100644 index cc355a63504d..000000000000 --- a/.changes/fix-nsis-webviewloaderdll.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -tauri-bundler: 'patch:bug' ---- - -Fixed an issue leading to NSIS based installers to not contain the `WebView2Loader.dll` file when targetting `windows-gnu`. diff --git a/.changes/initialization_scripts_order.md b/.changes/initialization_scripts_order.md deleted file mode 100644 index 5e3b36af58cc..000000000000 --- a/.changes/initialization_scripts_order.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'tauri': 'patch:bug' ---- - -Ensure that tauri's builtin initialization scripts and plugin initialization scripts are executed before any user-added initialization scripts in a webview. diff --git a/Cargo.lock b/Cargo.lock index 792707075823..b5adbdfd2af8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8998,7 +8998,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.2.2" +version = "2.2.3" dependencies = [ "anyhow", "bytes", @@ -9080,7 +9080,7 @@ dependencies = [ [[package]] name = "tauri-bundler" -version = "2.2.1" +version = "2.2.2" dependencies = [ "anyhow", "ar", @@ -9124,7 +9124,7 @@ dependencies = [ [[package]] name = "tauri-cli" -version = "2.2.4" +version = "2.2.5" dependencies = [ "anyhow", "ar", diff --git a/crates/tauri-bundler/CHANGELOG.md b/crates/tauri-bundler/CHANGELOG.md index e7695141316c..1cab72ba31cf 100644 --- a/crates/tauri-bundler/CHANGELOG.md +++ b/crates/tauri-bundler/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[2.2.2] + +### Bug Fixes + +- [`72748cc45`](https://www.github.com/tauri-apps/tauri/commit/72748cc45cf670dd03c86c8deceb5942598f5ad9) ([#12365](https://www.github.com/tauri-apps/tauri/pull/12365) by [@don41382](https://www.github.com/tauri-apps/tauri/../../don41382)) Fixed an issue that caused the `.msi` installer not to lookup the `INSTALLDIR` set in the `nsis` installer. +- [`cf771bf69`](https://www.github.com/tauri-apps/tauri/commit/cf771bf69aa26b62d11a54a69131c631505d8c55) ([#12402](https://www.github.com/tauri-apps/tauri/pull/12402) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Fixed an issue that caused the .msi installer to not contain root resources when there were .dll files present in the target directory. +- [`07ccdc499`](https://www.github.com/tauri-apps/tauri/commit/07ccdc499c3240e7240be3abf95ef2d7d00b2dc7) ([#12324](https://www.github.com/tauri-apps/tauri/pull/12324) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Fixed an issue leading to NSIS based installers to not contain the `WebView2Loader.dll` file when targetting `windows-gnu`. + ## \[2.2.1] ### Bug Fixes diff --git a/crates/tauri-bundler/Cargo.toml b/crates/tauri-bundler/Cargo.toml index 019f310bb9c5..7e983acf71df 100644 --- a/crates/tauri-bundler/Cargo.toml +++ b/crates/tauri-bundler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-bundler" -version = "2.2.1" +version = "2.2.2" authors = [ "George Burton ", "Tauri Programme within The Commons Conservancy", diff --git a/crates/tauri-cli/CHANGELOG.md b/crates/tauri-cli/CHANGELOG.md index fdf1e2088e81..68cf3bc25ddf 100644 --- a/crates/tauri-cli/CHANGELOG.md +++ b/crates/tauri-cli/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.2.5] + +### Dependencies + +- Upgraded to `tauri-bundler@2.2.2` + ## \[2.2.4] ### Bug Fixes diff --git a/crates/tauri-cli/Cargo.toml b/crates/tauri-cli/Cargo.toml index 2dddb2e5298e..818189d54cea 100644 --- a/crates/tauri-cli/Cargo.toml +++ b/crates/tauri-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-cli" -version = "2.2.4" +version = "2.2.5" authors = ["Tauri Programme within The Commons Conservancy"] edition = "2021" rust-version = "1.77.2" @@ -47,7 +47,7 @@ sublime_fuzzy = "0.7" clap_complete = "4" clap = { version = "4", features = ["derive", "env"] } anyhow = "1" -tauri-bundler = { version = "2.2.1", default-features = false, path = "../tauri-bundler" } +tauri-bundler = { version = "2.2.2", default-features = false, path = "../tauri-bundler" } colored = "2" serde = { version = "1", features = ["derive"] } serde_json = { version = "1", features = ["preserve_order"] } diff --git a/crates/tauri-cli/config.schema.json b/crates/tauri-cli/config.schema.json index 43da298c0c37..2e29db4b8856 100644 --- a/crates/tauri-cli/config.schema.json +++ b/crates/tauri-cli/config.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://schema.tauri.app/config/2.2.2", + "$id": "https://schema.tauri.app/config/2.2.3", "title": "Config", "description": "The Tauri configuration object.\n It is read from a file where you can define your frontend assets,\n configure the bundler and define a tray icon.\n\n The configuration file is generated by the\n [`tauri init`](https://v2.tauri.app/reference/cli/#init) command that lives in\n your Tauri application source directory (src-tauri).\n\n Once generated, you may modify it at will to customize your Tauri application.\n\n ## File Formats\n\n By default, the configuration is defined as a JSON file named `tauri.conf.json`.\n\n Tauri also supports JSON5 and TOML files via the `config-json5` and `config-toml` Cargo features, respectively.\n The JSON5 file name must be either `tauri.conf.json` or `tauri.conf.json5`.\n The TOML file name is `Tauri.toml`.\n\n ## Platform-Specific Configuration\n\n In addition to the default configuration file, Tauri can\n read a platform-specific configuration from `tauri.linux.conf.json`,\n `tauri.windows.conf.json`, `tauri.macos.conf.json`, `tauri.android.conf.json` and `tauri.ios.conf.json`\n (or `Tauri.linux.toml`, `Tauri.windows.toml`, `Tauri.macos.toml`, `Tauri.android.toml` and `Tauri.ios.toml` if the `Tauri.toml` format is used),\n which gets merged with the main configuration object.\n\n ## Configuration Structure\n\n The configuration is composed of the following objects:\n\n - [`app`](#appconfig): The Tauri configuration\n - [`build`](#buildconfig): The build configuration\n - [`bundle`](#bundleconfig): The bundle configurations\n - [`plugins`](#pluginconfig): The plugins configuration\n\n Example tauri.config.json file:\n\n ```json\n {\n \"productName\": \"tauri-app\",\n \"version\": \"0.1.0\",\n \"build\": {\n \"beforeBuildCommand\": \"\",\n \"beforeDevCommand\": \"\",\n \"devUrl\": \"../dist\",\n \"frontendDist\": \"../dist\"\n },\n \"app\": {\n \"security\": {\n \"csp\": null\n },\n \"windows\": [\n {\n \"fullscreen\": false,\n \"height\": 600,\n \"resizable\": true,\n \"title\": \"Tauri App\",\n \"width\": 800\n }\n ]\n },\n \"bundle\": {},\n \"plugins\": {}\n }\n ```", "type": "object", diff --git a/crates/tauri-cli/metadata-v2.json b/crates/tauri-cli/metadata-v2.json index 881c2409af40..ed8fb5dd3598 100644 --- a/crates/tauri-cli/metadata-v2.json +++ b/crates/tauri-cli/metadata-v2.json @@ -1,9 +1,9 @@ { "cli.js": { - "version": "2.2.4", + "version": "2.2.5", "node": ">= 10.0.0" }, - "tauri": "2.2.2", + "tauri": "2.2.3", "tauri-build": "2.0.4", "tauri-plugin": "2.0.3" } diff --git a/crates/tauri-schema-generator/schemas/config.schema.json b/crates/tauri-schema-generator/schemas/config.schema.json index 43da298c0c37..2e29db4b8856 100644 --- a/crates/tauri-schema-generator/schemas/config.schema.json +++ b/crates/tauri-schema-generator/schemas/config.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://schema.tauri.app/config/2.2.2", + "$id": "https://schema.tauri.app/config/2.2.3", "title": "Config", "description": "The Tauri configuration object.\n It is read from a file where you can define your frontend assets,\n configure the bundler and define a tray icon.\n\n The configuration file is generated by the\n [`tauri init`](https://v2.tauri.app/reference/cli/#init) command that lives in\n your Tauri application source directory (src-tauri).\n\n Once generated, you may modify it at will to customize your Tauri application.\n\n ## File Formats\n\n By default, the configuration is defined as a JSON file named `tauri.conf.json`.\n\n Tauri also supports JSON5 and TOML files via the `config-json5` and `config-toml` Cargo features, respectively.\n The JSON5 file name must be either `tauri.conf.json` or `tauri.conf.json5`.\n The TOML file name is `Tauri.toml`.\n\n ## Platform-Specific Configuration\n\n In addition to the default configuration file, Tauri can\n read a platform-specific configuration from `tauri.linux.conf.json`,\n `tauri.windows.conf.json`, `tauri.macos.conf.json`, `tauri.android.conf.json` and `tauri.ios.conf.json`\n (or `Tauri.linux.toml`, `Tauri.windows.toml`, `Tauri.macos.toml`, `Tauri.android.toml` and `Tauri.ios.toml` if the `Tauri.toml` format is used),\n which gets merged with the main configuration object.\n\n ## Configuration Structure\n\n The configuration is composed of the following objects:\n\n - [`app`](#appconfig): The Tauri configuration\n - [`build`](#buildconfig): The build configuration\n - [`bundle`](#bundleconfig): The bundle configurations\n - [`plugins`](#pluginconfig): The plugins configuration\n\n Example tauri.config.json file:\n\n ```json\n {\n \"productName\": \"tauri-app\",\n \"version\": \"0.1.0\",\n \"build\": {\n \"beforeBuildCommand\": \"\",\n \"beforeDevCommand\": \"\",\n \"devUrl\": \"../dist\",\n \"frontendDist\": \"../dist\"\n },\n \"app\": {\n \"security\": {\n \"csp\": null\n },\n \"windows\": [\n {\n \"fullscreen\": false,\n \"height\": 600,\n \"resizable\": true,\n \"title\": \"Tauri App\",\n \"width\": 800\n }\n ]\n },\n \"bundle\": {},\n \"plugins\": {}\n }\n ```", "type": "object", diff --git a/crates/tauri/CHANGELOG.md b/crates/tauri/CHANGELOG.md index 2a5c787f0101..9705bdccd29d 100644 --- a/crates/tauri/CHANGELOG.md +++ b/crates/tauri/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.2.3] + +### Bug Fixes + +- [`d2c8f0eb5`](https://www.github.com/tauri-apps/tauri/commit/d2c8f0eb5ce2a5ebacd857614b7c89bbd5c9dca4) ([#12424](https://www.github.com/tauri-apps/tauri/pull/12424) by [@mattyg](https://www.github.com/tauri-apps/tauri/../../mattyg)) Ensure that tauri's builtin initialization scripts and plugin initialization scripts are executed before any user-added initialization scripts in a webview. + ## \[2.2.2] ### Bug Fixes diff --git a/crates/tauri/Cargo.toml b/crates/tauri/Cargo.toml index be30705c0bf1..384c0a50a583 100644 --- a/crates/tauri/Cargo.toml +++ b/crates/tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri" -version = "2.2.2" +version = "2.2.3" description = "Make tiny, secure apps for all desktop platforms with Tauri" exclude = ["/test", "/.scripts", "CHANGELOG.md", "/target"] readme = "README.md" diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index a1dae8fbcf55..b6f987942d0e 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.2.5] + +### Dependencies + +- Upgraded to `tauri-cli@2.2.5` + ## \[2.2.4] ### Bug Fixes diff --git a/packages/cli/package.json b/packages/cli/package.json index 02086f15c299..810b70a21e75 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/cli", - "version": "2.2.4", + "version": "2.2.5", "description": "Command line interface for building Tauri apps", "funding": { "type": "opencollective",