Skip to content

Commit

Permalink
Partially Revert "Apply Version Updates From Current Changes (#9551)" (
Browse files Browse the repository at this point in the history
…#9620)

This partially reverts commit 108ab90.
  • Loading branch information
FabianLars committed Apr 30, 2024
1 parent aa08069 commit 007af10
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 45 deletions.
2 changes: 2 additions & 0 deletions .changes/cursor_position.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
'tauri': 'patch:feat'
'tauri-runtime': 'patch:feat'
'tauri-runtime-wry': 'patch:feat'
---

Add `App/AppHandle/Window/Webview/WebviewWindow::cursor_position` getter to get the current cursor position.
5 changes: 0 additions & 5 deletions .changes/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
".changes/cli-update-deps-fix-log.md",
".changes/cli-updater-unkown-fields.md",
".changes/cli-windows-build-tools-detect-utf8.md",
".changes/cli-windows-sys.md",
".changes/closeable-maximizable.md",
".changes/codegen-capabilities-attribute.md",
".changes/codegen-set-assets.md",
Expand All @@ -70,11 +69,9 @@
".changes/core-menu-resources-deadlock.md",
".changes/core-once-event-return-event-id.md",
".changes/core-path-basename-replace.md",
".changes/core-specta-integration.md",
".changes/core-start-resize-permission.md",
".changes/core-window-hasdisplayhandle.md",
".changes/csp-header-linux.md",
".changes/cursor_position.md",
".changes/cursor_position_js.md",
".changes/deb-rpm-post-pre-scripts-bundler.md",
".changes/deb-rpm-post-pre-scripts-config.md",
Expand Down Expand Up @@ -130,7 +127,6 @@
".changes/image-size-refactor.md",
".changes/inline-plugins.md",
".changes/ios-signing-optional.md",
".changes/ipc-allow-headers.md",
".changes/ipc-post-message-fallback.md",
".changes/ipc-request-param-refactor.md",
".changes/isolation-pattern-key-extractable.md",
Expand All @@ -143,7 +139,6 @@
".changes/permission-platforms.md",
".changes/permission-table.md",
".changes/plugin-global-api-script.md",
".changes/plugin-init-script-context.md",
".changes/preserve-channel-order.md",
".changes/progress-bar-state-refactor.md",
".changes/re-export-progress-bar-status.md",
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions core/tauri/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
# Changelog

## \[2.0.0-beta.17]

### New Features

- [`12b4159bd`](https://www.github.com/tauri-apps/tauri/commit/12b4159bdaf6e1f8d7b58ed8ff96345fa69c2ef0)([#9392](https://www.github.com/tauri-apps/tauri/pull/9392)) Add `specta` feature flag which adds `specta` support for `AppHandle`, `State`, `Window`, `Webview` and `WebviewWindow` types.
- [`477bb8cd4`](https://www.github.com/tauri-apps/tauri/commit/477bb8cd4ea88ade3f6c1f268ad1701a68150161)([#9297](https://www.github.com/tauri-apps/tauri/pull/9297)) Add `App/AppHandle/Window/Webview/WebviewWindow::cursor_position` getter to get the current cursor position.

### Enhancements

- [`eff778b8f`](https://www.github.com/tauri-apps/tauri/commit/eff778b8f0c675fda3f6f6d1041bc94afd765d1c)([#9571](https://www.github.com/tauri-apps/tauri/pull/9571)) Run each plugin initialization script on its own context so they do not interfere with each other or the Tauri init script.

### Bug Fixes

- [`98101cb17`](https://www.github.com/tauri-apps/tauri/commit/98101cb17fe49f305a75fcb4267f82d89f7ac0c3)([#9561](https://www.github.com/tauri-apps/tauri/pull/9561)) Allow any headers on the IPC custom protocol.

## \[2.0.0-beta.16]

### New Features
Expand Down
6 changes: 3 additions & 3 deletions core/tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tauri"
version = "2.0.0-beta.17"
version = "2.0.0-beta.16"
description = "Make tiny, secure apps for all desktop platforms with Tauri"
exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ]
readme = "README.md"
Expand Down Expand Up @@ -75,7 +75,7 @@ tracing = { version = "0.1", optional = true }
heck = "0.5"
log = "0.4"
dunce = "1"
specta = { version = "^2.0.0-rc.9", optional = true, default-features = false, features = [ "function" ] }
specta = { version = "^2.0.0-rc.9", optional = true, default-features = false, features = ["function"] }

[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))".dependencies]
muda = { version = "0.13", default-features = false, features = [ "serde" ] }
Expand Down Expand Up @@ -158,7 +158,7 @@ config-toml = [ "tauri-macros/config-toml" ]
image-ico = [ "image/ico" ]
image-png = [ "image/png" ]
macos-proxy = [ "tauri-runtime-wry/macos-proxy" ]
specta = [ "dep:specta" ]
specta = ["dep:specta"]

[[example]]
name = "commands"
Expand Down
10 changes: 0 additions & 10 deletions tooling/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# Changelog

## \[2.0.0-beta.15]

### Bug Fixes

- [`3f0805488`](https://www.github.com/tauri-apps/tauri/commit/3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2)([#9603](https://www.github.com/tauri-apps/tauri/pull/9603)) Use `windows-sys` crate instead of `winapi` which fixes installing the published cli from crates.io using `cargo install tauri-cli --version "^2.0.0-beta"`.

### Dependencies

- Upgraded to `tauri-bundler@2.0.1-beta.11`

## \[2.0.0-beta.14]

### Enhancements
Expand Down
2 changes: 1 addition & 1 deletion tooling/cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tooling/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = [ "node" ]

[package]
name = "tauri-cli"
version = "2.0.0-beta.15"
version = "2.0.0-beta.14"
authors = [ "Tauri Programme within The Commons Conservancy" ]
edition = "2021"
rust-version = "1.70"
Expand Down
4 changes: 2 additions & 2 deletions tooling/cli/metadata-v2.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"cli.js": {
"version": "2.0.0-beta.15",
"version": "2.0.0-beta.14",
"node": ">= 10.0.0"
},
"tauri": "2.0.0-beta.17",
"tauri": "2.0.0-beta.16",
"tauri-build": "2.0.0-beta.13",
"tauri-plugin": "2.0.0-beta.13"
}
6 changes: 0 additions & 6 deletions tooling/cli/node/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
# Changelog

## \[2.0.0-beta.15]

### Dependencies

- Upgraded to `tauri-cli@2.0.0-beta.15`

## \[2.0.0-beta.14]

### Enhancements
Expand Down
2 changes: 1 addition & 1 deletion tooling/cli/node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/cli",
"version": "2.0.0-beta.15",
"version": "2.0.0-beta.14",
"description": "Command line interface for building Tauri apps",
"funding": {
"type": "opencollective",
Expand Down

0 comments on commit 007af10

Please sign in to comment.