CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-03 10:11:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix svelte recipe packageManager ternary (#2534)

Browse Source 
* refactor: custom protocol (#2503)

Co-authored-by: Lucas Nogueira <lucas@tauri.studio>

* Apply Version Updates From Current Changes (#2513)

Co-authored-by: lucasfernog <lucasfernog@users.noreply.github.com>

* fix(api): revert ES2021 target

* Apply Version Updates From Current Changes (#2520)

Co-authored-by: lucasfernog <lucasfernog@users.noreply.github.com>

* docs: webdriver guide (#2461)

Co-authored-by: Ngo Iok Ui (Wu Yu Wei) <wusyong9104@gmail.com>

* fix(core): `Notification.requestPermission()` deadlock regression

* Fix packageManager ternary

Co-authored-by: david <david@lemarier.ca>
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: lucasfernog <lucasfernog@users.noreply.github.com>
Co-authored-by: chip <chip@chip.sh>
Co-authored-by: Ngo Iok Ui (Wu Yu Wei) <wusyong9104@gmail.com>
This commit is contained in:
Kris Scott
2021-08-26 08:36:10 -05:00
committed by GitHub
parent 2026134f47
commit e706df7d03
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/notification-regression.md Normal file
View File

@@ -0,0 +1,5 @@
---
"tauri": patch
---
Fixes `Notification.requestPermission()` deadlock.

2
core/tauri/src/endpoints.rs
View File

@@ -126,7 +126,7 @@ impl Module {
})
}
}
Self::Notification(cmd) => resolver.respond_closure(move || {
Self::Notification(cmd) => resolver.respond_async(async move {
cmd
.run(window, config, &package_info)
.and_then(|r| r.json)

4
examples/api/src-tauri/Cargo.lock generated
View File

@@ -3164,9 +3164,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "1.10.0"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
checksum = "92036be488bb6594459f2e03b60e42df6f937fe6ca5c5ffdcb539c6b84dc40f5"
dependencies = [
"autocfg",
"bytes",

4
examples/updater/src-tauri/Cargo.lock generated
View File

@@ -3042,9 +3042,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "1.10.0"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
checksum = "92036be488bb6594459f2e03b60e42df6f937fe6ca5c5ffdcb539c6b84dc40f5"
dependencies = [
"autocfg",
"bytes",

4
tooling/create-tauri-app/src/recipes/svelte.ts
View File

@@ -31,10 +31,10 @@ const svelte: Recipe = {
distDir: `../public`,
devPath: 'http://localhost:5000',
beforeDevCommand: `${
packageManager === 'yarn' ? 'npm run' : packageManager
packageManager === 'npm' ? 'npm run' : packageManager
} dev`,
beforeBuildCommand: `${
packageManager === 'yarn' ? 'npm run' : packageManager
packageManager === 'npm' ? 'npm run' : packageManager
} build`
}),
preInit: async ({ cwd, cfg, answers }) => {