Skip to content

Commit b122618

Browse files
authored
Merge branch 'v2' into feat/recent-doc
2 parents 3a3eaf6 + f75d21d commit b122618

36 files changed

Lines changed: 1200 additions & 894 deletions

File tree

.changes/change-pr-3214.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"deep-link": patch
3+
"deep-link-js": patch
4+
---
5+
6+
Account for differing Android VIEW intent in ChromeOS, fixing deep-link behaviour on Chromium platforms.
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+
Removed the dependency on `tauri-utils`'s `build` feature

.changes/nfc-lambda.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+
Fixed syntax error in kotlin files potentially causing issues when trying to write to tags when no prior session existed.

.github/CONTRIBUTING.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Hi! We, the maintainers, are really excited that you are interested in contribut
55
- [Issue Reporting Guidelines](#issue-reporting-guidelines)
66
- [Pull Request Guidelines](#pull-request-guidelines)
77
- [Development Guide](#development-guide)
8+
- [AI Tool Policy](#ai-tool-policy)
89

910
## Issue Reporting Guidelines
1011

@@ -60,3 +61,13 @@ The easiest way to test your changes is to use the [example app](https://github.
6061
To test local changes against your own application simply point the plugin create to your local repository, for example:
6162

6263
`tauri-plugin-sample = { path = "path/to/local/tauri-plugin-sample/" }`
64+
65+
## AI Tool Policy
66+
67+
It takes a lot of time to review a Pull Request while it's very easy to make a nonsensical but plausible looking one using AI tools.
68+
It is unfair for other contributors and the reviewers to spend much of the time dealing with this, hence these rules:
69+
70+
1. Review and test all LLM-generated content before submitting, you're the one responsible for it, not the AI.
71+
2. Don't use AI to respond to review comments (except for translations).
72+
73+
We will close the Pull Request with a `ai-slop` tag if you failed to do so.

Cargo.lock

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

examples/api/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"@tauri-apps/plugin-clipboard-manager": "^2.3.2",
1818
"@tauri-apps/plugin-dialog": "^2.6.0",
1919
"@tauri-apps/plugin-fs": "^2.4.5",
20-
"@tauri-apps/plugin-geolocation": "^2.2.0",
20+
"@tauri-apps/plugin-geolocation": "^2.3.2",
2121
"@tauri-apps/plugin-global-shortcut": "^2.3.1",
22-
"@tauri-apps/plugin-haptics": "^2.2.0",
22+
"@tauri-apps/plugin-haptics": "^2.3.2",
2323
"@tauri-apps/plugin-http": "^2.5.7",
2424
"@tauri-apps/plugin-nfc": "^2.3.4",
2525
"@tauri-apps/plugin-notification": "^2.3.3",
@@ -29,17 +29,17 @@
2929
"@tauri-apps/plugin-shell": "^2.3.5",
3030
"@tauri-apps/plugin-store": "^2.4.2",
3131
"@tauri-apps/plugin-updater": "^2.10.0",
32-
"@tauri-apps/plugin-upload": "^2.3.0",
32+
"@tauri-apps/plugin-upload": "^2.4.0",
3333
"@zerodevx/svelte-json-view": "1.0.11"
3434
},
3535
"devDependencies": {
36-
"@iconify-json/codicon": "^1.2.12",
36+
"@iconify-json/codicon": "^1.2.49",
3737
"@iconify-json/ph": "^1.2.2",
38-
"@sveltejs/vite-plugin-svelte": "^6.0.0",
38+
"@sveltejs/vite-plugin-svelte": "^7.0.0",
3939
"@tauri-apps/cli": "2.10.1",
40-
"@unocss/extractor-svelte": "^66.3.3",
41-
"svelte": "^5.20.4",
42-
"unocss": "^66.3.3",
43-
"vite": "^7.0.7"
40+
"@unocss/extractor-svelte": "^66.6.7",
41+
"svelte": "^5.54.0",
42+
"unocss": "^66.6.7",
43+
"vite": "^8.0.1"
4444
}
4545
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
"@rollup/plugin-node-resolve": "16.0.3",
1616
"@rollup/plugin-terser": "1.0.0",
1717
"@rollup/plugin-typescript": "12.3.0",
18-
"eslint": "10.0.2",
18+
"eslint": "10.1.0",
1919
"eslint-config-prettier": "10.1.8",
2020
"eslint-plugin-security": "4.0.0",
2121
"prettier": "3.8.1",
2222
"rollup": "4.59.0",
2323
"tslib": "2.8.1",
2424
"typescript": "5.9.3",
25-
"typescript-eslint": "8.56.1"
25+
"typescript-eslint": "8.57.1"
2626
},
2727
"minimumReleaseAge": 4320,
2828
"pnpm": {

plugins/barcode-scanner/api-iife.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/clipboard-manager/api-iife.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/deep-link/android/src/main/java/DeepLinkPlugin.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,14 @@ class DeepLinkPlugin(private val activity: Activity): Plugin(activity) {
4444
private var currentUrl: String? = null
4545
private var channel: Channel? = null
4646
private var config: PluginConfig? = null
47-
4847
companion object {
4948
var instance: DeepLinkPlugin? = null
5049
}
5150

51+
private fun isViewIntent(action: String?): Boolean {
52+
return action == Intent.ACTION_VIEW || action == "org.chromium.arc.intent.action.VIEW"
53+
}
54+
5255
@Command
5356
fun getCurrent(invoke: Invoke) {
5457
val ret = JSObject()
@@ -74,7 +77,7 @@ class DeepLinkPlugin(private val activity: Activity): Plugin(activity) {
7477

7578
val intent = activity.intent
7679

77-
if (intent.action == Intent.ACTION_VIEW && intent.data != null) {
80+
if (isViewIntent(intent.action) && intent.data != null) {
7881
val url = intent.data.toString()
7982
if (isDeepLink(url)) {
8083
// TODO: check if it makes sense to split up init url and last url
@@ -87,7 +90,7 @@ class DeepLinkPlugin(private val activity: Activity): Plugin(activity) {
8790
}
8891

8992
override fun onNewIntent(intent: Intent) {
90-
if (intent.action == Intent.ACTION_VIEW && intent.data != null) {
93+
if (isViewIntent(intent.action) && intent.data != null) {
9194
val url = intent.data.toString()
9295
if (isDeepLink(url)) {
9396
this.currentUrl = url

0 commit comments

Comments
 (0)