diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml index 2da8f02ef..8ad1e0c11 100644 --- a/core/tauri-build/Cargo.toml +++ b/core/tauri-build/Cargo.toml @@ -18,8 +18,8 @@ rustdoc-args = [ "--cfg", "doc_cfg" ] [dependencies] anyhow = "1" -quote = { version = "1", optional = true } -tauri-codegen = { version = "2.0.0-alpha.4", path = "../tauri-codegen", optional = true } +quote = "1" +tauri-codegen = { version = "2.0.0-alpha.4", path = "../tauri-codegen" } tauri-utils = { version = "2.0.0-alpha.4", path = "../tauri-utils", features = [ "build", "resources" ] } cargo_toml = "0.15" serde = "1" @@ -35,7 +35,6 @@ semver = "1" swift-rs = { version = "1.0.4", features = [ "build" ] } [features] -codegen = [ "tauri-codegen", "quote" ] isolation = [ "tauri-codegen/isolation", "tauri-utils/isolation" ] config-json5 = [ "tauri-utils/config-json5" ] config-toml = [ "tauri-utils/config-toml" ] diff --git a/core/tauri-build/src/codegen/context.rs b/core/tauri-build/src/codegen/context.rs index e17fe3b8f..76ef58f9f 100644 --- a/core/tauri-build/src/codegen/context.rs +++ b/core/tauri-build/src/codegen/context.rs @@ -14,7 +14,6 @@ use tauri_utils::config::{AppUrl, WindowUrl}; // TODO docs /// A builder for generating a Tauri application context during compile time. -#[cfg_attr(doc_cfg, doc(cfg(feature = "codegen")))] #[derive(Debug)] pub struct CodegenContext { dev: bool, diff --git a/core/tauri-build/src/lib.rs b/core/tauri-build/src/lib.rs index 1584fdc18..b390c6de9 100644 --- a/core/tauri-build/src/lib.rs +++ b/core/tauri-build/src/lib.rs @@ -21,14 +21,11 @@ use std::{ path::{Path, PathBuf}, }; -#[cfg(feature = "codegen")] mod codegen; /// Mobile build functions. pub mod mobile; mod static_vcruntime; -#[cfg(feature = "codegen")] -#[cfg_attr(doc_cfg, doc(cfg(feature = "codegen")))] pub use codegen::context::CodegenContext; fn copy_file(from: impl AsRef, to: impl AsRef) -> Result<()> { diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index 0618b55ff..ac6d0c834 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -10,7 +10,7 @@ license = "Apache-2.0 OR MIT" crate-type = ["staticlib", "cdylib", "rlib"] [build-dependencies] -tauri-build = { path = "../../../core/tauri-build", features = ["codegen", "isolation"] } +tauri-build = { path = "../../../core/tauri-build", features = ["isolation"] } [dependencies] serde_json = "1.0" diff --git a/examples/resources/src-tauri/Cargo.toml b/examples/resources/src-tauri/Cargo.toml index da590a6e8..5175cb3be 100644 --- a/examples/resources/src-tauri/Cargo.toml +++ b/examples/resources/src-tauri/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" rust-version = "1.65" [build-dependencies] -tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] } +tauri-build = { path = "../../../core/tauri-build" } [dependencies] serde_json = "1.0" diff --git a/examples/sidecar/src-tauri/Cargo.toml b/examples/sidecar/src-tauri/Cargo.toml index fc190447b..a591665de 100644 --- a/examples/sidecar/src-tauri/Cargo.toml +++ b/examples/sidecar/src-tauri/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" rust-version = "1.65" [build-dependencies] -tauri-build = { path = "../../../core/tauri-build", features = ["codegen"] } +tauri-build = { path = "../../../core/tauri-build" } [dependencies] serde_json = "1.0" diff --git a/examples/tauri-dynamic-lib/src-tauri/Cargo.toml b/examples/tauri-dynamic-lib/src-tauri/Cargo.toml index d70c0740f..537bc8d01 100644 --- a/examples/tauri-dynamic-lib/src-tauri/Cargo.toml +++ b/examples/tauri-dynamic-lib/src-tauri/Cargo.toml @@ -11,7 +11,7 @@ rust-version = "1.65" crate-type = ["cdylib"] [build-dependencies] -tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] } +tauri-build = { path = "../../../core/tauri-build" } [dependencies] serde_json = "1.0" diff --git a/examples/updater/src-tauri/Cargo.toml b/examples/updater/src-tauri/Cargo.toml index 07e5cd91e..d2bcc0a13 100644 --- a/examples/updater/src-tauri/Cargo.toml +++ b/examples/updater/src-tauri/Cargo.toml @@ -7,7 +7,7 @@ rust-version = "1.65" license = "Apache-2.0 OR MIT" [build-dependencies] -tauri-build = { path = "../../../core/tauri-build", features = ["codegen"] } +tauri-build = { path = "../../../core/tauri-build" } [dependencies] serde_json = "1.0" diff --git a/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml b/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml index efa037378..0e518d072 100644 --- a/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml +++ b/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" rust-version = "1.65" [build-dependencies] -tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] } +tauri-build = { path = "../../../../../core/tauri-build" } [dependencies] serde_json = "1.0" diff --git a/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml b/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml index e9a7c6072..fe5d66507 100644 --- a/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml +++ b/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" rust-version = "1.65" [build-dependencies] -tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] } +tauri-build = { path = "../../../../../core/tauri-build" } [dependencies] serde_json = "1.0" diff --git a/tooling/bench/tests/helloworld/src-tauri/Cargo.toml b/tooling/bench/tests/helloworld/src-tauri/Cargo.toml index 26c8a9a63..ada3bcc04 100644 --- a/tooling/bench/tests/helloworld/src-tauri/Cargo.toml +++ b/tooling/bench/tests/helloworld/src-tauri/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" rust-version = "1.65" [build-dependencies] -tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] } +tauri-build = { path = "../../../../../core/tauri-build" } [dependencies] serde_json = "1.0"