From 3e6b17604812a5a7ace7b86e3d34d92590ed0af0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 18:07:18 +0200 Subject: [PATCH] Apply Version Updates From Current Changes (#562) Co-authored-by: amrbashir --- .changes/msrv-1.60.md | 5 ----- .changes/vite-plugin-react.md | 6 ------ CHANGELOG.md | 5 +++++ Cargo.lock | 2 +- Cargo.toml | 17 +++++++---------- create-tauri-app.ps1 | 2 +- create-tauri-app.sh | 2 +- node/CHANGELOG.md | 8 ++++++++ node/package.json | 2 +- worker/scripts/create-tauri-app.ps1 | 2 +- worker/scripts/create-tauri-app.sh | 2 +- 11 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 .changes/msrv-1.60.md delete mode 100644 .changes/vite-plugin-react.md diff --git a/.changes/msrv-1.60.md b/.changes/msrv-1.60.md deleted file mode 100644 index d70104cc35..0000000000 --- a/.changes/msrv-1.60.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"create-tauri-app": "patch" ---- - -Bump MSRV to `1.61` \ No newline at end of file diff --git a/.changes/vite-plugin-react.md b/.changes/vite-plugin-react.md deleted file mode 100644 index 16e34aad56..0000000000 --- a/.changes/vite-plugin-react.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"create-tauri-app": patch -"create-tauri-app-js": patch ---- - -Upgrade `@vitejs/plugin-react` to `4.2.1` to fix peer depenency for react templates. \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index e28a4483c3..2600358d4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## \[3.12.1] + +- [`7cd8cf8`](https://www.github.com/tauri-apps/create-tauri-app/commit/7cd8cf8e71d44698adadfffa3615922e60a58c19)([#542](https://www.github.com/tauri-apps/create-tauri-app/pull/542)) Bump MSRV to `1.61` +- [`6171792`](https://www.github.com/tauri-apps/create-tauri-app/commit/6171792b9641fc5210f4ca79842631e68e59b64e)([#561](https://www.github.com/tauri-apps/create-tauri-app/pull/561)) Upgrade `@vitejs/plugin-react` to `4.2.1` to fix peer depenency for react templates. + ## \[3.12.0] - [`616a294`](https://www.github.com/tauri-apps/create-tauri-app/commit/616a294a9adaa5d7113961ba8af3bb85727e16c3)([#553](https://www.github.com/tauri-apps/create-tauri-app/pull/553)) Vite 5 in templates diff --git a/Cargo.lock b/Cargo.lock index dcc16b43e6..9596a9c18e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -98,7 +98,7 @@ dependencies = [ [[package]] name = "create-tauri-app" -version = "3.12.0" +version = "3.12.1" dependencies = [ "anyhow", "ctrlc", diff --git a/Cargo.toml b/Cargo.toml index 87764c3339..fbb8df58ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "create-tauri-app" description = "Rapidly scaffold out a new tauri app project." -authors = ["Tauri Programme within The Commons Conservancy"] -version = "3.12.0" +authors = [ "Tauri Programme within The Commons Conservancy" ] +version = "3.12.1" edition = "2021" license = "Apache-2.0 OR MIT" readme = "README.md" repository = "https://github.com/tauri-apps/create-tauri-app" -keywords = ["tauri"] -categories = ["gui"] -exclude = ["node", "worker", ".github", ".changes", ".scripts"] +keywords = [ "tauri" ] +categories = [ "gui" ] +exclude = [ "node", "worker", ".github", ".changes", ".scripts" ] rust-version = "1.61" [[bin]] @@ -18,7 +18,7 @@ path = "src/main.rs" [workspace] resolver = "2" -members = ["node"] +members = [ "node" ] [profile.release] panic = "abort" @@ -32,7 +32,4 @@ anyhow = "1" dialoguer = "0.10" pico-args = "0.5" ctrlc = "3.3" -rust-embed = { version = "8.1", features = [ - "compression", - "interpolate-folder-path", -] } +rust-embed = { version = "8.1", features = [ "compression", "interpolate-folder-path" ] } diff --git a/create-tauri-app.ps1 b/create-tauri-app.ps1 index c8da93882d..86c4cb0af0 100644 --- a/create-tauri-app.ps1 +++ b/create-tauri-app.ps1 @@ -9,7 +9,7 @@ $bitness = if ([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchi } else { "i686" } -$__TAG_NAME__ = "create-tauri-app-v3.12.0" +$__TAG_NAME__ = "create-tauri-app-v3.12.1" # $url="https://github.com/tauri-apps/create-tauri-app/releases/download/$__TAG_NAME__/create-tauri-app-$bitness-pc-windows-msvc.exe" $url="https://create.tauri.app/download/bin?tag=$__TAG_NAME__&arch=$bitness-pc-windows-msvc&ext=.exe" $outFile = "$Env:TEMP\create-tauri-app.exe" diff --git a/create-tauri-app.sh b/create-tauri-app.sh index 9158d0d17f..207810fdd3 100644 --- a/create-tauri-app.sh +++ b/create-tauri-app.sh @@ -44,7 +44,7 @@ main() { ;; esac - local __TAG_NAME__="create-tauri-app-v3.12.0" + local __TAG_NAME__="create-tauri-app-v3.12.1" # local _url="https://github.com/tauri-apps/create-tauri-app/releases/download/${__TAG_NAME__}/create-tauri-app-${_arch}${_ext}" local _url="https://create.tauri.app/download/bin?tag=${__TAG_NAME__}&arch=${_arch}&ext=${_ext}" diff --git a/node/CHANGELOG.md b/node/CHANGELOG.md index e2a07c8adf..e967935e6a 100644 --- a/node/CHANGELOG.md +++ b/node/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[3.11.6] + +- [`6171792`](https://www.github.com/tauri-apps/create-tauri-app/commit/6171792b9641fc5210f4ca79842631e68e59b64e)([#561](https://www.github.com/tauri-apps/create-tauri-app/pull/561)) Upgrade `@vitejs/plugin-react` to `4.2.1` to fix peer depenency for react templates. + +### Dependencies + +- Upgraded to `create-tauri-app@3.12.1` + ## \[3.11.5] - [`4869b73`](https://www.github.com/tauri-apps/create-tauri-app/commit/4869b730af5679ae574319702ad2414b23299d01)([#558](https://www.github.com/tauri-apps/create-tauri-app/pull/558)) Adapt templates to `@tauri-apps/api@2.0.0-alpha.13` by changing the `primitives` import to `core`. diff --git a/node/package.json b/node/package.json index 2c990637ea..eb916490f5 100644 --- a/node/package.json +++ b/node/package.json @@ -1,6 +1,6 @@ { "name": "create-tauri-app", - "version": "3.11.5", + "version": "3.11.6", "description": "Rapidly scaffold out a new tauri app project.", "funding": { "type": "opencollective", diff --git a/worker/scripts/create-tauri-app.ps1 b/worker/scripts/create-tauri-app.ps1 index c8da93882d..86c4cb0af0 100644 --- a/worker/scripts/create-tauri-app.ps1 +++ b/worker/scripts/create-tauri-app.ps1 @@ -9,7 +9,7 @@ $bitness = if ([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchi } else { "i686" } -$__TAG_NAME__ = "create-tauri-app-v3.12.0" +$__TAG_NAME__ = "create-tauri-app-v3.12.1" # $url="https://github.com/tauri-apps/create-tauri-app/releases/download/$__TAG_NAME__/create-tauri-app-$bitness-pc-windows-msvc.exe" $url="https://create.tauri.app/download/bin?tag=$__TAG_NAME__&arch=$bitness-pc-windows-msvc&ext=.exe" $outFile = "$Env:TEMP\create-tauri-app.exe" diff --git a/worker/scripts/create-tauri-app.sh b/worker/scripts/create-tauri-app.sh index 9158d0d17f..207810fdd3 100644 --- a/worker/scripts/create-tauri-app.sh +++ b/worker/scripts/create-tauri-app.sh @@ -44,7 +44,7 @@ main() { ;; esac - local __TAG_NAME__="create-tauri-app-v3.12.0" + local __TAG_NAME__="create-tauri-app-v3.12.1" # local _url="https://github.com/tauri-apps/create-tauri-app/releases/download/${__TAG_NAME__}/create-tauri-app-${_arch}${_ext}" local _url="https://create.tauri.app/download/bin?tag=${__TAG_NAME__}&arch=${_arch}&ext=${_ext}"