Skip to content

Commit

Permalink
Merge branch 'main' into fix/6078
Browse files Browse the repository at this point in the history
  • Loading branch information
JSerFeng authored Jun 4, 2024
2 parents 18634e1 + 4d58d3c commit c3a0a64
Show file tree
Hide file tree
Showing 1,334 changed files with 16,279 additions and 10,736 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ See [documentation](./website/README.md).

## Getting help

If you have any questions, please do not hesitate to ask in either the [Discord][discord] support channel or on the [Github discussion board][github-discussion].
If you have any questions, please do not hesitate to ask in either the [Discord][discord] support channel or on the [GitHub discussion board][github-discussion].

[discord]: https://discord.gg/79ZZ66GH9E
[github-discussion]: https://github.com/web-infra-dev/rspack/discussions
73 changes: 43 additions & 30 deletions Cargo.lock

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

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ async-scoped = { version = "0.9.0" }
async-trait = { version = "0.1.79" }
bitflags = { version = "2.5.0" }
concat-string = "1.0.1"
css-module-lexer = "0.0.11"
dashmap = { version = "5.5.3" }
derivative = { version = "2.2.0" }
futures = { version = "0.3.30" }
Expand Down Expand Up @@ -56,8 +57,8 @@ tikv-jemallocator = { version = "=0.5.4", features = ["disable_initial_exec_tls"
rkyv = { version = "=0.7.44" } # synced with swc wasm plugin
styled_components = { version = "=0.96.15" }
swc_config = { version = "=0.1.13" }
swc_core = { version = "0.92.0", default-features = false }
swc_ecma_minifier = { version = "0.194.0", default-features = false }
swc_core = { version = "0.92.6", default-features = false }
swc_ecma_minifier = { version = "0.194.6", default-features = false }
swc_emotion = { version = "=0.72.13" }
swc_error_reporters = { version = "=0.17.20" }
swc_html = { version = "=0.139.0" }
Expand Down
1 change: 0 additions & 1 deletion crates/node_binding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ rspack_hook = { path = "../rspack_hook" }
rspack_identifier = { path = "../rspack_identifier" }
rspack_napi = { path = "../rspack_napi" }
rspack_tracing = { path = "../rspack_tracing" }
rspack_regex = { path = "../rspack_regex" }
tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }

async-trait = { workspace = true }
Expand Down
Loading

0 comments on commit c3a0a64

Please sign in to comment.