From b08ae637a0f58b38cbce9b8a1fa0b6c5dc0cfd05 Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Tue, 17 Jan 2023 01:43:29 +0100 Subject: [PATCH] fix(cli): remove default features from template (#6074) --- .changes/template-default-features.md | 6 ++++++ examples/api/src-tauri/Cargo.toml | 1 - examples/resources/src-tauri/Cargo.toml | 1 - examples/sidecar/src-tauri/Cargo.toml | 1 - examples/tauri-dynamic-lib/src-tauri/Cargo.toml | 1 - examples/updater/src-tauri/Cargo.toml | 1 - examples/web/core/tauri/Cargo.toml | 5 ----- examples/workspace/src-tauri/Cargo.toml | 5 ----- tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml | 1 - tooling/bench/tests/files_transfer/src-tauri/Cargo.toml | 1 - tooling/bench/tests/helloworld/src-tauri/Cargo.toml | 1 - tooling/cli/templates/app/src-tauri/Cargo.crate-manifest | 6 ++---- .../backend/examples/vanilla/src-tauri/Cargo.crate-manifest | 1 - .../plugin/with-api/examples/tauri-app/src-tauri/Cargo.toml | 6 ++---- 14 files changed, 10 insertions(+), 27 deletions(-) create mode 100644 .changes/template-default-features.md diff --git a/.changes/template-default-features.md b/.changes/template-default-features.md new file mode 100644 index 000000000..4cdd17419 --- /dev/null +++ b/.changes/template-default-features.md @@ -0,0 +1,6 @@ +--- +'cli.rs': minor +'cli.js': minor +--- + +Remove default features from Cargo.toml template. diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index 168704e60..9ccc680b3 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -49,7 +49,6 @@ mobile-entry-point = "0.1.0" env_logger = "0.9.0" [features] -default = [ "custom-protocol" ] custom-protocol = [ "tauri/custom-protocol" ] # default to small, optimized release binaries diff --git a/examples/resources/src-tauri/Cargo.toml b/examples/resources/src-tauri/Cargo.toml index 50daca46e..43f6c66a1 100644 --- a/examples/resources/src-tauri/Cargo.toml +++ b/examples/resources/src-tauri/Cargo.toml @@ -14,5 +14,4 @@ serde = { version = "1.0", features = [ "derive" ] } tauri = { path = "../../../core/tauri", features = ["shell-execute"] } [features] -default = [ "custom-protocol" ] custom-protocol = [ "tauri/custom-protocol" ] diff --git a/examples/sidecar/src-tauri/Cargo.toml b/examples/sidecar/src-tauri/Cargo.toml index ab770ce21..ebd8f400e 100644 --- a/examples/sidecar/src-tauri/Cargo.toml +++ b/examples/sidecar/src-tauri/Cargo.toml @@ -14,5 +14,4 @@ serde = { version = "1.0", features = [ "derive" ] } tauri = { path = "../../../core/tauri", features = ["process-command-api", "shell-sidecar"] } [features] -default = [ "custom-protocol" ] custom-protocol = [ "tauri/custom-protocol" ] diff --git a/examples/tauri-dynamic-lib/src-tauri/Cargo.toml b/examples/tauri-dynamic-lib/src-tauri/Cargo.toml index 66921386d..da273eff2 100644 --- a/examples/tauri-dynamic-lib/src-tauri/Cargo.toml +++ b/examples/tauri-dynamic-lib/src-tauri/Cargo.toml @@ -19,5 +19,4 @@ serde = { version = "1.0", features = [ "derive" ] } tauri = { path = "../../../core/tauri", features = [] } [features] -default = [ "custom-protocol" ] custom-protocol = [ "tauri/custom-protocol" ] diff --git a/examples/updater/src-tauri/Cargo.toml b/examples/updater/src-tauri/Cargo.toml index 50b414f81..1b09b121d 100644 --- a/examples/updater/src-tauri/Cargo.toml +++ b/examples/updater/src-tauri/Cargo.toml @@ -15,7 +15,6 @@ serde = { version = "1.0", features = [ "derive" ] } tauri = { path = "../../../core/tauri", features = ["updater"] } [features] -default = [ "custom-protocol" ] custom-protocol = [ "tauri/custom-protocol" ] [[bin]] diff --git a/examples/web/core/tauri/Cargo.toml b/examples/web/core/tauri/Cargo.toml index a4e5ba1be..ab3f83c04 100644 --- a/examples/web/core/tauri/Cargo.toml +++ b/examples/web/core/tauri/Cargo.toml @@ -17,9 +17,4 @@ api = { path = "../api" } tauri = { path = "../../../../core/tauri", features = ["dialog"] } [features] -# by default Tauri runs in production mode -# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL -default = [ "custom-protocol" ] -# this feature is used for production builds where `devPath` points to the filesystem -# DO NOT remove this custom-protocol = [ "tauri/custom-protocol" ] diff --git a/examples/workspace/src-tauri/Cargo.toml b/examples/workspace/src-tauri/Cargo.toml index 0ed2841db..f72a64167 100644 --- a/examples/workspace/src-tauri/Cargo.toml +++ b/examples/workspace/src-tauri/Cargo.toml @@ -19,9 +19,4 @@ tauri = { path = "../../../core/tauri", features = [] } core-api = { path = "../core" } [features] -# by default Tauri runs in production mode -# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL -default = [ "custom-protocol" ] -# this feature is used for production builds where `devPath` points to the filesystem -# DO NOT remove this custom-protocol = [ "tauri/custom-protocol" ] diff --git a/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml b/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml index 5120e5f30..b98305bc9 100644 --- a/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml +++ b/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml @@ -14,5 +14,4 @@ serde = { version = "1.0", features = [ "derive" ] } tauri = { path = "../../../../../core/tauri", features = [] } [features] -default = [ "custom-protocol" ] custom-protocol = [ "tauri/custom-protocol" ] diff --git a/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml b/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml index f643bd0fd..95cbb6617 100644 --- a/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml +++ b/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml @@ -14,5 +14,4 @@ serde = { version = "1.0", features = [ "derive" ] } tauri = { path = "../../../../../core/tauri", features = ["fs-read-file"] } [features] -default = [ "custom-protocol" ] custom-protocol = [ "tauri/custom-protocol" ] diff --git a/tooling/bench/tests/helloworld/src-tauri/Cargo.toml b/tooling/bench/tests/helloworld/src-tauri/Cargo.toml index 0b3040181..5b014fa32 100644 --- a/tooling/bench/tests/helloworld/src-tauri/Cargo.toml +++ b/tooling/bench/tests/helloworld/src-tauri/Cargo.toml @@ -14,5 +14,4 @@ serde = { version = "1.0", features = [ "derive" ] } tauri = { path = "../../../../../core/tauri", features = [] } [features] -default = [ "custom-protocol" ] custom-protocol = [ "tauri/custom-protocol" ] diff --git a/tooling/cli/templates/app/src-tauri/Cargo.crate-manifest b/tooling/cli/templates/app/src-tauri/Cargo.crate-manifest index 1280e6f8a..b0a5b9f18 100755 --- a/tooling/cli/templates/app/src-tauri/Cargo.crate-manifest +++ b/tooling/cli/templates/app/src-tauri/Cargo.crate-manifest @@ -20,9 +20,7 @@ serde = { version = "1.0", features = ["derive"] } tauri = {{{ tauri_dep }}} [features] -# by default Tauri runs in production mode -# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL -default = [ "custom-protocol" ] -# this feature is used for production builds where `devPath` points to the filesystem +# this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled. +# If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes. # DO NOT remove this custom-protocol = [ "tauri/custom-protocol" ] diff --git a/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/Cargo.crate-manifest b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/Cargo.crate-manifest index 74a685bdf..535c22392 100644 --- a/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/Cargo.crate-manifest +++ b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/Cargo.crate-manifest @@ -17,5 +17,4 @@ tauri-plugin-{{ plugin_name }} = { path = "../../../" } tauri-build = {{{ tauri_build_dep }}} [features] -default = [ "custom-protocol" ] custom-protocol = [ "tauri/custom-protocol" ] diff --git a/tooling/cli/templates/plugin/with-api/examples/tauri-app/src-tauri/Cargo.toml b/tooling/cli/templates/plugin/with-api/examples/tauri-app/src-tauri/Cargo.toml index df85cfb55..e7f333020 100644 --- a/tooling/cli/templates/plugin/with-api/examples/tauri-app/src-tauri/Cargo.toml +++ b/tooling/cli/templates/plugin/with-api/examples/tauri-app/src-tauri/Cargo.toml @@ -20,9 +20,7 @@ tauri = {{{ tauri_example_dep }}} tauri-plugin-{{ plugin_name }} = { path = "../../../" } [features] -# by default Tauri runs in production mode -# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL -default = [ "custom-protocol" ] -# this feature is used used for production builds where `devPath` points to the filesystem +# this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled. +# If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes. # DO NOT remove this custom-protocol = [ "tauri/custom-protocol" ]