Skip to content

Commit cdcc915

Browse files
committed
Merge branch 'v2' into feature/fallback_targets
2 parents b62e132 + a4b71a1 commit cdcc915

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+744
-757
lines changed

.changes/fs-write-stream.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fs: patch
3+
fs-js: patch
4+
---
5+
6+
Fixed calling `writeFile` with `data: ReadableStream` throws `Invalid argument`

.changes/nfc-close-session.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
nfc: patch
3+
nfc-js: patch
4+
---
5+
6+
On iOS, the reader session will now get closed properly on errors, preventing dangling invalid sessions that could prevent subsequent write attempts.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"opener": 'minor:enhance'
3+
"opener-js": 'minor:enhance'
4+
---
5+
6+
Allow reveal multiple items in the file explorer.

.changes/store-defaults-js.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
store: minor
3+
store-js: minor
4+
---
5+
6+
Allow setting defaults from the JavaScript API
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
store: minor
3+
store-js: minor
4+
---
5+
6+
Add an new option `overrideDefaults` for creating/loading and reloading the store that overrides the store with the on-disk state, ignoring defaults

Cargo.lock

Lines changed: 17 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/api/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## \[2.0.28]
4+
5+
### Dependencies
6+
7+
- Upgraded to `[email protected]`
8+
39
## \[2.0.27]
410

511
### Dependencies

examples/api/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "api",
33
"private": true,
4-
"version": "2.0.27",
4+
"version": "2.0.28",
55
"type": "module",
66
"scripts": {
77
"dev": "vite --clearScreen false",
@@ -15,7 +15,7 @@
1515
"@tauri-apps/plugin-biometric": "^2.3.0",
1616
"@tauri-apps/plugin-cli": "^2.4.0",
1717
"@tauri-apps/plugin-clipboard-manager": "^2.3.0",
18-
"@tauri-apps/plugin-dialog": "^2.3.1",
18+
"@tauri-apps/plugin-dialog": "^2.3.2",
1919
"@tauri-apps/plugin-fs": "^2.4.1",
2020
"@tauri-apps/plugin-geolocation": "^2.2.0",
2121
"@tauri-apps/plugin-global-shortcut": "^2.3.0",

examples/api/src-tauri/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## \[2.0.32]
4+
5+
### Dependencies
6+
7+
- Upgraded to `[email protected]`
8+
39
## \[2.0.31]
410

511
### Dependencies

examples/api/src-tauri/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "api"
33
publish = false
4-
version = "2.0.31"
4+
version = "2.0.32"
55
description = "An example Tauri Application showcasing the api"
66
edition = "2021"
77
rust-version = { workspace = true }
@@ -25,7 +25,7 @@ tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.4.1", features =
2525
"watch",
2626
] }
2727
tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.3.0" }
28-
tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.3.1" }
28+
tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.3.2" }
2929
tauri-plugin-http = { path = "../../../plugins/http", features = [
3030
"multipart",
3131
"cookies",

0 commit comments

Comments
 (0)