Skip to content

Commit

Permalink
chore(deps): update rust crate rustc-hash to v2 (#186)
Browse files Browse the repository at this point in the history
* 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 <boshenc@gmail.com>
  • Loading branch information
renovate[bot] and Boshen authored Jun 24, 2024
1 parent fd23658 commit f953388
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 30 deletions.
25 changes: 3 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,18 @@ missing_const_for_fn = "allow"
name = "resolver"

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

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

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ use std::{

use rustc_hash::FxHashSet;
use serde_json::Value as JSONValue;
use typescript_tsconfig_json::ExtendsField;

pub use crate::{
builtins::NODEJS_BUILTINS,
Expand All @@ -91,6 +90,7 @@ use crate::{
package_json::JSONMap,
path::{PathUtil, SLASH_START},
specifier::Specifier,
tsconfig::ExtendsField,
tsconfig::{ProjectReference, TsConfig},
};

Expand Down
13 changes: 12 additions & 1 deletion src/tsconfig.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
use std::{
hash::BuildHasherDefault,
path::{Path, PathBuf},
sync::Arc,
};

use indexmap::IndexMap;
use rustc_hash::FxHasher;
use serde::Deserialize;
use typescript_tsconfig_json::{CompilerOptionsPathsMap, ExtendsField};

use crate::PathUtil;

pub type CompilerOptionsPathsMap = IndexMap<String, Vec<String>, BuildHasherDefault<FxHasher>>;

#[derive(Debug, Clone, Eq, PartialEq, Deserialize)]
#[serde(untagged)]
pub enum ExtendsField {
Single(String),
Multiple(Vec<String>),
}

#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct TsConfig {
Expand Down

0 comments on commit f953388

Please sign in to comment.