diff --git a/Cargo.toml b/Cargo.toml index 3af3f66..9bab5e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,22 +43,10 @@ sabry_build = {workspace = true, optional = true} sabry_intrnl = {workspace = true} [features] -default = ["scss"] +default = ["procmacro"] procmacro = [ "dep:sabry_procmacro" ] -sass = [ - "procmacro", - "sabry_procmacro/sass", - "sabry_intrnl/sass", - "sabry_build/sass" -] -scss = [ - "procmacro", - "sabry_procmacro/scss", - "sabry_intrnl/scss", - "sabry_build/scss" -] build = [ "dep:sabry_build" ] diff --git a/examples/define-styles/Cargo.toml b/examples/define-styles/Cargo.toml index 496ecd3..4e80fbe 100644 --- a/examples/define-styles/Cargo.toml +++ b/examples/define-styles/Cargo.toml @@ -6,4 +6,4 @@ rust-version = "1.82" publish = false [dependencies] -sabry = {path = "../../", features = ["sass"]} +sabry = {path = "../../"} diff --git a/examples/leptos-axum/Cargo.toml b/examples/leptos-axum/Cargo.toml index 7033f16..1b30dbb 100644 --- a/examples/leptos-axum/Cargo.toml +++ b/examples/leptos-axum/Cargo.toml @@ -23,11 +23,11 @@ tracing = { version = "0.1", optional = true } http = "1" # sabry with sass -sabry = {path = "../../", features = ["sass"]} +sabry = {path = "../../"} [build-dependencies] # sabry for build with sass -sabry = {path = "../../", features = ["build", "sass"]} +sabry = {path = "../../", features = ["build"]} # lets depend on our styles define-styles = {path = "../define-styles"} diff --git a/examples/use-styles/Cargo.toml b/examples/use-styles/Cargo.toml index 77c0ca6..29e0a32 100644 --- a/examples/use-styles/Cargo.toml +++ b/examples/use-styles/Cargo.toml @@ -6,10 +6,10 @@ rust-version = "1.82" publish = false [dependencies] -sabry = {path = "../../", features = ["sass"]} +sabry = {path = "../../"} [build-dependencies] -sabry = {path = "../../", features = ["build", "sass"]} +sabry = {path = "../../", features = ["build"]} define-styles = {path = "../define-styles"} [package.metadata.sabry] diff --git a/sabry_build/Cargo.toml b/sabry_build/Cargo.toml index d6ff640..c8f8a81 100644 --- a/sabry_build/Cargo.toml +++ b/sabry_build/Cargo.toml @@ -17,12 +17,4 @@ thiserror = {version = "^1.0"} walkdir = {version = "^2.5"} [features] -sass = [ - "sabry_procmacro_impl/sass", - "sabry_intrnl/sass" -] -scss = [ - "sabry_procmacro_impl/scss", - "sabry_intrnl/scss" -] net-files = [] diff --git a/sabry_intrnl/Cargo.toml b/sabry_intrnl/Cargo.toml index 412f6f5..457d28f 100644 --- a/sabry_intrnl/Cargo.toml +++ b/sabry_intrnl/Cargo.toml @@ -24,5 +24,3 @@ serde = {version = "^1.0", features = ["derive"]} toml = {version = "^0.8"} [features] -sass = [] -scss = [] diff --git a/sabry_intrnl/src/compiler/mod.rs b/sabry_intrnl/src/compiler/mod.rs index 0c2df2b..7b20556 100644 --- a/sabry_intrnl/src/compiler/mod.rs +++ b/sabry_intrnl/src/compiler/mod.rs @@ -89,18 +89,14 @@ pub enum SabryCompilerError { /// Unification wrapper over all the Syntax enums #[derive(Clone, Copy)] pub enum CompilerSyntax { - #[cfg(feature = "sass")] Sass, - #[cfg(feature = "scss")] Scss, } impl From for CompilerSyntax { fn from(value: raffia::Syntax) -> Self { match value { - #[cfg(feature = "sass")] raffia::Syntax::Sass => Self::Sass, - #[cfg(feature = "scss")] raffia::Syntax::Scss => Self::Scss, // TODO: fallbacky error-prone _ => Self::Scss, @@ -111,9 +107,7 @@ impl From for CompilerSyntax { impl From for grass::InputSyntax { fn from(value: CompilerSyntax) -> Self { match value { - #[cfg(feature = "scss")] CompilerSyntax::Scss => Self::Scss, - #[cfg(feature = "sass")] CompilerSyntax::Sass => Self::Sass, } } diff --git a/sabry_procmacro/Cargo.toml b/sabry_procmacro/Cargo.toml index 1ca3d35..70df668 100644 --- a/sabry_procmacro/Cargo.toml +++ b/sabry_procmacro/Cargo.toml @@ -14,9 +14,3 @@ proc-macro = true sabry_procmacro_impl = {workspace = true} [features] -sass = [ - "sabry_procmacro_impl/sass" -] -scss = [ - "sabry_procmacro_impl/scss" -] diff --git a/sabry_procmacro_impl/Cargo.toml b/sabry_procmacro_impl/Cargo.toml index dbac87d..499f1ce 100644 --- a/sabry_procmacro_impl/Cargo.toml +++ b/sabry_procmacro_impl/Cargo.toml @@ -17,9 +17,3 @@ raffia = {version = "^0.9"} regex = {version = "^1.11"} [features] -sass = [ - "sabry_intrnl/sass" -] -scss = [ - "sabry_intrnl/scss" -] diff --git a/sabry_procmacro_impl/src/impls/mod.rs b/sabry_procmacro_impl/src/impls/mod.rs index e5f9cc5..c2420e2 100644 --- a/sabry_procmacro_impl/src/impls/mod.rs +++ b/sabry_procmacro_impl/src/impls/mod.rs @@ -74,18 +74,14 @@ impl ToString for ArbitraryStyleBlock { #[derive(Clone, Copy)] pub enum ArbitraryStyleSyntax { - #[cfg(feature = "scss")] Scss, - #[cfg(feature = "sass")] Sass, } impl From for CompilerSyntax { fn from(value: ArbitraryStyleSyntax) -> Self { match value { - #[cfg(feature = "sass")] ArbitraryStyleSyntax::Sass => Self::Sass, - #[cfg(feature = "scss")] ArbitraryStyleSyntax::Scss => Self::Scss, } } @@ -94,9 +90,7 @@ impl From for CompilerSyntax { impl ToTokens for ArbitraryStyleSyntax { fn to_tokens(&self, tokens: &mut TokenStream) { match self { - #[cfg(feature = "sass")] Self::Sass => tokens.append_all(quote! {"sass"}), - #[cfg(feature = "scss")] Self::Scss => tokens.append_all(quote! {"scss"}), } } @@ -114,9 +108,7 @@ impl Parse for ArbitraryStyleSyntax { let ident = input.parse::()?; match ident.to_string().as_str() { - #[cfg(feature = "sass")] "sass" => Ok(Self::Sass), - #[cfg(feature = "scss")] "scss" => Ok(Self::Scss), _ => Err(syn::Error::new( ident.span(), @@ -132,9 +124,7 @@ impl Parse for ArbitraryStyleSyntax { impl Debug for ArbitraryStyleSyntax { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { let name = match self { - #[cfg(feature = "sass")] Self::Sass => "sass", - #[cfg(feature = "scss")] Self::Scss => "scss", }; write!(f, "{name}") @@ -142,23 +132,15 @@ impl Debug for ArbitraryStyleSyntax { } impl Default for ArbitraryStyleSyntax { - #[cfg(feature = "scss")] fn default() -> Self { Self::Scss } - - #[cfg(all(feature = "sass", not(feature = "scss")))] - fn default() -> Self { - Self::Sass - } } impl From for raffia::Syntax { fn from(value: ArbitraryStyleSyntax) -> Self { match value { - #[cfg(feature = "sass")] ArbitraryStyleSyntax::Sass => Self::Sass, - #[cfg(feature = "scss")] ArbitraryStyleSyntax::Scss => Self::Scss, } } @@ -166,7 +148,6 @@ impl From for raffia::Syntax { #[cfg(test)] mod test { - #[cfg(feature = "sass")] #[test] fn arbitrary_style_block_sass() { use super::ArbitraryStyleBlock; @@ -183,7 +164,6 @@ mod test { assert_eq!(code, block.code); } - #[cfg(feature = "scss")] #[test] fn arbitrary_style_block_scss() { use super::ArbitraryStyleBlock;