Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix ci and cleanup leftovers #6925

Merged
merged 31 commits into from May 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4f232fd
chore: fix ci and cleanup leftovers
amrbashir May 10, 2023
f935455
remove leftover updater structs
amrbashir May 10, 2023
fcf2af5
move updater under bundle and remove uneeded options
amrbashir May 10, 2023
9fed5b7
fix cli on linux
amrbashir May 10, 2023
b1eedc5
remove create_proxy
lucasfernog May 10, 2023
0533022
Merge remote-tracking branch 'origin/refactor/cleanup' into refactor/…
lucasfernog May 10, 2023
a4cf785
clippy
amrbashir May 10, 2023
6cc4c98
more clippy
amrbashir May 10, 2023
d27a6e5
clippppy
amrbashir May 10, 2023
bb8587b
Merge remote-tracking branch 'origin/next' into refactor/cleanup
lucasfernog May 12, 2023
961d5de
readd path api
lucasfernog May 12, 2023
9761628
fix api example
lucasfernog May 12, 2023
825638a
remove window allowlist
lucasfernog May 12, 2023
572f970
remove window from allowlist config
lucasfernog May 12, 2023
713fa2a
remove `all` allowlist option
lucasfernog May 12, 2023
e36a8e0
remove file_move
lucasfernog May 12, 2023
f060ce0
lint
lucasfernog May 12, 2023
234edba
fix windows build
lucasfernog May 12, 2023
63506f2
remvoe unused deps
amrbashir May 12, 2023
42ebad7
remvoe allowlist config option, move protocol to `security > asset_pr…
amrbashir May 12, 2023
80d9f2f
fix diffing features
amrbashir May 12, 2023
2bbd957
fmt and test
amrbashir May 12, 2023
2fa2156
fix scope alias
lucasfernog May 13, 2023
43cd7f9
change files
lucasfernog May 13, 2023
802c63f
android lint
lucasfernog May 13, 2023
b8882f2
simplify allow_file impl
lucasfernog May 13, 2023
47f16b6
Revert "simplify allow_file impl"
lucasfernog May 13, 2023
0473551
expose scopes
lucasfernog May 13, 2023
acee34f
remove unused error variants
lucasfernog May 13, 2023
f1b44b2
protocol-asset on docs.rs
lucasfernog May 13, 2023
cbfbff9
ignore reqwest on udeps
lucasfernog May 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/move-protocol-asset.md
@@ -0,0 +1,6 @@
---
"tauri": patch
"tauri-utils": patch
---

Moved the `protocol` scope configuration to the `asset_protocol` field in `SecurityConfig`.
8 changes: 8 additions & 0 deletions .changes/move-updater-config.md
@@ -0,0 +1,8 @@
---
"tauri": patch
"tauri-utils": patch
"cli.rs": patch
"cli.js": patch
---

Moved the updater configuration to the `BundleConfig`.
8 changes: 8 additions & 0 deletions .changes/remove-allowlist.md
@@ -0,0 +1,8 @@
---
"tauri": patch
"tauri-utils": patch
"cli.rs": patch
"cli.js": patch
---

Removed the allowlist configuration.
5 changes: 5 additions & 0 deletions .changes/remove-fs-apis.md
@@ -0,0 +1,5 @@
---
"tauri": patch
---

Removed extract and move APIs from `tauri::api::file`.
6 changes: 6 additions & 0 deletions .changes/remove-updater-event.md
@@ -0,0 +1,6 @@
---
"tauri": patch
---

Removed `UpdaterEvent`. See `tauri-plugin-updater` for new usage.

2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Expand Up @@ -71,7 +71,7 @@ The code for the bundler is located in `[Tauri repo root]/tooling/bundler`, and

### Developing Tauri Core and Related Components (Rust API, Macros, Codegen, and Utils)

The code for Tauri Core is located in `[Tauri repo root]/core/tauri`, and the Rust API, Macros, and Utils are in `[Tauri repo root]/core/tauri-(api/macros/utils)`. The easiest way to test your changes is to use the `[Tauri repo root]/examples/helloworld` app. It automatically rebuilds and uses your local copy of the Tauri core packages. Just run `yarn tauri build` or `yarn tauri dev` in the helloworld app directory after making changes to test them out. To use your local changes in another project, edit its `src-tauri/Cargo.toml` file so that the `tauri` key looks like `tauri = { path = "PATH", features = [ "api-all" ] }`, where `PATH` is the relative path to `[Tauri repo root]/core/tauri`. Then, your local copy of the Tauri core packages will be rebuilt and used whenever you build that project.
The code for Tauri Core is located in `[Tauri repo root]/core/tauri`, and the Rust API, Macros, and Utils are in `[Tauri repo root]/core/tauri-(api/macros/utils)`. The easiest way to test your changes is to use the `[Tauri repo root]/examples/helloworld` app. It automatically rebuilds and uses your local copy of the Tauri core packages. Just run `yarn tauri build` or `yarn tauri dev` in the helloworld app directory after making changes to test them out. To use your local changes in another project, edit its `src-tauri/Cargo.toml` file so that the `tauri` key looks like `tauri = { path = "PATH" }`, where `PATH` is the relative path to `[Tauri repo root]/core/tauri`. Then, your local copy of the Tauri core packages will be rebuilt and used whenever you build that project.

#### Building the documentation locally

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/lint-fmt-core.yml
Expand Up @@ -50,11 +50,10 @@ jobs:
clippy:
- { args: '', key: 'empty' }
- {
args: '--features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,updater,system-tray',
args: '--features compression,wry,linux-protocol-headers,isolation,custom-protocol,system-tray',
key: 'all'
}
- { args: '--features custom-protocol', key: 'custom-protocol' }
- { args: '--features api-all', key: 'api-all' }

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test-core.yml
Expand Up @@ -72,11 +72,7 @@ jobs:
key: no-default
}
- {
args: --features api-all,
key: api-all
}
- {
args: --features compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,updater,system-tray,
args: --features compression,wry,linux-protocol-headers,isolation,custom-protocol,system-tray,
key: all
}

Expand Down
1 change: 0 additions & 1 deletion core/tauri-build/Cargo.toml
Expand Up @@ -27,7 +27,6 @@ serde_json = "1"
heck = "0.4"
json-patch = "1.0"
walkdir = "2"
filetime = "0.2"
tauri-winres = "0.1"
semver = "1"

Expand Down
2 changes: 1 addition & 1 deletion core/tauri-build/src/lib.rs
Expand Up @@ -349,7 +349,7 @@ dependencies {"

if !error_message.is_empty() {
return Err(anyhow!("
The `tauri` dependency features on the `Cargo.toml` file does not match the allowlist defined under `tauri.conf.json`.
The `tauri` dependency features on the `Cargo.toml` file does not match the `tauri.conf.json` config.
Please run `tauri dev` or `tauri build` or {}.
", error_message));
}
Expand Down
1 change: 0 additions & 1 deletion core/tauri-config-schema/Cargo.toml
Expand Up @@ -11,5 +11,4 @@ tauri-utils = { version = "2.0.0-alpha.4", features = [
schemars = { version = "0.8", features = ["url", "preserve_order"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_with = "1.12"
url = { version = "2.3", features = ["serde"] }