Skip to content

Commit

Permalink
Merge branch 'main' into feat/jest-prefer-comparison-matcher
Browse files Browse the repository at this point in the history
  • Loading branch information
@eryue0220
eryue0220 authored Mar 27, 2024
2 parents 4149882 + 8c6936a commit c01e70b
Show file tree
Hide file tree
Showing 46 changed files with 1,472 additions and 871 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## [Unreleased]
46 changes: 18 additions & 28 deletions Cargo.lock
View file

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

129 changes: 77 additions & 52 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,59 +85,84 @@ oxc_linter = { path = "crates/oxc_linter" }
oxc_prettier = { path = "crates/oxc_prettier" }
oxc_tasks_common = { path = "tasks/common" }

napi = { version = "2" }
napi-derive = { version = "2" }
napi = "2"
napi-derive = "2"

assert-unchecked = { version = "0.1.2" }
bpaf = { version = "0.9.11" }
bitflags = { version = "2.5.0" }
bumpalo = { version = "3.15.4" }
convert_case = { version = "0.6.0" }
dashmap = { version = "5.5.3" }
flate2 = { version = "1.0.28" }
futures = { version = "0.3.30" }
glob = { version = "0.3.1" }
ignore = { version = "0.4.22" }
itertools = { version = "0.12.1" }
jemallocator = { version = "0.5.4" }
lazy_static = { version = "1.4.0" }
miette = { version = "7.2.0", features = ["fancy-no-syscall"] }
mimalloc = { version = "0.1.39" }
num-bigint = { version = "0.4.4" }
num-traits = { version = "0.2.18" }
phf = { version = "0.11" }
pico-args = { version = "0.5.0" }
proc-macro2 = { version = "1.0.79" }
project-root = { version = "0.2.2" }
quote = { version = "1.0.35" }
rayon = { version = "1.10.0" }
regex = { version = "1.10.4" }
rustc-hash = { version = "1.1.0", default-features = false, features = ["std"] }
ryu-js = { version = "1.0.1" }
ropey = { version = "1.6.1" }
seq-macro = { version = "0.3.5" }
serde = { version = "1.0.197" }
serde_json = { version = "1.0.114" }
syn = { version = "=1.0.109" }
tempfile = { version = "3.10.1" }
thiserror = { version = "1.0.58" }
tokio = { version = "1" }
tower-lsp = { version = "0.20.0", features = ["proposed"] }
unicode-id-start = { version = "1.1.2" }
ureq = { version = "2.9.6", default-features = false, features = ["tls", "json"] }
url = { version = "2.5.0" }
walkdir = { version = "2.5.0" }
indexmap = { version = "2.2.6" }
index_vec = { version = "0.1.3" }
static_assertions = { version = "1.1.0" }
tracing-subscriber = { version = "0.3" }
insta = { version = "1.36.1", features = ["glob"] }
mime_guess = { version = "2.0.4" }
language-tags = { version = "0.3.2" }
tsify = { version = "0.4.5" }
wasm-bindgen = { version = "0.2" }
serde-wasm-bindgen = { version = "0.6.5" }
handlebars = { version = "5.1.2" }
assert-unchecked = "0.1.2"
bpaf = "0.9.11"
bitflags = "2.5.0"
bumpalo = "3.15.4"
convert_case = "0.6.0"
dashmap = "5.5.3"
flate2 = "1.0.28"
futures = "0.3.30"
glob = "0.3.1"
ignore = "0.4.22"
itertools = "0.12.1"
jemallocator = "0.5.4"
lazy_static = "1.4.0"
miette = { version = "7.2.0", features = ["fancy-no-syscall"] }
mimalloc = "0.1.39"
num-bigint = "0.4.4"
num-traits = "0.2.18"
phf = "0.11"
pico-args = "0.5.0"
proc-macro2 = "1.0.79"
project-root = "0.2.2"
quote = "1.0.35"
rayon = "1.10.0"
regex = "1.10.4"
rustc-hash = "1.1.0"
ryu-js = "1.0.1"
ropey = "1.6.1"
seq-macro = "0.3.5"
serde = "1.0.197"
serde_json = "1.0.115"
syn = "=1.0.109"
tempfile = "3.10.1"
thiserror = "1.0.58"
tokio = "1"
tower-lsp = "0.20.0"
unicode-id-start = "1.1.2"
ureq = { version = "2.9.6", default-features = false }
url = "2.5.0"
walkdir = "2.5.0"
indexmap = "2.2.6"
index_vec = "0.1.3"
static_assertions = "1.1.0"
tracing-subscriber = "0.3"
insta = "1.37.0"
mime_guess = "2.0.4"
language-tags = "0.3.2"
tsify = "0.4.5"
wasm-bindgen = "0.2"
serde-wasm-bindgen = "0.6.5"
handlebars = "5.1.2"
base64 = "0.22.0"
brotlic = "0.8.2"
compact_str = "0.7.1"
console = "0.15.8"
encoding_rs = "0.8.33"
encoding_rs_io = "0.1.7"
env_logger = { version = "0.11.3", default-features = false }
flexbuffers = "2.0.0"
globset = "0.4.14"
humansize = "2.1.3"
json-strip-comments = "1.0.2"
log = "0.4.21"
memchr = "2.7.1"
napi-build = "2"
once_cell = "1.19.0"
ouroboros = "0.18.3"
owo-colors = "4.0.0"
oxc_resolver = "1.6.3"
petgraph = "0.6.4"
rust-lapper = "1.1.0"
serde_yaml = "0.9.34"
similar = "2.4.0"
sourcemap = "8.0.0"
textwrap = "0.16.0"
unicode-width = "0.1.11"

[profile.dev]
debug = 1 # "limited" debug, speed up compilation; debug info without type or variable-level information.
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_codegen/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ oxc_ast = { workspace = true }
oxc_span = { workspace = true }
oxc_allocator = { workspace = true }
oxc_syntax = { workspace = true }
sourcemap = { version = "8.0.0" }
sourcemap = { workspace = true }
bitflags = { workspace = true }
rustc-hash = { workspace = true }

[dev-dependencies]
oxc_parser = { workspace = true }
base64 = "0.22.0"
base64 = { workspace = true }
6 changes: 3 additions & 3 deletions crates/oxc_diagnostics/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ doctest = false
thiserror = { workspace = true }
miette = { workspace = true }

unicode-width = "0.1.11"
owo-colors = { version = "4.0.0" }
textwrap = { version = "0.16.0" }
unicode-width = { workspace = true }
owo-colors = { workspace = true }
textwrap = { workspace = true }
6 changes: 3 additions & 3 deletions crates/oxc_language_server/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ tokio = { workspace = true, features = ["full"] }
tower-lsp = { workspace = true, features = ["proposed"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
log = "0.4.21"
globset = "0.4.14"
env_logger = { version = "0.11.3", default-features = false, features = ["humantime"] }
log = { workspace = true }
globset = { workspace = true }
env_logger = { workspace = true, features = ["humantime"] }
13 changes: 5 additions & 8 deletions crates/oxc_linter/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ oxc_semantic = { workspace = true }
oxc_syntax = { workspace = true }
oxc_codegen = { workspace = true }
oxc_index = { workspace = true }
oxc_resolver = { version = "1.6.3" }
oxc_resolver = { workspace = true }

rayon = { workspace = true }
lazy_static = { workspace = true } # used in oxc_macros
Expand All @@ -45,13 +45,10 @@ language-tags = { workspace = true }
mime_guess = { workspace = true }
url = { workspace = true }

rust-lapper = "1.1.0"
once_cell = "1.19.0"
memchr = "2.7.1"
json-strip-comments = "1.0.2"
rust-lapper = { workspace = true }
once_cell = { workspace = true }
memchr = { workspace = true }
json-strip-comments = { workspace = true }

[dev-dependencies]
insta = { workspace = true }

[package.metadata.cargo-machete]
ignored = ["once_cell"]
2 changes: 2 additions & 0 deletions crates/oxc_linter/src/rules.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ mod jest {
pub mod no_standalone_expect;
pub mod no_test_prefixes;
pub mod no_test_return_statement;
pub mod no_untyped_mock_factory;
pub mod prefer_called_with;
pub mod prefer_comparison_matcher;
pub mod prefer_equality_matcher;
Expand Down Expand Up @@ -485,6 +486,7 @@ oxc_macros::declare_all_lint_rules! {
jest::no_standalone_expect,
jest::no_test_prefixes,
jest::no_test_return_statement,
jest::no_untyped_mock_factory,
jest::prefer_called_with,
jest::prefer_comparison_matcher,
jest::prefer_equality_matcher,
Expand Down
Loading

0 comments on commit c01e70b

Please sign in to comment.