Skip to content

Commit

Permalink
chore: fix ci and cleanup leftovers (#6925)
Browse files Browse the repository at this point in the history
* chore: fix ci and cleanup leftovers

1. removed leftover feature flags
2. remove zip/extract apis which are not used anymore
3. removed leftoever scopes
4. removed leftover allowlist and updater options
5. updated the example api

* remove leftover updater structs

* move updater under bundle and remove uneeded options

* fix cli on linux

* remove create_proxy

* clippy

* more clippy

* clippppy

* readd path api

* fix api example

* remove window allowlist

* remove window from allowlist config

* remove `all` allowlist option

* remove file_move

* lint

* fix windows build

* remvoe unused deps

* remvoe allowlist config option, move protocol to `security > asset_protocol`

* fix diffing features

* fmt and test

* fix scope alias

* change files

* android lint

* simplify allow_file impl

* Revert "simplify allow_file impl"

This reverts commit b8882f2.

* expose scopes

* remove unused error variants

* protocol-asset on docs.rs

* ignore reqwest on udeps

---------

Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
Co-authored-by: Lucas Nogueira <lucas@tauri.app>
  • Loading branch information
3 people committed May 13, 2023
1 parent 9a79dc0 commit e1e85dc
Show file tree
Hide file tree
Showing 80 changed files with 698 additions and 9,689 deletions.
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"] }

0 comments on commit e1e85dc

Please sign in to comment.