chore(deps): Update jsonschema to 0.28 (#12089)

tauri-apps · Jan 2, 2025 · d7f48cb · d7f48cb
1 parent a16796a
commit d7f48cb
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/tauri-cli/Cargo.toml b/crates/tauri-cli/Cargo.toml
@@ -70,7 +70,7 @@ tauri-utils-v1 = { version = "1", package = "tauri-utils", features = [
   "config-toml",
 ] }
 toml = "0.8"
-jsonschema = "0.18"
+jsonschema = "0.28"
 handlebars = "6"
 include_dir = "0.7"
 minisign = "=0.7.3"

diff --git a/crates/tauri-cli/src/helpers/config.rs b/crates/tauri-cli/src/helpers/config.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
+use itertools::Itertools;
 use json_patch::merge;
 use serde_json::Value as JsonValue;
 
@@ -172,11 +173,11 @@ fn get_internal(
     || config_path.extension() == Some(OsStr::new("json5"))
   {
     let schema: JsonValue = serde_json::from_str(include_str!("../../config.schema.json"))?;
-    let schema = jsonschema::JSONSchema::compile(&schema).unwrap();
-    let result = schema.validate(&config);
-    if let Err(errors) = result {
+    let validator = jsonschema::validator_for(&schema).expect("Invalid schema");
+    let mut errors = validator.iter_errors(&config).peekable();
+    if errors.peek().is_some() {
       for error in errors {
-        let path = error.instance_path.clone().into_vec().join(" > ");
+        let path = error.instance_path.into_iter().join(" > ");
         if path.is_empty() {
           log::error!("`{}` error: {}", config_file_name, error);
         } else {