Skip to content

Commit f953388

Browse files
chore(deps): update rust crate rustc-hash to v2 (#186)
* chore(deps): update rust crate rustc-hash to v2 * u * wip --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Boshen <[email protected]>
1 parent fd23658 commit f953388

File tree

4 files changed

+22
-30
lines changed

4 files changed

+22
-30
lines changed

Cargo.lock

Lines changed: 3 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@ missing_const_for_fn = "allow"
7373
name = "resolver"
7474

7575
[dependencies]
76-
tracing = { version = "0.1.40" }
77-
dashmap = { version = "5.5.3" }
76+
tracing = "0.1.40"
77+
dashmap = "5.5.3"
7878
serde = { version = "1.0.203", features = ["derive"] } # derive for Deserialize from package.json
7979
serde_json = { version = "1.0.117", features = [
8080
"preserve_order",
8181
] } # preserve_order: package_json.exports requires order such as `["require", "import", "default"]`
82-
rustc-hash = { version = "1.1.0", default-features = false, features = ["std"] }
82+
rustc-hash = { version = "2.0.0", default-features = false, features = ["std"] }
8383
dunce = "1.0.4" # Normalize Windows paths to the most compatible format, avoiding UNC where possible
8484
once_cell = "1.19.0" # Use `std::sync::OnceLock::get_or_try_init` when it is stable.
85-
thiserror = { version = "1.0.61" }
86-
json-strip-comments = { version = "1.0.2" }
87-
typescript_tsconfig_json = { version = "0.1.4" }
85+
thiserror = "1.0.61"
86+
json-strip-comments = "1.0.2"
87+
indexmap = { version = "2.2.6", features = ["serde"] }
8888

8989
document-features = { version = "0.2.8", optional = true }
9090

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ use std::{
7171

7272
use rustc_hash::FxHashSet;
7373
use serde_json::Value as JSONValue;
74-
use typescript_tsconfig_json::ExtendsField;
7574

7675
pub use crate::{
7776
builtins::NODEJS_BUILTINS,
@@ -91,6 +90,7 @@ use crate::{
9190
package_json::JSONMap,
9291
path::{PathUtil, SLASH_START},
9392
specifier::Specifier,
93+
tsconfig::ExtendsField,
9494
tsconfig::{ProjectReference, TsConfig},
9595
};
9696

src/tsconfig.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
use std::{
2+
hash::BuildHasherDefault,
23
path::{Path, PathBuf},
34
sync::Arc,
45
};
56

7+
use indexmap::IndexMap;
8+
use rustc_hash::FxHasher;
69
use serde::Deserialize;
7-
use typescript_tsconfig_json::{CompilerOptionsPathsMap, ExtendsField};
810

911
use crate::PathUtil;
1012

13+
pub type CompilerOptionsPathsMap = IndexMap<String, Vec<String>, BuildHasherDefault<FxHasher>>;
14+
15+
#[derive(Debug, Clone, Eq, PartialEq, Deserialize)]
16+
#[serde(untagged)]
17+
pub enum ExtendsField {
18+
Single(String),
19+
Multiple(Vec<String>),
20+
}
21+
1122
#[derive(Debug, Deserialize)]
1223
#[serde(rename_all = "camelCase")]
1324
pub struct TsConfig {

0 commit comments

Comments
 (0)