Merge branch 'main' into main

biomejs · May 26, 2024 · d72c3e3 · d72c3e3
2 parents e4ac1c1 + fec262f
commit d72c3e3
Show file tree

Hide file tree

Showing 28 changed files with 1,722 additions and 371 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -228,6 +228,7 @@ our [guidelines for writing a good changelog entry](https://github.com/biomejs/b
 
 #### New features
 
+- Add [nursery/useErrorMessage](https://biomejs.dev/linter/rules/use_error_message/). Contributed by @minht11
 - Add [nursery/useThrowOnlyError](https://biomejs.dev/linter/rules/use_throw_only_error/). Contributed by @minht11
 - Add [nursery/useImportExtensions](https://biomejs.dev/linter/rules/use-import-extensions/). Contributed by @minht11
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -98,8 +98,8 @@ biome_css_factory            = { version = "0.5.7", path = "./crates/biome_css_f
 biome_css_formatter          = { version = "0.5.7", path = "./crates/biome_css_formatter" }
 biome_css_parser             = { version = "0.5.7", path = "./crates/biome_css_parser" }
 biome_css_syntax             = { version = "0.5.7", path = "./crates/biome_css_syntax" }
-biome_deserialize            = { version = "0.5.7", path = "./crates/biome_deserialize" }
-biome_deserialize_macros     = { version = "0.5.7", path = "./crates/biome_deserialize_macros" }
+biome_deserialize            = { version = "0.6.0", path = "./crates/biome_deserialize" }
+biome_deserialize_macros     = { version = "0.6.0", path = "./crates/biome_deserialize_macros" }
 biome_diagnostics            = { version = "0.5.7", path = "./crates/biome_diagnostics" }
 biome_diagnostics_categories = { version = "0.5.7", path = "./crates/biome_diagnostics_categories" }
 biome_diagnostics_macros     = { version = "0.5.7", path = "./crates/biome_diagnostics_macros" }

diff --git a/crates/biome_cli/Cargo.toml b/crates/biome_cli/Cargo.toml
@@ -44,6 +44,7 @@ hdrhistogram             = { version = "7.5.4", default-features = false }
 indexmap                 = { workspace = true }
 lazy_static              = { workspace = true }
 rayon                    = { workspace = true }
+regex                    = { workspace = true }
 rustc-hash               = { workspace = true }
 serde                    = { workspace = true, features = ["derive"] }
 serde_json               = { workspace = true }

diff --git a/crates/biome_cli/src/execute/migrate/eslint_any_rule_to_biome.rs b/crates/biome_cli/src/execute/migrate/eslint_any_rule_to_biome.rs
diff --git a/crates/biome_cli/src/execute/migrate/eslint_to_biome.rs b/crates/biome_cli/src/execute/migrate/eslint_to_biome.rs
@@ -255,7 +255,7 @@ fn migrate_eslint_rule(
         eslint_eslint::Rule::TypeScriptNamingConvention(conf) => {
             if migrate_eslint_any_rule(rules, &name, conf.severity(), opts, results) {
                 let severity = conf.severity();
-                let options = eslint_typescript::NamingConventionOptions::override_default(
+                let options = eslint_typescript::NamingConventionOptions::new(
                     conf.into_vec().into_iter().map(|v| *v),
                 );
                 let group = rules.style.get_or_insert_with(Default::default);