mondeja · mondeja · Aug 17, 2024 · Aug 17, 2024 · Aug 17, 2024 · Aug 17, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## Unreleased - 0.2.0
+
+### Breaking changes
+
+- The feature `json` is not enabled by default anymore. Now leptos-fluent
+  does not includes features by default, so you don't need to use
+  `default-features = false` in your `Cargo.toml` file.
+
 ## 2024-08-17 - [0.1.17]
 
 ### New features

diff --git a/README.md b/README.md
diff --git a/book/src/install.md b/book/src/install.md
@@ -19,20 +19,17 @@ fluent-templates = "0.10"
 
 ```toml
 [dependencies]
-leptos-fluent = { version = "0.1", default-features = false }
+leptos-fluent = "0.1"
 fluent-templates = { version = "0.10", default-features = false, features = [
   "macros",
   "walkdir"
 ] }
 ```
 
-- Using `default-features = false` for `leptos-fluent` the `json`
-  default feature will not be enabled, so the `languages` parameter
-  of [`leptos_fluent!`] macro will not be available.
-- Using `default-features = false` and `features = ["macros", "walkdir"]`
-  for `fluent-templates` ensures that the dependency tree is the minimal
-  possible because more dependencies are shared between `leptos-fluent`
-  and `fluent-templates`.
+Using `default-features = false` and `features = ["macros", "walkdir"]`
+for `fluent-templates` ensures that the dependency tree is the minimal
+possible because more dependencies are shared between `leptos-fluent`
+and `fluent-templates`.
 
 </details>
 
@@ -85,7 +82,7 @@ See the [GTK example](https://github.com/mondeja/leptos-fluent/tree/master/examp
 - **Axum integration**: `axum`
 - **Nightly toolchain**: `nightly`
 - **Desktop applications**: `system`
-- **JSON languages file**: `json` (enabled by default)
+- **JSON languages file**: `json`
 - **YAML languages file**: `yaml`
 - **JSON5 languages file**: `json5`
 - **Tracing support**: `tracing`
@@ -156,6 +153,5 @@ See the [GTK example](https://github.com/mondeja/leptos-fluent/tree/master/examp
 ```
 
 [`fluent-templates`]: https://github.com/XAMPPRocky/fluent-templates
-[`leptos_fluent!`]: https://mondeja.github.io/leptos-fluent/leptos_fluent.html
 [`cargo leptos`]: https://github.com/leptos-rs/cargo-leptos
 [`tracing`]: https://docs.rs/tracing/latest/tracing
diff --git a/book/src/languages.md b/book/src/languages.md
@@ -65,6 +65,24 @@ leptos_fluent! {{
 ]
 ```
 
+### Languages file format
+
+In order to use a languages file, you must enable the feature for the file
+format you want to use in the _Cargo.toml_ file:
+
+```toml
+[dependencies]
+leptos-fluent = { version = "*", features = ["json5"] }
+```
+
+Available features for languages file formats are:
+
+- `json`: JSON
+- `yaml`: YAML
+- `json5`: JSON5
+
+### Languages file layout
+
 The languages file must expose an array of arrays with the structure:
 
 ```json5
@@ -81,9 +99,9 @@ will be the same as in the file regardless of the alphabetical order
 of the names.
 ```
 
-The first in the languages file will used as the initial of the user when any
-other initialization value is discovered. Use the same as the one configured
-as `fallback_language` in `static_loader!`.
+The first one in the languages file will used as the initial of the user when
+no other initialization language is discovered. Use the same as the one
+configured as `fallback_language` in `static_loader!`.
 
 ```rust
 static_loader! {
@@ -110,22 +128,5 @@ pub fn App() -> impl IntoView {
 ]
 ```
 
-### File format
-
-By default, the `json` feature is enabled, which only allows to set the
-languages file in JSON format. To use other formats, disable the feature
-and enable another.
-
-```toml
-[dependencies]
-leptos-fluent = { version = "*", default-features = false, features = ["json5"] }
-```
-
-Available features for languages file formats are:
-
-- `json`: JSON (default)
-- `yaml`: YAML
-- `json5`: JSON5
-
 [ISO 639-1 code]: https://en.wikipedia.org/wiki/ISO_639-1
 [`leptos_fluent!`]: https://mondeja.github.io/leptos-fluent/leptos_fluent.html
diff --git a/book/src/leptos_fluent.md b/book/src/leptos_fluent.md
@@ -179,6 +179,11 @@ leptos_fluent! {{
 Path to a file containing the list of languages supported by the application.
 Must be relative to the _Cargo.toml_ file.
 
+```admonish tip
+In order to use this parameter a languages file feature must be enabled.
+See [**4. Languages**](https://mondeja.github.io/leptos-fluent/languages.html)
+```
+
 ```rust
 leptos_fluent! {{
     locales: "./locales",
@@ -188,56 +193,6 @@ leptos_fluent! {{
 }}
 ```
 
-```admonish tip
-See [**4. Languages**](https://mondeja.github.io/leptos-fluent/languages.html)
-```
-
-The languages file should contain an array of arrays where each inner array
-contains a language identifier and a language name, respectively, at least.
-
-The language identifier should be a valid language tag, such as `en-US`, `en`,
-`es-ES`, etc. By default, the languages file should be a JSON with a `.json`
-extension because the `json` feature is enabled. For example:
-
-```json
-[
-  ["en-US", "English (United States)"],
-  ["es-ES", "Español (España)"]
-]
-```
-
-Set `default-features = false` and enable the `yaml` or the `json5` feature
-to use a YAML or JSON5 files. For example:
-
-```yaml
-# locales/languages.yaml
-- - en-US
-  - English (United States)
-- - es-ES
-  - Español (España)
-```
-
-```json5
-// locales/languages.json5
-[
-  ["en-US", "English (United States)"],
-  ["es-ES", "Español (España)"],
-]
-```
-
-Define a third element in the inner array with the direction of the language,
-to use it in the [`<html dir="...">` attribute] (see [`sync_html_tag_dir`]).
-For example:
-
-```json
-[
-  ["en-US", "English (United States)", "ltr"],
-  ["es-ES", "Español (España)", "auto"],
-  ["ar", "العربية", "rtl"],
-  ["it", "Italiano"]
-]
-```
-
 ### `check_translations`
 
 Check the translations at compile time. It is useful to ensure that all
@@ -871,6 +826,5 @@ leptos_fluent! {{
 [glob]: https://docs.rs/globwalk/latest/globwalk/fn.glob.html
 [URL parameter]: https://developer.mozilla.org/docs/Web/API/URLSearchParams
 [URL path]: https://developer.mozilla.org/docs/Web/API/URL/pathname
-[`sync_html_tag_dir`]: #csr---sync_html_tag_dir
 [cookie]: https://developer.mozilla.org/docs/Web/HTTP/Cookies
 [Server function]: https://book.leptos.dev/server/25_server_functions.html
diff --git a/examples/csr-complete/Cargo.toml b/examples/csr-complete/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/lib.rs"
 
 [dependencies]
 leptos = { version = "0.6", features = ["csr"] }
-leptos-fluent = { path = "../../leptos-fluent" }
+leptos-fluent = { path = "../../leptos-fluent", features = ["json"] }
 fluent-templates = { version = "0.10", default-features = false, features = [
   "macros",
   "walkdir"

diff --git a/examples/csr-minimal/Cargo.toml b/examples/csr-minimal/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/lib.rs"
 
 [dependencies]
 leptos = { version = "0.6", features = ["csr"] }
-leptos-fluent = { path = "../../leptos-fluent", default-features = false }
+leptos-fluent = { path = "../../leptos-fluent" }
 fluent-templates = { version = "0.10", default-features = false, features = [
   "macros",
   "walkdir"

diff --git a/examples/ssr-hydrate-axum/Cargo.toml b/examples/ssr-hydrate-axum/Cargo.toml
@@ -19,9 +19,7 @@ leptos = "0.6"
 leptos_meta = "0.6"
 leptos_axum = { version = "0.6", optional = true }
 leptos_router = "0.6"
-leptos-fluent = { path = "../../leptos-fluent", features = [
-  "yaml"
-], default-features = false }
+leptos-fluent = { path = "../../leptos-fluent", features = ["yaml"] }
 fluent-templates = { version = "0.10", default-features = false, features = [
   "macros",
   "walkdir"

diff --git a/examples/system-gtk/Cargo.toml b/examples/system-gtk/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 leptos = { version = "0.6", features = ["csr"] }
 gtk = { version = "0.9", package = "gtk4" }
-leptos-fluent = { path = "../../leptos-fluent", default-features = false, features = [
+leptos-fluent = { path = "../../leptos-fluent", features = [
   "system",
   "tracing"
 ] }

diff --git a/leptos-fluent-macros/tests/ui/leptos_fluent/pass/compile_time_exprpath_target_predicate.rs b/leptos-fluent-macros/tests/ui/leptos_fluent/pass/compile_time_exprpath_target_predicate.rs
@@ -15,7 +15,7 @@ pub fn App() -> impl IntoView {
         translations: [TRANSLATIONS],
         locales: "../../../../examples/csr-minimal/locales",
         #[cfg(all(not(target_os = "windows"), not(target_os = "macos")))]
-        languages: "../../../../examples/csr-complete/locales/languages.json",
+        cookie_name: "foo"
     }};
 
     view! { <p>Foo</p> }

diff --git a/leptos-fluent/Cargo.toml b/leptos-fluent/Cargo.toml
@@ -30,7 +30,7 @@ directories = { version = "5", optional = true }
 tracing = { version = "0.1", optional = true }
 
 [features]
-default = ["json"]
+default = []
 system = [
   "dep:current_locale",
   "dep:directories",

diff --git a/leptos-fluent/README.md b/leptos-fluent/README.md
diff --git a/leptos-fluent/src/lib.rs b/leptos-fluent/src/lib.rs
@@ -241,7 +241,7 @@
 //! - **Axum integration**: `axum`
 //! - **Nightly toolchain**: `nightly`
 //! - **Desktop applications**: `system`
-//! - **JSON languages file**: `json` (enabled by default)
+//! - **JSON languages file**: `json`
 //! - **YAML languages file**: `yaml`
 //! - **JSON5 languages file**: `json5`
 //! - **Tracing support**: `tracing`
@@ -819,7 +819,7 @@
 #[component(transparent)]
 #[cfg(feature = "ssr")]
 #[cfg_attr(feature = "tracing", tracing::instrument(level = "trace"))]
 pub fn SsrHtmlTag() -> impl IntoView {
    let lang = expect_i18n().language.get_untracked();
    view! { <Html lang=lang.id.to_string() dir=lang.dir.as_str()/> }
 }
@@ -846,7 +846,7 @@
 #[component(transparent)]
 #[cfg(not(feature = "ssr"))]
 #[cfg_attr(feature = "tracing", tracing::instrument(level = "trace"))]
 pub fn SsrHtmlTag() -> impl IntoView {}

 /// Parameters passed to `leptos_fluent!` macro at creation of `i18n` context
 #[derive(Clone, Debug)]