ci: check toml formatting with taplo-cli (#10787)

* ci: check toml formatting with taplo-cli

* change name of job

* { workspace = true } -> .workspace = true

* add taplo.toml
This commit is contained in:
Amr Bashir 2024-08-27 03:46:05 +03:00 committed by GitHub
parent ad83d41cb5
commit 70306dc79b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
33 changed files with 433 additions and 441 deletions

51
.github/workflows/fmt.yml vendored Normal file
View File

@ -0,0 +1,51 @@
# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
# SPDX-License-Identifier: Apache-2.0
# SPDX-License-Identifier: MIT
name: check formatting
on:
pull_request:
jobs:
rustfmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: install Rust stable and rustfmt
uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt
- name: run cargo fmt
run: cargo fmt --all -- --check
prettier:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: corepack enable
- uses: actions/setup-node@v4
with:
node-version: 'lts/*'
cache: 'pnpm'
- run: pnpm i --frozen-lockfile
- run: pnpm format:check
taplo:
name: taplo (.toml files)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
- name: install taplo-cli
uses: taiki-e/install-action@v2
with:
tool: taplo-cli
- run: taplo fmt --check --diff

View File

@ -25,20 +25,6 @@ concurrency:
cancel-in-progress: true
jobs:
fmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: install Rust stable and rustfmt
uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt
- name: run cargo fmt
run: cargo fmt --all -- --check
clippy:
runs-on: ubuntu-latest
strategy:

View File

@ -16,18 +16,6 @@ concurrency:
cancel-in-progress: true
jobs:
prettier:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: corepack enable
- uses: actions/setup-node@v4
with:
node-version: 'lts/*'
cache: 'pnpm'
- run: pnpm i --frozen-lockfile
- run: pnpm format:check
eslint:
runs-on: ubuntu-latest
steps:

View File

@ -1,7 +1,8 @@
{
"recommendations": [
"rust-lang.rust-analyzer",
"EditorConfig.EditorConfig",
"esbenp.prettier-vscode",
"rust-lang.rust-analyzer",
"tamasfe.even-better-toml"
]
}

View File

@ -5,7 +5,7 @@ edition = "2021"
publish = false
[build-dependencies]
tauri-utils = { features = [ "schema" ], path = "../tauri-utils" }
tauri-utils = { features = ["schema"], path = "../tauri-utils" }
schemars = { version = "0.8", features = ["url", "preserve_order"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

View File

@ -2,15 +2,15 @@
name = "tauri-build"
version = "2.0.0-rc.6"
description = "build time code to pair with https://crates.io/crates/tauri"
exclude = [ "CHANGELOG.md", "/target" ]
exclude = ["CHANGELOG.md", "/target"]
readme = "README.md"
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
categories = { workspace = true }
license = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
authors.workspace = true
homepage.workspace = true
repository.workspace = true
categories.workspace = true
license.workspace = true
edition.workspace = true
rust-version.workspace = true
[package.metadata.docs.rs]
all-features = true
@ -20,16 +20,16 @@ targets = [
"x86_64-unknown-linux-gnu",
"x86_64-apple-darwin",
"x86_64-linux-android",
"x86_64-apple-ios"
"x86_64-apple-ios",
]
rustc-args = [ "--cfg", "docsrs" ]
rustdoc-args = [ "--cfg", "docsrs" ]
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs"]
[dependencies]
anyhow = "1"
quote = { version = "1", optional = true }
tauri-codegen = { version = "2.0.0-rc.6", path = "../tauri-codegen", optional = true }
tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils", features = [ "build", "resources" ] }
tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils", features = ["build", "resources"] }
cargo_toml = "0.17"
serde = "1"
serde_json = "1"
@ -41,12 +41,12 @@ semver = "1"
dirs = "5"
glob = "0.3"
toml = "0.8"
schemars = { version = "0.8.18", features = [ "preserve_order" ] }
schemars = { version = "0.8.18", features = ["preserve_order"] }
[features]
default = [ "config-json" ]
codegen = [ "tauri-codegen", "quote" ]
isolation = [ "tauri-codegen/isolation", "tauri-utils/isolation" ]
config-json = [ ]
config-json5 = [ "tauri-utils/config-json5" ]
config-toml = [ "tauri-utils/config-toml" ]
default = ["config-json"]
codegen = ["tauri-codegen", "quote"]
isolation = ["tauri-codegen/isolation", "tauri-utils/isolation"]
config-json = []
config-json5 = ["tauri-utils/config-json5"]
config-toml = ["tauri-utils/config-toml"]

View File

@ -2,15 +2,15 @@
name = "tauri-codegen"
version = "2.0.0-rc.6"
description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`"
exclude = [ "CHANGELOG.md", "/target" ]
exclude = ["CHANGELOG.md", "/target"]
readme = "README.md"
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
categories = { workspace = true }
license = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
authors.workspace = true
homepage.workspace = true
repository.workspace = true
categories.workspace = true
license.workspace = true
edition.workspace = true
rust-version.workspace = true
[dependencies]
sha2 = "0.10"
@ -18,14 +18,14 @@ base64 = "0.22"
proc-macro2 = "1"
quote = "1"
syn = "2"
serde = { version = "1", features = [ "derive" ] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils", features = [ "build" ] }
tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils", features = ["build"] }
thiserror = "1"
walkdir = "2"
brotli = { version = "6", optional = true, default-features = false, features = [ "std" ] }
brotli = { version = "6", optional = true, default-features = false, features = ["std"] }
regex = { version = "1", optional = true }
uuid = { version = "1", features = [ "v4" ] }
uuid = { version = "1", features = ["v4"] }
semver = "1"
ico = "0.3"
png = "0.17"
@ -34,10 +34,10 @@ url = "2"
[target."cfg(target_os = \"macos\")".dependencies]
plist = "1"
time = { version = "0.3", features = [ "parsing", "formatting" ] }
time = { version = "0.3", features = ["parsing", "formatting"] }
[features]
compression = [ "brotli", "tauri-utils/compression" ]
isolation = [ "tauri-utils/isolation" ]
config-json5 = [ "tauri-utils/config-json5" ]
config-toml = [ "tauri-utils/config-toml" ]
compression = ["brotli", "tauri-utils/compression"]
isolation = ["tauri-utils/isolation"]
config-json5 = ["tauri-utils/config-json5"]
config-toml = ["tauri-utils/config-toml"]

View File

@ -5,7 +5,7 @@ edition = "2021"
publish = false
[build-dependencies]
tauri-utils = { features = [ "schema" ], path = "../tauri-utils" }
tauri-utils = { features = ["schema"], path = "../tauri-utils" }
schemars = { version = "0.8.18", features = ["url", "preserve_order"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

View File

@ -2,31 +2,31 @@
name = "tauri-macros"
version = "2.0.0-rc.5"
description = "Macros for the tauri crate."
exclude = [ "CHANGELOG.md", "/target" ]
exclude = ["CHANGELOG.md", "/target"]
readme = "README.md"
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
categories = { workspace = true }
license = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
authors.workspace = true
homepage.workspace = true
repository.workspace = true
categories.workspace = true
license.workspace = true
edition.workspace = true
rust-version.workspace = true
[lib]
proc-macro = true
[dependencies]
proc-macro2 = { version = "1", features = [ "span-locations" ] }
proc-macro2 = { version = "1", features = ["span-locations"] }
quote = "1"
syn = { version = "2", features = [ "full" ] }
syn = { version = "2", features = ["full"] }
heck = "0.5"
tauri-codegen = { version = "2.0.0-rc.6", default-features = false, path = "../tauri-codegen" }
tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils" }
[features]
custom-protocol = [ ]
compression = [ "tauri-codegen/compression" ]
isolation = [ "tauri-codegen/isolation" ]
config-json5 = [ "tauri-codegen/config-json5", "tauri-utils/config-json5" ]
config-toml = [ "tauri-codegen/config-toml", "tauri-utils/config-toml" ]
tracing = [ ]
custom-protocol = []
compression = ["tauri-codegen/compression"]
isolation = ["tauri-codegen/isolation"]
config-json5 = ["tauri-codegen/config-json5", "tauri-utils/config-json5"]
config-toml = ["tauri-codegen/config-toml", "tauri-utils/config-toml"]
tracing = []

View File

@ -2,18 +2,18 @@
name = "tauri-plugin"
version = "2.0.0-rc.6"
description = "Build script and runtime Tauri plugin definitions"
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
categories = { workspace = true }
license = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
authors.workspace = true
homepage.workspace = true
repository.workspace = true
categories.workspace = true
license.workspace = true
edition.workspace = true
rust-version.workspace = true
[package.metadata.docs.rs]
features = [ "build", "runtime" ]
rustc-args = [ "--cfg", "docsrs" ]
rustdoc-args = [ "--cfg", "docsrs" ]
features = ["build", "runtime"]
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs"]
[features]
build = [
@ -23,18 +23,20 @@ build = [
"dep:glob",
"dep:toml",
"dep:plist",
"dep:walkdir"
"dep:walkdir",
]
runtime = [ ]
runtime = []
[dependencies]
anyhow = { version = "1", optional = true }
serde = { version = "1", optional = true }
tauri-utils = { version = "2.0.0-rc.6", default-features = false, features = [ "build" ], path = "../tauri-utils" }
tauri-utils = { version = "2.0.0-rc.6", default-features = false, features = [
"build",
], path = "../tauri-utils" }
serde_json = { version = "1", optional = true }
glob = { version = "0.3", optional = true }
toml = { version = "0.8", optional = true }
schemars = { version = "0.8.18", features = [ "preserve_order" ] }
schemars = { version = "0.8.18", features = ["preserve_order"] }
walkdir = { version = "2", optional = true }
[target."cfg(target_os = \"macos\")".dependencies]

View File

@ -2,23 +2,27 @@
name = "tauri-runtime-wry"
version = "2.0.0-rc.6"
description = "Wry bindings to the Tauri runtime"
exclude = [ "CHANGELOG.md", "/target" ]
exclude = ["CHANGELOG.md", "/target"]
readme = "README.md"
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
categories = { workspace = true }
license = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
authors.workspace = true
homepage.workspace = true
repository.workspace = true
categories.workspace = true
license.workspace = true
edition.workspace = true
rust-version.workspace = true
[package.metadata.docs.rs]
rustc-args = [ "--cfg", "docsrs" ]
rustdoc-args = [ "--cfg", "docsrs" ]
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs"]
[dependencies]
wry = { version = "0.42", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] }
tao = { version = "0.29.1", default-features = false, features = [ "rwh_06" ] }
wry = { version = "0.42", default-features = false, features = [
"drag-drop",
"protocol",
"os-webview",
] }
tao = { version = "0.29.1", default-features = false, features = ["rwh_06"] }
tauri-runtime = { version = "2.0.0-rc.6", path = "../tauri-runtime" }
tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils" }
raw-window-handle = "0.6"
@ -31,13 +35,13 @@ log = "0.4"
webview2-com = "0.33"
softbuffer = { version = "0.4", default-features = false }
[target."cfg(windows)".dependencies.windows]
version = "0.58"
features = [ "Win32_Foundation", "Win32_Graphics_Dwm" ]
[target."cfg(windows)".dependencies.windows]
version = "0.58"
features = ["Win32_Foundation", "Win32_Graphics_Dwm"]
[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
gtk = { version = "0.18", features = [ "v3_24" ] }
webkit2gtk = { version = "=2.0", features = [ "v2_38" ] }
gtk = { version = "0.18", features = ["v3_24"] }
webkit2gtk = { version = "=2.0", features = ["v2_38"] }
percent-encoding = "2.1"
[target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies]
@ -47,14 +51,10 @@ cocoa = "0.26"
jni = "0.21"
[features]
devtools = [ "wry/devtools", "tauri-runtime/devtools" ]
macos-private-api = [
"wry/fullscreen",
"wry/transparent",
"tauri-runtime/macos-private-api"
]
objc-exception = [ "wry/objc-exception" ]
linux-protocol-body = [ "wry/linux-body", "webkit2gtk/v2_40" ]
tracing = [ "dep:tracing", "wry/tracing" ]
macos-proxy = [ "wry/mac-proxy" ]
unstable = [ ]
devtools = ["wry/devtools", "tauri-runtime/devtools"]
macos-private-api = ["wry/fullscreen", "wry/transparent", "tauri-runtime/macos-private-api"]
objc-exception = ["wry/objc-exception"]
linux-protocol-body = ["wry/linux-body", "webkit2gtk/v2_40"]
tracing = ["dep:tracing", "wry/tracing"]
macos-proxy = ["wry/mac-proxy"]
unstable = []

View File

@ -2,45 +2,45 @@
name = "tauri-runtime"
version = "2.0.0-rc.6"
description = "Runtime for Tauri applications"
exclude = [ "CHANGELOG.md", "/target" ]
exclude = ["CHANGELOG.md", "/target"]
readme = "README.md"
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
categories = { workspace = true }
license = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
authors.workspace = true
homepage.workspace = true
repository.workspace = true
categories.workspace = true
license.workspace = true
edition.workspace = true
rust-version.workspace = true
[package.metadata.docs.rs]
all-features = true
rustc-args = [ "--cfg", "docsrs" ]
rustdoc-args = [ "--cfg", "docsrs" ]
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs"]
default-target = "x86_64-unknown-linux-gnu"
targets = [
"x86_64-pc-windows-msvc",
"x86_64-unknown-linux-gnu",
"x86_64-apple-darwin",
"x86_64-linux-android",
"x86_64-apple-ios"
"x86_64-apple-ios",
]
[dependencies]
serde = { version = "1.0", features = [ "derive" ] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0"
tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils" }
http = "1.1"
raw-window-handle = "0.6"
url = { version = "2" }
dpi = { version = "0.1", features = [ "serde" ] }
dpi = { version = "0.1", features = ["serde"] }
[target."cfg(windows)".dependencies.windows]
version = "0.58"
features = [ "Win32_Foundation" ]
features = ["Win32_Foundation"]
[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
gtk = { version = "0.18", features = [ "v3_24" ] }
gtk = { version = "0.18", features = ["v3_24"] }
[target."cfg(target_os = \"android\")".dependencies]
jni = "0.21"
@ -49,5 +49,5 @@ jni = "0.21"
url = "2"
[features]
devtools = [ ]
macos-private-api = [ ]
devtools = []
macos-private-api = []

View File

@ -2,35 +2,35 @@
name = "tauri-utils"
version = "2.0.0-rc.6"
description = "Utilities for Tauri"
exclude = [ "CHANGELOG.md", "/target" ]
exclude = ["CHANGELOG.md", "/target"]
readme = "README.md"
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
categories = { workspace = true }
license = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
authors.workspace = true
homepage.workspace = true
repository.workspace = true
categories.workspace = true
license.workspace = true
edition.workspace = true
rust-version.workspace = true
[dependencies]
serde = { version = "1", features = [ "derive" ] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
thiserror = "1"
phf = { version = "0.11", features = [ "macros" ] }
brotli = { version = "6", optional = true, default-features = false, features = [ "std" ] }
url = { version = "2", features = [ "serde" ] }
phf = { version = "0.11", features = ["macros"] }
brotli = { version = "6", optional = true, default-features = false, features = ["std"] }
url = { version = "2", features = ["serde"] }
html5ever = "0.26"
kuchiki = { package = "kuchikiki", version = "0.8" }
proc-macro2 = { version = "1", optional = true }
quote = { version = "1", optional = true }
schemars = { version = "0.8.18", features = [ "url" ], optional = true }
schemars = { version = "0.8.18", features = ["url"], optional = true }
serde_with = "3"
aes-gcm = { version = "0.10", optional = true }
getrandom = { version = "0.2", optional = true, features = [ "std" ] }
getrandom = { version = "0.2", optional = true, features = ["std"] }
serialize-to-javascript = { version = "=0.1.1", optional = true }
ctor = "0.2"
json5 = { version = "0.4", optional = true }
toml = { version = "0.8", features = [ "parse" ] }
toml = { version = "0.8", features = ["parse"] }
json-patch = "2.0"
glob = "0.3"
urlpattern = "0.2"
@ -45,24 +45,18 @@ cargo_metadata = { version = "0.18", optional = true }
serde-untagged = "0.1"
[target."cfg(target_os = \"macos\")".dependencies]
swift-rs = { version = "1.0.6", optional = true, features = [ "build" ] }
swift-rs = { version = "1.0.6", optional = true, features = ["build"] }
[dev-dependencies]
getrandom = { version = "0.2", features = [ "std" ] }
getrandom = { version = "0.2", features = ["std"] }
serial_test = "3.1"
[features]
build = [
"proc-macro2",
"quote",
"cargo_metadata",
"schema",
"swift-rs"
]
compression = [ "brotli" ]
schema = [ "schemars" ]
isolation = [ "aes-gcm", "getrandom", "serialize-to-javascript" ]
process-relaunch-dangerous-allow-symlink-macos = [ ]
config-json5 = [ "json5" ]
config-toml = [ ]
resources = [ "walkdir" ]
build = ["proc-macro2", "quote", "cargo_metadata", "schema", "swift-rs"]
compression = ["brotli"]
schema = ["schemars"]
isolation = ["aes-gcm", "getrandom", "serialize-to-javascript"]
process-relaunch-dangerous-allow-symlink-macos = []
config-json5 = ["json5"]
config-toml = []
resources = ["walkdir"]

View File

@ -5,13 +5,13 @@ description = "Make tiny, secure apps for all desktop platforms with Tauri"
exclude = ["/test", "/.scripts", "CHANGELOG.md", "/target"]
readme = "README.md"
links = "Tauri"
authors = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
categories = { workspace = true }
license = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
authors.workspace = true
homepage.workspace = true
repository.workspace = true
categories.workspace = true
license.workspace = true
edition.workspace = true
rust-version.workspace = true
[package.metadata.docs.rs]
no-default-features = true
@ -45,13 +45,7 @@ development = ["quickcheck_macros"]
[dependencies]
serde_json = { version = "1.0", features = ["raw_value"] }
serde = { version = "1.0", features = ["derive", "rc"] }
tokio = { version = "1", features = [
"rt",
"rt-multi-thread",
"sync",
"fs",
"io-util",
] }
tokio = { version = "1", features = ["rt", "rt-multi-thread", "sync", "fs", "io-util"] }
futures-util = "0.3"
uuid = { version = "1", features = ["v4"], optional = true }
url = "2"
@ -59,7 +53,7 @@ anyhow = "1.0"
thiserror = "1.0"
tauri-runtime = { version = "2.0.0-rc.6", path = "../tauri-runtime" }
tauri-macros = { version = "2.0.0-rc.5", path = "../tauri-macros" }
tauri-utils = { version = "2.0.0-rc.6", features = [ "resources" ], path = "../tauri-utils" }
tauri-utils = { version = "2.0.0-rc.6", features = ["resources"], path = "../tauri-utils" }
tauri-runtime-wry = { version = "2.0.0-rc.6", path = "../tauri-runtime-wry", optional = true }
getrandom = "0.2"
serde_repr = "0.1"
@ -67,10 +61,7 @@ state = "0.6"
http = "1.1"
dirs = "5"
percent-encoding = "2.3"
reqwest = { version = "0.12", default-features = false, features = [
"json",
"stream",
] }
reqwest = { version = "0.12", default-features = false, features = ["json", "stream"] }
bytes = { version = "1", features = ["serde"] }
raw-window-handle = { version = "0.6", features = ["std"] }
glob = "0.3"
@ -91,9 +82,7 @@ specta = { version = "^2.0.0-rc.16", optional = true, default-features = false,
[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.14", default-features = false, features = ["serde"] }
tray-icon = { version = "0.15", default-features = false, features = [
"serde",
], optional = true }
tray-icon = { version = "0.15", default-features = false, features = ["serde"], optional = true }
[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
gtk = { version = "0.18", features = ["v3_24"] }
@ -125,7 +114,7 @@ swift-rs = "1.0.6"
[build-dependencies]
heck = "0.5"
tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-rc.6" }
tauri-utils = { path = "../tauri-utils/", version = "2.0.0-rc.6", features = [ "build" ] }
tauri-utils = { path = "../tauri-utils/", version = "2.0.0-rc.6", features = ["build"] }
[dev-dependencies]
proptest = "1.4.0"
@ -141,20 +130,14 @@ http-range = "0.1.5"
[features]
default = ["wry", "compression", "objc-exception", "common-controls-v6"]
unstable = ["tauri-runtime-wry/unstable"]
common-controls-v6 = [
"tray-icon?/common-controls-v6",
"muda/common-controls-v6",
]
common-controls-v6 = ["tray-icon?/common-controls-v6", "muda/common-controls-v6"]
tray-icon = ["dep:tray-icon"]
tracing = ["dep:tracing", "tauri-macros/tracing", "tauri-runtime-wry/tracing"]
test = []
compression = ["tauri-macros/compression", "tauri-utils/compression"]
wry = ["tauri-runtime-wry"]
objc-exception = ["tauri-runtime-wry/objc-exception"]
linux-ipc-protocol = [
"tauri-runtime-wry/linux-protocol-body",
"webkit2gtk/v2_40",
]
linux-ipc-protocol = ["tauri-runtime-wry/linux-protocol-body", "webkit2gtk/v2_40"]
linux-libxdo = ["tray-icon/libxdo", "muda/libxdo"]
isolation = ["tauri-utils/isolation", "tauri-macros/isolation", "uuid"]
custom-protocol = ["tauri-macros/custom-protocol"]
@ -165,10 +148,7 @@ devtools = ["tauri-runtime/devtools", "tauri-runtime-wry/devtools"]
process-relaunch-dangerous-allow-symlink-macos = [
"tauri-utils/process-relaunch-dangerous-allow-symlink-macos",
]
macos-private-api = [
"tauri-runtime/macos-private-api",
"tauri-runtime-wry/macos-private-api",
]
macos-private-api = ["tauri-runtime/macos-private-api", "tauri-runtime-wry/macos-private-api"]
webview-data-url = ["data-url"]
protocol-asset = ["http-range"]
config-json5 = ["tauri-macros/config-json5"]

View File

@ -1,7 +1,4 @@
identifier = "run-app-external-url"
description = "external window capability"
windows = ["external"]
permissions = [
"fs:read",
"fs:deny-home"
]
permissions = ["fs:read", "fs:deny-home"]

View File

@ -7,5 +7,5 @@ permissions = [
"fs:deny-home",
"fs:allow-read-resources",
"fs:allow-move-temp",
"fs:read-download-dir"
"fs:read-download-dir",
]

View File

@ -4,7 +4,6 @@ description = "Allows accessing the $APP path."
[[permission.scope.allow]]
path = "$APP"
[[permission]]
identifier = "allow-download-dir"
description = "Allows accessing the $DOWNLOAD directory."

View File

@ -1,7 +1,7 @@
[package]
name = "restart"
version = "0.1.0"
authors = [ "Tauri Programme within The Commons Conservancy" ]
authors = ["Tauri Programme within The Commons Conservancy"]
license = "Apache-2.0 OR MIT"
edition = "2021"

View File

@ -11,10 +11,7 @@ name = "api_lib"
crate-type = ["staticlib", "cdylib", "lib"]
[build-dependencies]
tauri-build = { path = "../../../core/tauri-build", features = [
"codegen",
"isolation",
] }
tauri-build = { path = "../../../core/tauri-build", features = ["codegen", "isolation"] }
[dependencies]
serde_json = "1.0"
@ -39,4 +36,4 @@ path = "../../../core/tauri"
features = ["test"]
[features]
prod = ["tauri/custom-protocol"]
prod = ["tauri/custom-protocol"]

View File

@ -5,7 +5,7 @@
# ISOLATION_VOLUME: absolute path to the isolation dist folder
# WORKSPACE_VOLUME: absolute path to the workspace
# this can be done running `$ . .setup-cross.sh` in the examples/api folder
volumes = ["ICONS_VOLUME", "DIST_VOLUME", "ISOLATION_VOLUME","WORKSPACE_VOLUME"]
volumes = ["ICONS_VOLUME", "DIST_VOLUME", "ISOLATION_VOLUME", "WORKSPACE_VOLUME"]
[target.aarch64-unknown-linux-gnu]
image = "aarch64-unknown-linux-gnu:latest"

View File

@ -10,5 +10,5 @@ tauri-build = { path = "../../../core/tauri-build", features = ["codegen"] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = [ "derive" ] }
serde = { version = "1.0", features = ["derive"] }
tauri = { path = "../../../core/tauri", features = [] }

File diff suppressed because it is too large Load Diff

3
taplo.toml Normal file
View File

@ -0,0 +1,3 @@
[formatting]
allowed_blank_lines = 1
column_width = 100

View File

@ -3,7 +3,7 @@ workspace = {}
[package]
name = "tauri_bench"
version = "0.1.0"
authors = [ "Tauri Programme within The Commons Conservancy" ]
authors = ["Tauri Programme within The Commons Conservancy"]
edition = "2021"
rust-version = "1.70"
license = "Apache-2.0 OR MIT"
@ -15,7 +15,7 @@ anyhow = "1.0.40"
time = { version = "0.3", features = ["formatting"] }
tempfile = "3.2.0"
serde_json = "1.0"
serde = { version = "1.0", features = [ "derive" ] }
serde = { version = "1.0", features = ["derive"] }
[[bin]]
name = "run_benchmark"

View File

@ -1,7 +1,5 @@
[workspace]
members = [
"./*/src-tauri/",
]
members = ["./*/src-tauri/"]
resolver = "2"
[profile.release]

View File

@ -6,9 +6,9 @@ edition = "2021"
rust-version = "1.70"
[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] }
tauri-build = { path = "../../../../../core/tauri-build", features = ["codegen"] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = [ "derive" ] }
serde = { version = "1.0", features = ["derive"] }
tauri = { path = "../../../../../core/tauri", features = [] }

View File

@ -6,9 +6,9 @@ edition = "2021"
rust-version = "1.70"
[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] }
tauri-build = { path = "../../../../../core/tauri-build", features = ["codegen"] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = [ "derive" ] }
serde = { version = "1.0", features = ["derive"] }
tauri = { path = "../../../../../core/tauri", features = [] }

View File

@ -6,9 +6,9 @@ edition = "2021"
rust-version = "1.70"
[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] }
tauri-build = { path = "../../../../../core/tauri-build", features = ["codegen"] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = [ "derive" ] }
serde = { version = "1.0", features = ["derive"] }
tauri = { path = "../../../../../core/tauri", features = [] }

View File

@ -1,62 +1,56 @@
workspace = { }
workspace = {}
[package]
name = "tauri-bundler"
version = "2.0.1-rc.5"
authors = [
"George Burton <burtonageo@gmail.com>",
"Tauri Programme within The Commons Conservancy"
]
categories = [ "command-line-utilities", "development-tools::cargo-plugins" ]
authors = ["George Burton <burtonageo@gmail.com>", "Tauri Programme within The Commons Conservancy"]
categories = ["command-line-utilities", "development-tools::cargo-plugins"]
license = "Apache-2.0 OR MIT"
keywords = [ "bundle", "cargo", "tauri" ]
keywords = ["bundle", "cargo", "tauri"]
repository = "https://github.com/tauri-apps/tauri"
description = "Wrap rust executables in OS-specific app bundles for Tauri"
edition = "2021"
rust-version = "1.70"
exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ]
exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"]
[dependencies]
tauri-utils = { version = "2.0.0-rc.6", path = "../../core/tauri-utils", features = [ "resources" ] }
tauri-utils = { version = "2.0.0-rc.6", path = "../../core/tauri-utils", features = ["resources"] }
image = "0.25.0"
flate2 = "1.0"
anyhow = "1.0"
thiserror = "1.0"
serde_json = "1.0"
serde = { version = "1.0", features = [ "derive" ] }
serde = { version = "1.0", features = ["derive"] }
strsim = "0.11.0"
tar = "0.4.40"
walkdir = "2"
handlebars = "6"
tempfile = "3.10.1"
log = { version = "0.4.21", features = [ "kv" ] }
log = { version = "0.4.21", features = ["kv"] }
dirs = "5"
os_pipe = "1"
ureq = { version = "2.9.6", default-features = false, features = [ "socks-proxy" ] }
ureq = { version = "2.9.6", default-features = false, features = ["socks-proxy"] }
native-tls = { version = "0.2", optional = true }
hex = "0.4"
semver = "1"
sha1 = "0.10"
sha2 = "0.10"
zip = { version = "2.0", default-features = false, features = [ "deflate" ] }
zip = { version = "2.0", default-features = false, features = ["deflate"] }
dunce = "1"
[target."cfg(target_os = \"windows\")".dependencies]
uuid = { version = "1", features = [ "v4", "v5" ] }
uuid = { version = "1", features = ["v4", "v5"] }
bitness = "0.4"
windows-registry = "0.2.0"
glob = "0.3"
[target."cfg(target_os = \"windows\")".dependencies.windows-sys]
version = "0.59"
features = [
"Win32_System_SystemInformation",
"Win32_System_Diagnostics_Debug"
]
[target."cfg(target_os = \"windows\")".dependencies.windows-sys]
version = "0.59"
features = ["Win32_System_SystemInformation", "Win32_System_Diagnostics_Debug"]
[target."cfg(target_os = \"macos\")".dependencies]
icns = { package = "tauri-icns", version = "0.1" }
time = { version = "0.3", features = [ "formatting" ] }
time = { version = "0.3", features = ["formatting"] }
plist = "1"
tauri-macos-sign = { version = "0.1.1-rc.0", path = "../macos-sign" }
@ -74,7 +68,7 @@ name = "tauri_bundler"
path = "src/lib.rs"
[features]
default = [ "rustls" ]
native-tls = [ "ureq/native-tls" ]
native-tls-vendored = [ "native-tls", "native-tls/vendored" ]
rustls = [ "ureq/tls" ]
default = ["rustls"]
native-tls = ["ureq/native-tls"]
native-tls-vendored = ["native-tls", "native-tls/vendored"]
rustls = ["ureq/tls"]

View File

@ -1,13 +1,13 @@
[workspace]
members = [ "node" ]
members = ["node"]
[package]
name = "tauri-cli"
version = "2.0.0-rc.7"
authors = [ "Tauri Programme within The Commons Conservancy" ]
authors = ["Tauri Programme within The Commons Conservancy"]
edition = "2021"
rust-version = "1.70"
categories = [ "gui", "web-programming" ]
categories = ["gui", "web-programming"]
license = "Apache-2.0 OR MIT"
homepage = "https://tauri.app"
repository = "https://github.com/tauri-apps/tauri"
@ -20,7 +20,7 @@ include = [
"*.rs",
"tauri.gitignore",
"tauri-dev-watcher.gitignore",
"LICENSE*"
"LICENSE*",
]
[package.metadata.binstall]
@ -40,50 +40,60 @@ path = "src/main.rs"
[dependencies]
cargo-mobile2 = { version = "0.14", default-features = false }
jsonrpsee = { version = "0.24", features = [ "server" ] }
jsonrpsee = { version = "0.24", features = ["server"] }
jsonrpsee-core = "0.24"
jsonrpsee-client-transport = { version = "0.24", features = [ "ws" ] }
jsonrpsee-client-transport = { version = "0.24", features = ["ws"] }
jsonrpsee-ws-client = { version = "0.24", default-features = false }
sublime_fuzzy = "0.7"
clap_complete = "4"
clap = { version = "4.5", features = [ "derive", "env" ] }
clap = { version = "4.5", features = ["derive", "env"] }
anyhow = "1.0"
tauri-bundler = { version = "2.0.1-rc.5", default-features = false, path = "../bundler" }
colored = "2.1"
serde = { version = "1.0", features = [ "derive" ] }
serde_json = { version = "1.0", features = [ "preserve_order" ] }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0", features = ["preserve_order"] }
notify = "6.1"
notify-debouncer-mini = "0.4"
shared_child = "1.0"
duct = "0.13"
toml_edit = { version = "0.22", features = [ "serde" ] }
toml_edit = { version = "0.22", features = ["serde"] }
json-patch = "2.0"
tauri-utils = { version = "2.0.0-rc.6", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] }
tauri-utils-v1 = { version = "1", package = "tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] }
tauri-utils = { version = "2.0.0-rc.6", path = "../../core/tauri-utils", features = [
"isolation",
"schema",
"config-json5",
"config-toml",
] }
tauri-utils-v1 = { version = "1", package = "tauri-utils", features = [
"isolation",
"schema",
"config-json5",
"config-toml",
] }
toml = "0.8"
jsonschema = "0.18"
handlebars = "6.0"
include_dir = "0.7"
minisign = "=0.7.3"
base64 = "0.22.0"
ureq = { version = "2.9.6", default-features = false, features = [ "gzip" ] }
ureq = { version = "2.9.6", default-features = false, features = ["gzip"] }
os_info = "3"
semver = "1.0"
regex = "1.10.3"
heck = "0.5"
dialoguer = "0.11"
url = { version = "2.5", features = [ "serde" ] }
url = { version = "2.5", features = ["serde"] }
os_pipe = "1"
ignore = "0.4"
ctrlc = "3.4"
log = { version = "0.4.21", features = [ "kv", "kv_std" ] }
log = { version = "0.4.21", features = ["kv", "kv_std"] }
env_logger = "0.11.3"
icns = { package = "tauri-icns", version = "0.1" }
image = { version = "0.25", default-features = false, features = [ "ico" ] }
axum = { version = "0.7.4", features = [ "ws" ] }
image = { version = "0.25", default-features = false, features = ["ico"] }
axum = { version = "0.7.4", features = ["ws"] }
html5ever = "0.26"
kuchiki = { package = "kuchikiki", version = "0.8" }
tokio = { version = "1", features = [ "macros", "sync" ] }
tokio = { version = "1", features = ["macros", "sync"] }
common-path = "1"
serde-value = "0.7.0"
itertools = "0.13"
@ -108,11 +118,7 @@ insta = "1"
[target."cfg(windows)".dependencies.windows-sys]
version = "0.59"
features = [
"Win32_Storage_FileSystem",
"Win32_System_IO",
"Win32_System_Console"
]
features = ["Win32_Storage_FileSystem", "Win32_System_IO", "Win32_System_Console"]
[target."cfg(unix)".dependencies]
libc = "0.2"
@ -122,14 +128,10 @@ plist = "1"
tauri-macos-sign = { version = "0.1.1-rc.0", path = "../macos-sign" }
[features]
default = [ "rustls" ]
native-tls = [
"tauri-bundler/native-tls",
"cargo-mobile2/native-tls",
"ureq/native-tls"
]
native-tls-vendored = [ "native-tls", "tauri-bundler/native-tls-vendored" ]
rustls = [ "tauri-bundler/rustls", "cargo-mobile2/rustls", "ureq/tls" ]
default = ["rustls"]
native-tls = ["tauri-bundler/native-tls", "cargo-mobile2/native-tls", "ureq/native-tls"]
native-tls-vendored = ["native-tls", "tauri-bundler/native-tls-vendored"]
rustls = ["tauri-bundler/rustls", "cargo-mobile2/rustls", "ureq/tls"]
[profile.dev.package.miniz_oxide]
opt-level = 3

View File

@ -4,4 +4,4 @@ linker = "aarch64-linux-gnu-gcc"
linker = "aarch64-linux-musl-gcc"
rustflags = ["-C", "target-feature=-crt-static"]
[target.armv7-unknown-linux-gnueabihf]
linker = "arm-linux-gnueabihf-gcc"
linker = "arm-linux-gnueabihf-gcc"

View File

@ -22,4 +22,4 @@ os_pipe = "1"
plist = "1"
rand = "0.8"
dirs-next = "2"
log = { version = "0.4.21", features = [ "kv" ] }
log = { version = "0.4.21", features = ["kv"] }

View File

@ -1,10 +1,10 @@
workspace = { }
workspace = {}
[package]
name = "tauri-driver"
version = "0.1.5"
authors = [ "Tauri Programme within The Commons Conservancy" ]
categories = [ "gui", "web-programming" ]
authors = ["Tauri Programme within The Commons Conservancy"]
categories = ["gui", "web-programming"]
license = "Apache-2.0 OR MIT"
homepage = "https://tauri.app"
repository = "https://github.com/tauri-apps/tauri"
@ -15,15 +15,15 @@ rust-version = "1.60"
[dependencies]
anyhow = "1"
hyper = { version = "0.14", features = [ "client", "http1", "runtime", "server", "stream", "tcp" ] }
hyper = { version = "0.14", features = ["client", "http1", "runtime", "server", "stream", "tcp"] }
futures = "0.3"
futures-util = "0.3"
pico-args = "0.4"
serde = { version = "1", features = [ "derive" ] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tokio = { version = "1", features = [ "macros" ] }
tokio = { version = "1", features = ["macros"] }
which = "4"
[target."cfg(unix)".dependencies]
signal-hook = "0.3"
signal-hook-tokio = { version = "0.3", features = [ "futures-v0_3" ] }
signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }