From 7dee40cf41620df7c96c5b1de07eef4a2923356d Mon Sep 17 00:00:00 2001 From: hardfist Date: Wed, 7 Aug 2024 14:32:33 +0800 Subject: [PATCH 01/13] chore: add rspack dep --- Cargo.toml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 76a8a318af40bb..ddc0a1d561fc35 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -217,6 +217,18 @@ winapi = "=0.3.9" windows-sys = { version = "0.52.0", features = ["Win32_Foundation", "Win32_Media", "Win32_Storage_FileSystem", "Win32_System_IO", "Win32_System_WindowsProgramming", "Wdk", "Wdk_System", "Wdk_System_SystemInformation", "Win32_System_Pipes", "Wdk_Storage_FileSystem", "Win32_System_Registry"] } winres = "=0.1.12" +# rspack deps +rspack_plugin_schemes= { git = "https://github.com/web-infra-dev/rspack", branch = "main"} +rspack_ids= { git = "https://github.com/web-infra-dev/rspack", branch = "main"} +rspack_binding_options= { git = "https://github.com/web-infra-dev/rspack", branch = "main"} +rspack_hook= { git = "https://github.com/web-infra-dev/rspack", branch = "main", package = "rspack_hook"} +rspack_plugin_javascript= { git = "https://github.com/web-infra-dev/rspack", branch = "main", package = "rspack_plugin_javascript"} +rspack_error = { git = "https://github.com/web-infra-dev/rspack", branch = "main", package = "rspack_error"} +rspack_core = { git = "https://github.com/web-infra-dev/rspack", branch = "main"} +rspack_plugin_entry = { git = "https://github.com/web-infra-dev/rspack", branch = "main", package = "rspack_plugin_entry" } +rspack_fs = { git = "https://github.com/web-infra-dev/rspack", branch = "main", package = "rspack_fs" } + + # NB: the `bench` and `release` profiles must remain EXACTLY the same. [profile.release] codegen-units = 1 From f243d2cb1e5699a32f9e0fc3d5e5d53794d0788b Mon Sep 17 00:00:00 2001 From: hardfist Date: Wed, 7 Aug 2024 14:36:07 +0800 Subject: [PATCH 02/13] chore: use rspack_core in cli --- cli/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 510c10ea9c4b70..8f040f241f8cd5 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -159,6 +159,8 @@ which.workspace = true zeromq.workspace = true zstd.workspace = true +rspack_core = { workspace = true } + [target.'cfg(windows)'.dependencies] junction.workspace = true winapi = { workspace = true, features = ["knownfolders", "mswsock", "objbase", "shlobj", "tlhelp32", "winbase", "winerror", "winsock2"] } From 8f102750235e06cd15becb699e3e710137215f28 Mon Sep 17 00:00:00 2001 From: hardfist Date: Fri, 9 Aug 2024 17:53:00 +0800 Subject: [PATCH 03/13] chore: update dep --- Cargo.lock | 1190 +++++++++++++++++++++++++++++++++++++++++-- Cargo.toml | 22 +- rust-toolchain.toml | 2 +- 3 files changed, 1148 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b2172060046d0..23f6462a386741 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -203,6 +203,15 @@ name = "anyhow" version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +dependencies = [ + "backtrace", +] + +[[package]] +name = "anymap" +version = "1.0.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72" [[package]] name = "arrayvec" @@ -287,6 +296,28 @@ dependencies = [ "tokio", ] +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "async-scoped" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4042078ea593edffc452eef14e99fdb2b120caa4ad9618bcdeabc4a023b98740" +dependencies = [ + "futures", + "pin-project", + "tokio", +] + [[package]] name = "async-stream" version = "0.3.5" @@ -365,6 +396,15 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "backtrace-ext" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" +dependencies = [ + "backtrace", +] + [[package]] name = "base16ct" version = "0.2.0" @@ -447,7 +487,7 @@ dependencies = [ "bitflags 2.5.0", "cexpr", "clang-sys", - "itertools", + "itertools 0.10.5", "lazy_static", "lazycell", "log", @@ -455,7 +495,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.72", "which 4.4.2", @@ -600,6 +640,38 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bf2a5fb3207c12b5d208ebc145f967fea5cac41a021c37417ccc31ba40f39ee" +[[package]] +name = "camino" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.14", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "cbc" version = "0.1.2" @@ -832,6 +904,12 @@ dependencies = [ "unicode_categories", ] +[[package]] +name = "concat-string" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7439becb5fafc780b6f4de382b1a7a3e70234afe783854a4702ee8adbb838609" + [[package]] name = "console_static_text" version = "0.8.1" @@ -1086,11 +1164,25 @@ dependencies = [ "parking_lot_core 0.9.9", ] +[[package]] +name = "dashmap" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +] + [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "data-url" @@ -1130,7 +1222,7 @@ dependencies = [ "clap_complete_fig", "color-print", "console_static_text", - "dashmap", + "dashmap 5.5.3", "data-encoding", "deno_ast", "deno_bench_util", @@ -1194,6 +1286,7 @@ dependencies = [ "rand", "regex", "ring", + "rspack_core", "runtimelib", "rustyline", "rustyline-derive", @@ -1600,7 +1693,7 @@ dependencies = [ "hyper 0.14.28", "hyper 1.4.1", "hyper-util", - "itertools", + "itertools 0.10.5", "memmem", "mime", "once_cell", @@ -1795,7 +1888,7 @@ dependencies = [ "p224", "p256", "p384", - "path-clean", + "path-clean 0.1.0", "pbkdf2", "pin-project-lite", "rand", @@ -2215,6 +2308,17 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive_builder" version = "0.12.0" @@ -2265,6 +2369,16 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" +[[package]] +name = "diatomic-waker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92a510eb4dc7fa435297888c00e0f999aa2ee3e920a357221c35ab615a80bbcf" +dependencies = [ + "loom", + "waker-fn", +] + [[package]] name = "diff" version = "0.1.13" @@ -2369,7 +2483,7 @@ dependencies = [ "bumpalo", "hashbrown", "indexmap", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "unicode-width", ] @@ -2437,7 +2551,7 @@ dependencies = [ "dprint-core", "dprint-core-macros", "percent-encoding", - "rustc-hash", + "rustc-hash 1.1.0", "serde", ] @@ -2450,7 +2564,7 @@ dependencies = [ "allocator-api2", "bumpalo", "num-bigint", - "rustc-hash", + "rustc-hash 1.1.0", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -2483,6 +2597,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "dunce" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" + [[package]] name = "dyn-clone" version = "1.0.17" @@ -2690,7 +2810,7 @@ dependencies = [ "deno_npm", "deno_semver", "futures", - "hashlink", + "hashlink 0.8.4", "indexmap", "serde", "serde_json", @@ -2744,6 +2864,15 @@ dependencies = [ "serde", ] +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + [[package]] name = "fastrand" version = "2.0.2" @@ -2999,6 +3128,17 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-buffered" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fa130f3777d0d4b0993653c20bc433026d3290627693c4ed1b18dd237357ab" +dependencies = [ + "diatomic-waker", + "futures-core", + "pin-project-lite", +] + [[package]] name = "futures-channel" version = "0.3.30" @@ -3009,6 +3149,21 @@ dependencies = [ "futures-sink", ] +[[package]] +name = "futures-concurrency" +version = "7.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b14ac911e85d57c5ea6eef76d7b4d4a3177ecd15f4bea2e61927e9e3823e19f" +dependencies = [ + "bitvec", + "futures-buffered", + "futures-core", + "futures-lite", + "pin-project", + "slab", + "smallvec", +] + [[package]] name = "futures-core" version = "0.3.30" @@ -3032,6 +3187,21 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + [[package]] name = "futures-macro" version = "0.3.30" @@ -3073,6 +3243,28 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -3148,8 +3340,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -3314,6 +3506,15 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown", +] + [[package]] name = "heck" version = "0.4.1" @@ -3392,7 +3593,7 @@ dependencies = [ "new_debug_unreachable", "once_cell", "phf 0.11.2", - "rustc-hash", + "rustc-hash 1.1.0", "triomphe", ] @@ -3602,6 +3803,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if_chain" version = "1.0.2" @@ -3660,9 +3871,16 @@ checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", + "rayon", "serde", ] +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + [[package]] name = "inotify" version = "0.9.6" @@ -3771,6 +3989,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "is_ci" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" + [[package]] name = "itertools" version = "0.10.5" @@ -3780,6 +4004,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -3810,6 +4043,21 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "json" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" + +[[package]] +name = "json-strip-comments" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b271732a960335e715b6b2ae66a086f115c74eb97360e996d2bd809bfc063bba" +dependencies = [ + "memchr", +] + [[package]] name = "jsonc-parser" version = "0.23.0" @@ -3927,6 +4175,15 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" +[[package]] +name = "lexical" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" +dependencies = [ + "lexical-core", +] + [[package]] name = "lexical-core" version = "0.8.5" @@ -4126,6 +4383,19 @@ dependencies = [ "serde", ] +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + [[package]] name = "lru-cache" version = "0.1.2" @@ -4189,6 +4459,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "md-5" version = "0.10.6" @@ -4262,12 +4541,79 @@ dependencies = [ "paste", ] +[[package]] +name = "miette" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" +dependencies = [ + "backtrace", + "backtrace-ext", + "is-terminal", + "miette-derive 5.10.0", + "once_cell", + "owo-colors 3.5.0", + "supports-color", + "supports-hyperlinks", + "supports-unicode", + "terminal_size", + "textwrap 0.15.2", + "thiserror", + "unicode-width", +] + +[[package]] +name = "miette" +version = "7.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" +dependencies = [ + "cfg-if", + "miette-derive 7.2.0", + "owo-colors 4.0.0", + "textwrap 0.16.1", + "thiserror", + "unicode-width", +] + +[[package]] +name = "miette-derive" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "miette-derive" +version = "7.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "mime" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -4322,7 +4668,7 @@ dependencies = [ "indexmap", "log", "num-traits", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "spirv", "termcolor", @@ -4425,7 +4771,7 @@ dependencies = [ "futures", "lazy-regex", "once_cell", - "path-clean", + "path-clean 0.1.0", "regex", "serde_json", "thiserror", @@ -4453,6 +4799,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "normpath" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a9da8c9922c35a1033d76f7272dfc2e7ee20392083d75aeea6ced23c6266578" +dependencies = [ + "winapi", +] + [[package]] name = "notify" version = "6.1.1" @@ -4482,7 +4837,17 @@ dependencies = [ ] [[package]] -name = "num-bigint" +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" @@ -4673,6 +5038,24 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "owo-colors" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" + [[package]] name = "p224" version = "0.13.2" @@ -4723,6 +5106,12 @@ dependencies = [ "sha2", ] +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" version = "0.11.2" @@ -4794,6 +5183,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" +[[package]] +name = "path-clean" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" + [[package]] name = "path-dedot" version = "3.1.1" @@ -5201,7 +5596,7 @@ checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck 0.4.1", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -5222,7 +5617,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -5316,7 +5711,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", + "rustc-hash 1.1.0", "rustls", "thiserror", "tokio", @@ -5332,7 +5727,7 @@ dependencies = [ "bytes", "rand", "ring", - "rustc-hash", + "rustc-hash 1.1.0", "rustls", "slab", "thiserror", @@ -5503,8 +5898,17 @@ checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", ] [[package]] @@ -5515,15 +5919,31 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.3", ] +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +[[package]] +name = "regress" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16fe0a24af5daaae947294213d2fd2646fbf5e1fbacc1d4ba3e84b2393854842" +dependencies = [ + "hashbrown", + "memchr", +] + [[package]] name = "relative-path" version = "1.9.2" @@ -5642,7 +6062,7 @@ dependencies = [ "countme", "hashbrown", "memoffset 0.9.1", - "rustc-hash", + "rustc-hash 1.1.0", "text-size", ] @@ -5666,6 +6086,247 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rspack_ast" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ae401e0fc8ef60b30c9187e212a18115d1a3a931828cb32e9d89be904de942b" +dependencies = [ + "anyhow", + "swc_core", + "swc_error_reporters", + "swc_node_comments", +] + +[[package]] +name = "rspack_collections" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685548b590a7597cbd8c4a75a8de65b8fc3e69ad405c3158fcded9833073b781" +dependencies = [ + "dashmap 5.5.3", + "hashlink 0.9.1", + "indexmap", + "rayon", + "serde", + "ustr-fxhash", +] + +[[package]] +name = "rspack_core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "264ea6067ed8ed3f97bc9f5597ade02437f2523a8a428decce459b5d8abf91c9" +dependencies = [ + "anymap", + "async-recursion", + "async-trait", + "bitflags 2.5.0", + "dashmap 5.5.3", + "derivative", + "dyn-clone", + "either", + "futures", + "hashlink 0.9.1", + "hex", + "indexmap", + "indoc", + "itertools 0.13.0", + "json", + "mime_guess", + "num-bigint", + "once_cell", + "paste", + "rayon", + "regex", + "rspack_ast", + "rspack_collections", + "rspack_error", + "rspack_fs", + "rspack_futures", + "rspack_hash", + "rspack_hook", + "rspack_loader_runner", + "rspack_macros", + "rspack_regex", + "rspack_resolver", + "rspack_sources", + "rspack_util", + "rustc-hash 1.1.0", + "serde", + "serde_json", + "sugar_path", + "swc_core", + "swc_node_comments", + "tokio", + "tracing", + "url", + "ustr-fxhash", +] + +[[package]] +name = "rspack_error" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26f6e5e272678ecf5a8d8c9a407e381b1d6373d60766ff3e925921bcf4c1ae2" +dependencies = [ + "anyhow", + "derivative", + "futures", + "miette 5.10.0", + "once_cell", + "owo-colors 3.5.0", + "rspack_collections", + "swc_core", + "termcolor", + "textwrap 0.15.2", + "thiserror", + "unicode-width", +] + +[[package]] +name = "rspack_fs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8709edd5245ee4e75a6f3605873daf388e55dca3a8d475c7c93f1e44926f0bd" +dependencies = [ + "futures", + "rspack_error", + "tokio", +] + +[[package]] +name = "rspack_futures" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b287aa487cd00ef2ef3d70876a300b2b0631837b614e72949a536a1e71f56ff" +dependencies = [ + "async-scoped", +] + +[[package]] +name = "rspack_hash" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddede74ee21f03d7e20cede0d502f1c95d91b163a2d041eccd1f9923d831e27d" +dependencies = [ + "data-encoding", + "md4", + "smol_str", + "xxhash-rust", +] + +[[package]] +name = "rspack_hook" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "519384c9a88ca87ac7b2979dd7babe8b794d919a9a9d9827509e1418473fc9d4" +dependencies = [ + "async-trait", + "futures-concurrency", + "rspack_error", + "rspack_macros", + "rustc-hash 1.1.0", +] + +[[package]] +name = "rspack_loader_runner" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99b215e4ca995cdd3d9fc23e56e6fa5c6a11e93d08c3532c26c897149365d22f" +dependencies = [ + "anymap", + "async-trait", + "derivative", + "once_cell", + "regex", + "rspack_collections", + "rspack_error", + "rspack_sources", + "rspack_util", + "rustc-hash 1.1.0", + "serde_json", + "tokio", +] + +[[package]] +name = "rspack_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6349db5190261972178f4794eda0a66eb10f035b989ac9da3615cea0a6689c32" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "rspack_regex" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48162a03ce5d42de1eeb0a0c793dbd6d272b273fa483ef9271e88fe9c92a294" +dependencies = [ + "regex-syntax 0.8.3", + "regress", + "rspack_error", + "swc_core", +] + +[[package]] +name = "rspack_resolver" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a14bc9c36836f093e38b4828f66216e5db939af66554da56fea1285d515b79" +dependencies = [ + "dashmap 6.0.1", + "dunce", + "indexmap", + "json-strip-comments", + "once_cell", + "rustc-hash 2.0.0", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "rspack_sources" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4026d5e6d97cee66c64a36df2f2bc6f1bc7d3445386d8156bbf7712afaefd6" +dependencies = [ + "dashmap 5.5.3", + "dyn-clone", + "memchr", + "rustc-hash 1.1.0", + "serde", + "serde_json", + "smallvec", + "str_indices", + "substring", +] + +[[package]] +name = "rspack_util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a01182a1cfb318b48dcc3fefa5c038952f3652db47a1607728ff61230b72ff5" +dependencies = [ + "bitflags 2.5.0", + "concat-string", + "dashmap 5.5.3", + "indexmap", + "regex", + "rspack_regex", + "rustc-hash 1.1.0", + "serde", + "serde_json", + "sugar_path", + "swc_core", + "unicase", +] + [[package]] name = "runtimelib" version = "0.14.0" @@ -5699,7 +6360,7 @@ dependencies = [ "bitflags 2.5.0", "fallible-iterator", "fallible-streaming-iterator", - "hashlink", + "hashlink 0.8.4", "libsqlite3-sys", "smallvec", ] @@ -5716,6 +6377,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.2.3" @@ -5986,6 +6653,9 @@ name = "semver" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +dependencies = [ + "serde", +] [[package]] name = "semver-parser" @@ -5995,9 +6665,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] @@ -6023,9 +6693,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", @@ -6034,12 +6704,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] @@ -6127,6 +6798,15 @@ dependencies = [ "keccak", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shell-escape" version = "0.1.5" @@ -6274,6 +6954,21 @@ dependencies = [ "version_check", ] +[[package]] +name = "smawk" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + [[package]] name = "socket2" version = "0.5.5" @@ -6295,7 +6990,7 @@ dependencies = [ "data-encoding", "debugid", "if_chain", - "rustc-hash", + "rustc-hash 1.1.0", "rustc_version 0.2.3", "serde", "serde_json", @@ -6359,6 +7054,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "str_indices" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9557cb6521e8d009c51a8666f09356f4b817ba9ba0981a305bd86aee47bd35c" + [[package]] name = "string_cache" version = "0.8.7" @@ -6434,12 +7135,55 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", +] + [[package]] name = "subtle" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +[[package]] +name = "sugar_path" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8230d5b8a65a6d4d4a7e5ee8dbdd9312ba447a8b8329689a390a0945d69b57ce" + +[[package]] +name = "supports-color" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" +dependencies = [ + "is-terminal", + "is_ci", +] + +[[package]] +name = "supports-hyperlinks" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" +dependencies = [ + "is-terminal", +] + +[[package]] +name = "supports-unicode" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f850c19edd184a205e883199a261ed44471c81e39bd95b1357f5febbef00e77a" +dependencies = [ + "is-terminal", +] + [[package]] name = "swc_allocator" version = "0.1.8" @@ -6449,7 +7193,7 @@ dependencies = [ "bumpalo", "hashbrown", "ptr_meta", - "rustc-hash", + "rustc-hash 1.1.0", "triomphe", ] @@ -6461,7 +7205,7 @@ checksum = "bb6567e4e67485b3e7662b486f1565bdae54bd5b9d6b16b2ba1a9babb1e42125" dependencies = [ "hstr", "once_cell", - "rustc-hash", + "rustc-hash 1.1.0", "serde", ] @@ -6503,7 +7247,7 @@ checksum = "83406221c501860fce9c27444f44125eafe9e598b8b81be7563d7036784cd05c" dependencies = [ "ahash", "anyhow", - "dashmap", + "dashmap 5.5.3", "once_cell", "regex", "serde", @@ -6523,7 +7267,8 @@ dependencies = [ "new_debug_unreachable", "num-bigint", "once_cell", - "rustc-hash", + "parking_lot 0.12.3", + "rustc-hash 1.1.0", "serde", "siphasher", "sourcemap", @@ -6531,6 +7276,7 @@ dependencies = [ "swc_atoms", "swc_eq_ignore_macros", "swc_visit", + "termcolor", "tracing", "unicode-width", "url", @@ -6562,6 +7308,149 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "swc_core" +version = "0.99.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9fb414e03336f9f4d238fb2463ccabe43b2cb22b7184b64a7ab21ac8845881f" +dependencies = [ + "swc_allocator", + "swc_atoms", + "swc_common", + "swc_css_ast", + "swc_css_codegen", + "swc_css_compat", + "swc_css_modules", + "swc_css_parser", + "swc_css_utils", + "swc_css_visit", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_parser", + "swc_ecma_quote_macros", + "swc_ecma_transforms_base", + "swc_ecma_transforms_module", + "swc_ecma_transforms_react", + "swc_ecma_utils", + "swc_ecma_visit", + "vergen", +] + +[[package]] +name = "swc_css_ast" +version = "0.143.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd74b0674c9ab8eebfaada987afc2c1da9bb83519851d253e6c55fe81a7b5d50" +dependencies = [ + "is-macro", + "string_enum", + "swc_atoms", + "swc_common", +] + +[[package]] +name = "swc_css_codegen" +version = "0.154.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8e731ef1e9f1399548fcaaf2bc5c154d16adc29546a2e7120d692ae4260487" +dependencies = [ + "auto_impl", + "bitflags 2.5.0", + "rustc-hash 1.1.0", + "serde", + "swc_atoms", + "swc_common", + "swc_css_ast", + "swc_css_codegen_macros", + "swc_css_utils", +] + +[[package]] +name = "swc_css_codegen_macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de2ece8c7dbdde85aa1bcc9764c5f41f7450d8bf1312eac2375b8dc0ecbc13d7" +dependencies = [ + "proc-macro2", + "quote", + "swc_macros_common", + "syn 2.0.72", +] + +[[package]] +name = "swc_css_compat" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d9f4440b5fbd45253926497f21a69510bb20d5422c24128667aa6c2031fefbc" +dependencies = [ + "bitflags 2.5.0", + "once_cell", + "serde", + "serde_json", + "swc_atoms", + "swc_common", + "swc_css_ast", + "swc_css_utils", + "swc_css_visit", +] + +[[package]] +name = "swc_css_modules" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d9a9eeb446f4985454c0742e44b4ab8fef4d935d96b11bbb277102a7167207" +dependencies = [ + "rustc-hash 1.1.0", + "serde", + "swc_atoms", + "swc_common", + "swc_css_ast", + "swc_css_codegen", + "swc_css_parser", + "swc_css_visit", +] + +[[package]] +name = "swc_css_parser" +version = "0.153.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98be1caea76ea9b38ddf9d9940f133aa491e9bc0c254745cfa7e685dbc2b28b" +dependencies = [ + "lexical", + "serde", + "swc_atoms", + "swc_common", + "swc_css_ast", +] + +[[package]] +name = "swc_css_utils" +version = "0.140.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47ab39714e7f531b892385aeb562e326f525efe738c3294d0d7f16c25fbca982" +dependencies = [ + "once_cell", + "serde", + "serde_json", + "swc_atoms", + "swc_common", + "swc_css_ast", + "swc_css_visit", +] + +[[package]] +name = "swc_css_visit" +version = "0.142.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80600a79fb14fe45ab7b92bb4baf2f34767942c732de19c3d691c2f51bd7a155" +dependencies = [ + "serde", + "swc_atoms", + "swc_common", + "swc_css_ast", + "swc_visit", +] + [[package]] name = "swc_ecma_ast" version = "0.117.4" @@ -6618,8 +7507,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a201c65ccbaa0c80fbcfd5c90dcc0bfc7ae62ac596f2233651ac715caf5d2c12" dependencies = [ "anyhow", + "dashmap 5.5.3", + "normpath", + "once_cell", + "path-clean 0.1.0", "pathdiff", "serde", + "serde_json", "swc_atoms", "swc_common", "tracing", @@ -6647,6 +7541,23 @@ dependencies = [ "typed-arena", ] +[[package]] +name = "swc_ecma_quote_macros" +version = "0.59.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a702f9dc87391fecedd3fe7f942b74122adb456d10658efdefcf251ec34fcc6" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_parser", + "swc_macros_common", + "syn 2.0.72", +] + [[package]] name = "swc_ecma_transforms_base" version = "0.143.3" @@ -6658,7 +7569,7 @@ dependencies = [ "indexmap", "once_cell", "phf 0.11.2", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "smallvec", "swc_atoms", @@ -6696,17 +7607,44 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "swc_ecma_transforms_module" +version = "0.186.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d55d9d19cb00dfb661d571fd5d8b18e75c6b3bb080968449e71f785ecced00" +dependencies = [ + "Inflector", + "anyhow", + "bitflags 2.5.0", + "indexmap", + "is-macro", + "path-clean 1.0.1", + "pathdiff", + "regex", + "serde", + "swc_atoms", + "swc_cached", + "swc_common", + "swc_ecma_ast", + "swc_ecma_loader", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_utils", + "swc_ecma_visit", + "tracing", +] + [[package]] name = "swc_ecma_transforms_optimization" version = "0.204.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7f9a903d6774d3f9005775badc25817296791ffed560f1b7e38aab62ca37ff" dependencies = [ - "dashmap", + "dashmap 5.5.3", "indexmap", "once_cell", "petgraph", - "rustc-hash", + "rustc-hash 1.1.0", "serde_json", "swc_atoms", "swc_common", @@ -6727,7 +7665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2d84d062b05ae89982a76ff47881a5e15bbd02e9b3c68dc14a3f5eacf48abca" dependencies = [ "either", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "smallvec", "swc_atoms", @@ -6747,7 +7685,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d411add563dd86d50b3db6e74e38def06587fa2fd370b430f71226688bfa6ded" dependencies = [ "base64 0.21.7", - "dashmap", + "dashmap 5.5.3", "indexmap", "once_cell", "serde", @@ -6791,7 +7729,7 @@ dependencies = [ "indexmap", "num_cpus", "once_cell", - "rustc-hash", + "rustc-hash 1.1.0", "ryu-js", "swc_atoms", "swc_common", @@ -6827,6 +7765,19 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "swc_error_reporters" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e02c81943772dc4fb0a6228360552d353fedc1a368ee6d80a5172ecb376b1796" +dependencies = [ + "anyhow", + "miette 7.2.0", + "once_cell", + "parking_lot 0.12.3", + "swc_common", +] + [[package]] name = "swc_fast_graph" version = "0.24.1" @@ -6835,7 +7786,7 @@ checksum = "f3f854cf8efc290aa927d31dab98b42011ff2341fecb2b27fdc817ef7b30ef3b" dependencies = [ "indexmap", "petgraph", - "rustc-hash", + "rustc-hash 1.1.0", "swc_common", ] @@ -6863,6 +7814,17 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "swc_node_comments" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6321ba0ee01751e16cf37fed1424c631faa3e362f95b2057f80b5c26adc1e4f" +dependencies = [ + "dashmap 5.5.3", + "swc_atoms", + "swc_common", +] + [[package]] name = "swc_visit" version = "0.6.1" @@ -6937,7 +7899,7 @@ dependencies = [ "fnv", "once_cell", "onig", - "regex-syntax", + "regex-syntax 0.8.3", "serde", "serde_derive", "serde_json", @@ -6969,7 +7931,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand", + "fastrand 2.0.2", "rustix", "windows-sys 0.52.0", ] @@ -6994,6 +7956,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "test_ffi" version = "0.1.0" @@ -7075,6 +8047,28 @@ dependencies = [ "serde", ] +[[package]] +name = "textwrap" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width", +] + +[[package]] +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width", +] + [[package]] name = "thiserror" version = "1.0.61" @@ -7344,7 +8338,7 @@ dependencies = [ "async-trait", "auto_impl", "bytes", - "dashmap", + "dashmap 5.5.3", "futures", "httparse", "lsp-types", @@ -7404,6 +8398,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -7614,6 +8638,12 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + [[package]] name = "unicode-normalization" version = "0.1.23" @@ -7665,12 +8695,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", "serde", ] @@ -7687,6 +8717,19 @@ dependencies = [ "url", ] +[[package]] +name = "ustr-fxhash" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe38ae02de418d12de738120d42d829f9fcc3b98fb203620aab98026611db08" +dependencies = [ + "byteorder", + "fxhash", + "lazy_static", + "parking_lot 0.12.3", + "serde", +] + [[package]] name = "utf-8" version = "0.7.6" @@ -7748,6 +8791,12 @@ dependencies = [ "wtf8", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "value-trait" version = "0.8.1" @@ -7766,6 +8815,18 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vergen" +version = "8.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" +dependencies = [ + "anyhow", + "cargo_metadata", + "regex", + "rustversion", +] + [[package]] name = "version_check" version = "0.9.4" @@ -7799,6 +8860,12 @@ dependencies = [ "quote", ] +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + [[package]] name = "walkdir" version = "2.3.2" @@ -7949,7 +9016,7 @@ dependencies = [ "profiling", "raw-window-handle", "ron", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "smallvec", "thiserror", @@ -7991,7 +9058,7 @@ dependencies = [ "profiling", "range-alloc", "raw-window-handle", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -8060,7 +9127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b2b1bf557d947847a30eb73f79aa6cdb3eaf3ce02f5e9599438f77896a62b3c" dependencies = [ "thiserror", - "windows", + "windows 0.52.0", ] [[package]] @@ -8094,6 +9161,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows" version = "0.52.0" @@ -8359,6 +9435,12 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +[[package]] +name = "xxhash-rust" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" + [[package]] name = "yaml_parser" version = "0.2.1" @@ -8426,7 +9508,7 @@ dependencies = [ "asynchronous-codec", "bytes", "crossbeam-queue", - "dashmap", + "dashmap 5.5.3", "futures-channel", "futures-io", "futures-task", diff --git a/Cargo.toml b/Cargo.toml index ddc0a1d561fc35..ab86c1f525ff83 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,7 +100,7 @@ cbc = { version = "=0.1.2", features = ["alloc"] } # Instead use util::time::utc_now() chrono = { version = "0.4", default-features = false, features = ["std", "serde"] } console_static_text = "=0.8.1" -data-encoding = "2.3.3" +data-encoding = "2.6.0" data-url = "=0.3.0" deno_cache_dir = "=0.10.2" deno_package_json = { version = "=0.1.1", default-features = false } @@ -188,7 +188,7 @@ tower-lsp = { version = "=0.20.0", features = ["proposed"] } tower-service = "0.3.2" twox-hash = "=1.6.3" # Upgrading past 2.4.1 may cause WPT failures -url = { version = "< 2.5.0", features = ["serde", "expose_internals"] } +url = { version = "2.4.1", features = ["serde", "expose_internals"] } uuid = { version = "1.3.0", features = ["v4"] } webpki-roots = "0.26" which = "4.2.5" @@ -218,15 +218,15 @@ windows-sys = { version = "0.52.0", features = ["Win32_Foundation", "Win32_Media winres = "=0.1.12" # rspack deps -rspack_plugin_schemes= { git = "https://github.com/web-infra-dev/rspack", branch = "main"} -rspack_ids= { git = "https://github.com/web-infra-dev/rspack", branch = "main"} -rspack_binding_options= { git = "https://github.com/web-infra-dev/rspack", branch = "main"} -rspack_hook= { git = "https://github.com/web-infra-dev/rspack", branch = "main", package = "rspack_hook"} -rspack_plugin_javascript= { git = "https://github.com/web-infra-dev/rspack", branch = "main", package = "rspack_plugin_javascript"} -rspack_error = { git = "https://github.com/web-infra-dev/rspack", branch = "main", package = "rspack_error"} -rspack_core = { git = "https://github.com/web-infra-dev/rspack", branch = "main"} -rspack_plugin_entry = { git = "https://github.com/web-infra-dev/rspack", branch = "main", package = "rspack_plugin_entry" } -rspack_fs = { git = "https://github.com/web-infra-dev/rspack", branch = "main", package = "rspack_fs" } +rspack_plugin_schemes= { version = "0.1.0"} +rspack_ids= { version="0.1.0"} +rspack_binding_options= { version = "0.1.0"} +rspack_hook= { version = "0.1.0"} +rspack_plugin_javascript= { version = "0.1.0" } +rspack_error = { version = "0.1.0"} +rspack_core = { version = "0.1.0"} +rspack_plugin_entry = { version = "0.1.0" } +rspack_fs = { version = "0.1.0" } # NB: the `bench` and `release` profiles must remain EXACTLY the same. diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 85cb9e7bb5cf3d..abfd460ed070de 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.80.0" +channel = "nightly-2024-06-07" components = ["rustfmt", "clippy"] From 6c9ad23cf64d79993067115aeb074a207c1a16f3 Mon Sep 17 00:00:00 2001 From: hardfist Date: Sun, 11 Aug 2024 11:17:25 +0800 Subject: [PATCH 04/13] chore: fix compile error --- Cargo.lock | 3 +-- Cargo.toml | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 23f6462a386741..e05f6f3813f216 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1319,8 +1319,7 @@ dependencies = [ [[package]] name = "deno_ast" version = "0.41.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a8207814a257d99164dbf780a73b9dee17af4db983f4b23ffbf20c7340d52f5" +source = "git+https://github.com/hardfist/deno_ast?branch=yj/concurrent_ast#f8265c4041c1673268f6bd999dffb4b8ca768952" dependencies = [ "anyhow", "base64 0.21.7", diff --git a/Cargo.toml b/Cargo.toml index ab86c1f525ff83..a46913c3679913 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -229,6 +229,11 @@ rspack_plugin_entry = { version = "0.1.0" } rspack_fs = { version = "0.1.0" } + +[patch.crates-io] +deno_ast = { git="https://github.com/hardfist/deno_ast", branch = "yj/concurrent_ast"} + + # NB: the `bench` and `release` profiles must remain EXACTLY the same. [profile.release] codegen-units = 1 From c6b6897dabbd8a09d6a1277550122e38ee0a9f22 Mon Sep 17 00:00:00 2001 From: hardfist Date: Mon, 12 Aug 2024 13:40:53 +0800 Subject: [PATCH 05/13] chore: add rspack dep --- Cargo.toml | 2 - cli/Cargo.toml | 9 +- cli/tools/bundle.rs | 2 +- cli/tools/bundle/rspack_bundle.rs | 161 ++++++++++++++++++++++++++++++ tests/napi/Cargo.toml | 2 +- 5 files changed, 171 insertions(+), 5 deletions(-) create mode 100644 cli/tools/bundle/rspack_bundle.rs diff --git a/Cargo.toml b/Cargo.toml index a46913c3679913..3d3d93a85ea0a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -220,8 +220,6 @@ winres = "=0.1.12" # rspack deps rspack_plugin_schemes= { version = "0.1.0"} rspack_ids= { version="0.1.0"} -rspack_binding_options= { version = "0.1.0"} -rspack_hook= { version = "0.1.0"} rspack_plugin_javascript= { version = "0.1.0" } rspack_error = { version = "0.1.0"} rspack_core = { version = "0.1.0"} diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 8f040f241f8cd5..205558f1f07525 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -159,7 +159,14 @@ which.workspace = true zeromq.workspace = true zstd.workspace = true -rspack_core = { workspace = true } +# rspack deps +rspack_plugin_schemes= { workspace = true} +rspack_ids= { workspace = true} +rspack_plugin_javascript= { workspace=true} +rspack_error = { workspace = true} +rspack_core = { workspace = true} +rspack_plugin_entry = { workspace =true } +rspack_fs = { workspace=true} [target.'cfg(windows)'.dependencies] junction.workspace = true diff --git a/cli/tools/bundle.rs b/cli/tools/bundle.rs index f2157ecd8c950c..93767b6cf6acf1 100644 --- a/cli/tools/bundle.rs +++ b/cli/tools/bundle.rs @@ -1,5 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. - +mod rspack_bundle; use std::path::PathBuf; use std::sync::Arc; diff --git a/cli/tools/bundle/rspack_bundle.rs b/cli/tools/bundle/rspack_bundle.rs new file mode 100644 index 00000000000000..8f053f3e154061 --- /dev/null +++ b/cli/tools/bundle/rspack_bundle.rs @@ -0,0 +1,161 @@ +use std::path::Path; +use rspack_ids::NaturalChunkIdsPlugin; +use rspack_ids::NamedModuleIdsPlugin; +use rspack_core::JavascriptParserOptions; +use rspack_core::ModuleType; +use rspack_core::ParserOptions; +use rspack_core::ParserOptionsByModuleType; +use rspack_core::{ + Builtins, CacheOptions, ChunkLoading, ChunkLoadingType, Compiler, CompilerOptions, Context, + CrossOriginLoading, DevServerOptions, EntryOptions, Environment, Experiments, Filename, + HashDigest, HashFunction, HashSalt, MangleExportsOption, Mode, ModuleOptions, Optimization, + OutputOptions, PathInfo, Plugin, PublicPath, Resolve, SideEffectOption, SnapshotOptions, + StatsOptions, Target, UsedExportsOption, WasmLoading, +}; +use rspack_fs::AsyncNativeFileSystem; +use rspack_plugin_entry::EntryPlugin; +use rspack_plugin_javascript::JsPlugin; +use rspack_plugin_schemes::DataUriPlugin; +use serde_json::Map; +use serde_json::Value; +use std::fs; + + +async fn pack() { + let output_filesystem = AsyncNativeFileSystem {}; + let root = env!("CARGO_MANIFEST_DIR"); + let context = Context::new(root.to_string()); + let dist: std::path::PathBuf = Path::new(root).join("./dist"); + if !dist.exists() { + fs::create_dir_all(&dist).expect("Failed to create dist directory"); + } + let dist = dist.canonicalize().unwrap(); + let entry_request: String = Path::new(root) + .join("./fixtures/index.js") + .canonicalize() + .unwrap() + .to_string_lossy() + .to_string(); + let options = CompilerOptions { + context: root.into(), + dev_server: DevServerOptions::default(), + output: OutputOptions { + chunk_load_timeout: Default::default(), + charset: Default::default(), + css_head_data_compression: Default::default(), + import_meta_name: Default::default(), + path: dist, + pathinfo: PathInfo::Bool(false), + clean: false, + public_path: PublicPath::Auto, + asset_module_filename: Filename::from(String::from("asset-[name].js")), + wasm_loading: WasmLoading::Disable, + webassembly_module_filename: Filename::from(String::from("webassembly.js")), + unique_name: "main".into(), + chunk_loading: ChunkLoading::Enable(ChunkLoadingType::Import), + chunk_loading_global: String::new(), + filename: Filename::from(String::from("[name].js")), + chunk_filename: Filename::from(String::from("[id].js")), + cross_origin_loading: CrossOriginLoading::Disable, + css_filename: Filename::from(String::from("[name].css")), + css_chunk_filename: Filename::from(String::from("[id].css")), + hot_update_main_filename: Filename::from(String::from("[name].[hash].hot-update.js")), + hot_update_chunk_filename: Filename::from(String::from("[id].[hash].hot-update.js")), + hot_update_global: String::new(), + library: None, + enabled_library_types: None, + strict_module_error_handling: false, + global_object: String::from("window"), + import_function_name: String::from("import"), + iife: false, + module: false, + trusted_types: None, + source_map_filename: Filename::from(String::from("[file].map")), + hash_function: HashFunction::MD4, + hash_digest: HashDigest::Hex, + hash_digest_length: 20, + hash_salt: HashSalt::Salt(String::from("salt")), + async_chunks: false, + worker_chunk_loading: ChunkLoading::Disable, + worker_wasm_loading: WasmLoading::Disable, + worker_public_path: String::new(), + script_type: String::from("text/javascript"), + environment: Environment { + r#const: Some(true), + arrow_function: Some(true), + }, + }, + target: Target::new(&vec!["es2022".to_string()]).unwrap(), + mode: Mode::Development, + resolve: Resolve { + extensions: Some(vec![".js".to_string()]), + ..Default::default() + }, + resolve_loader: Resolve { + extensions: Some(vec![".js".to_string()]), + ..Default::default() + }, + module: ModuleOptions { + parser: Some(ParserOptionsByModuleType::from_iter([( + ModuleType::JsAuto, + ParserOptions::Javascript(JavascriptParserOptions { + dynamic_import_fetch_priority: Default::default(), + override_strict: Default::default(), + import_meta: Default::default(), + dynamic_import_mode: rspack_core::DynamicImportMode::Eager, + dynamic_import_prefetch: rspack_core::JavascriptParserOrder::Order(1), + dynamic_import_preload: rspack_core::JavascriptParserOrder::Order(1), + url: rspack_core::JavascriptParserUrl::Disable, + expr_context_critical: false, + wrapped_context_critical: false, + exports_presence: None, + import_exports_presence: None, + reexport_exports_presence: None, + strict_export_presence: false, + worker: vec![], + }), + )])), + // generator: Some(GeneratorOptionsByModuleType::from_iter(generator.iter())), + ..Default::default() + }, + stats: StatsOptions::default(), + snapshot: SnapshotOptions, + cache: CacheOptions::default(), + experiments: Experiments::default(), + optimization: Optimization { + concatenate_modules: false, + remove_available_modules: false, + provided_exports: false, + mangle_exports: MangleExportsOption::False, + inner_graph: true, + used_exports: UsedExportsOption::default(), + side_effects: SideEffectOption::default(), + }, + profile: false, + bail: false, + __references: Map::::new(), + node: None, + }; + let mut plugins: Vec> = Vec::new(); + + let plugin_options = EntryOptions { + name: Some("main".to_string()), + runtime: None, + chunk_loading: None, + async_chunks: None, + public_path: None, + base_uri: None, + filename:None, + library: None, + depend_on: None, + layer: Default::default(), + }; + let entry_plugin = Box::new(EntryPlugin::new(context, entry_request, plugin_options)); + plugins.push(Box::::default()); + plugins.push(entry_plugin); + plugins.push(Box::::default()); + plugins.push(Box::::default()); + plugins.push(Box::::default()); + let mut compiler = Compiler::new(options, plugins, output_filesystem); + compiler.build().await.expect("build failed"); +} diff --git a/tests/napi/Cargo.toml b/tests/napi/Cargo.toml index 611d6d5507955d..17676e7498b016 100644 --- a/tests/napi/Cargo.toml +++ b/tests/napi/Cargo.toml @@ -13,7 +13,7 @@ repository.workspace = true crate-type = ["cdylib"] [dependencies] -napi-sys = { version = "=2.2.2", default-features = false, features = ["napi7"] } +napi-sys = { version = "2.4.0", default-features = false, features = ["napi7"] } [dev-dependencies] test_util.workspace = true From 6891da83ba59f622006efe081a3ac6b55ef49628 Mon Sep 17 00:00:00 2001 From: hardfist Date: Mon, 12 Aug 2024 18:07:20 +0800 Subject: [PATCH 06/13] chore: clean code --- Cargo.lock | 1827 +++++++++++++------ answer.mjs | 1 + cli/Cargo.toml | 1 + cli/main.rs | 3 +- cli/tools/bundle.rs | 1 - cli/tools/mod.rs | 1 + cli/tools/pack.rs | 54 + cli/tools/{bundle => pack}/rspack_bundle.rs | 37 +- index.mjs | 2 + main.js | 42 + runtime/tokio_util.rs | 3 +- tests/util/server/Cargo.toml | 2 +- 12 files changed, 1441 insertions(+), 533 deletions(-) create mode 100644 answer.mjs create mode 100644 cli/tools/pack.rs rename cli/tools/{bundle => pack}/rspack_bundle.rs (89%) create mode 100644 index.mjs create mode 100644 main.js diff --git a/Cargo.lock b/Cargo.lock index e05f6f3813f216..6689696d4591ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -94,6 +94,7 @@ dependencies = [ "cfg-if", "getrandom", "once_cell", + "serde", "version_check", "zerocopy", ] @@ -141,6 +142,12 @@ dependencies = [ "url", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -152,47 +159,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -200,9 +208,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] @@ -272,21 +280,21 @@ dependencies = [ [[package]] name = "ast_node" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab31376d309dd3bfc9cfb3c11c93ce0e0741bbe0354b20e7f8c60b044730b79" +checksum = "f9184f2b369b3e8625712493c89b785881f27eedc6cde480a81883cef78868b2" dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "async-compression" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "brotli", "flate2", @@ -304,7 +312,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -337,18 +345,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -364,6 +372,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "auto_impl" version = "1.2.0" @@ -372,7 +386,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -383,9 +397,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -484,20 +498,20 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.12.1", "lazy_static", "lazycell", "log", - "prettyplease 0.2.17", + "prettyplease 0.2.20", "proc-macro2", "quote", "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.72", + "syn 2.0.74", "which 4.4.2", ] @@ -524,9 +538,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -597,11 +611,29 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "browserslist-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf0ca73de70c3da94e4194e4a01fe732378f55d47cf4c0588caab22a0dbfa14" +dependencies = [ + "ahash", + "chrono", + "either", + "indexmap", + "itertools 0.13.0", + "nom 7.1.3", + "once_cell", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -618,9 +650,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" [[package]] name = "byteorder" @@ -630,9 +662,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cache_control" @@ -666,7 +698,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.14", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -683,9 +715,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.92" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292" dependencies = [ "jobserver", "libc", @@ -714,12 +746,15 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ + "android-tzdata", + "iana-time-zone", "num-traits", "serde", + "windows-targets 0.52.6", ] [[package]] @@ -740,7 +775,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.3", + "libloading 0.8.5", ] [[package]] @@ -829,9 +864,9 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "5.3.0" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -857,23 +892,23 @@ dependencies = [ [[package]] name = "color-print" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a858372ff14bab9b1b30ea504f2a4bc534582aee3e42ba2d41d2a7baba63d5d" +checksum = "1ee543c60ff3888934877a5671f45494dd27ed4ba25c6670b9a7576b7ed7a8c0" dependencies = [ "color-print-proc-macro", ] [[package]] name = "color-print-proc-macro" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e37866456a721d0a404439a1adae37a31be4e0055590d053dfe6981e05003f" +checksum = "77ff1a80c5f3cb1ca7c06ffdd71b6a6dd6d8f896c42141fbd43f50ed28dcdb93" dependencies = [ "nom 7.1.3", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.74", ] [[package]] @@ -884,9 +919,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "comrak" @@ -950,9 +985,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics-types" @@ -997,18 +1032,18 @@ checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1043,9 +1078,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-bigint" @@ -1102,7 +1137,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -1111,8 +1146,8 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", + "bitflags 2.6.0", + "libloading 0.8.5", "winapi", ] @@ -1158,10 +1193,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -1172,10 +1207,10 @@ checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", "crossbeam-utils", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -1255,12 +1290,12 @@ dependencies = [ "glibc_version", "glob", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "hyper-util", "import_map", "indexmap", - "jsonc-parser", + "jsonc-parser 0.23.0", "junction", "lazy-regex", "libc", @@ -1287,6 +1322,12 @@ dependencies = [ "regex", "ring", "rspack_core", + "rspack_error", + "rspack_fs", + "rspack_ids", + "rspack_plugin_entry", + "rspack_plugin_javascript", + "rspack_plugin_schemes", "runtimelib", "rustyline", "rustyline-derive", @@ -1296,6 +1337,7 @@ dependencies = [ "sha2", "shell-escape", "spki", + "swc_core", "tar", "tempfile", "test_server", @@ -1431,7 +1473,7 @@ dependencies = [ "ignore", "import_map", "indexmap", - "jsonc-parser", + "jsonc-parser 0.23.0", "log", "percent-encoding", "serde", @@ -1610,7 +1652,7 @@ version = "0.151.0" dependencies = [ "deno_core", "deno_permissions", - "dlopen2", + "dlopen2 0.6.1", "dynasmrt", "libffi", "libffi-sys", @@ -1689,7 +1731,7 @@ dependencies = [ "http 1.1.0", "http-body-util", "httparse", - "hyper 0.14.28", + "hyper 0.14.30", "hyper 1.4.1", "hyper-util", "itertools 0.10.5", @@ -1806,11 +1848,11 @@ dependencies = [ [[package]] name = "deno_native_certs" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c867603d2a5dfea31f55cecebb572554caa395437786d058faa9a2814c8d6eb9" +checksum = "86bc737e098a45aa5742d51ce694ac7236a1e69fb0d9df8c862e9b4c9583c5f9" dependencies = [ - "dlopen2", + "dlopen2 0.7.0", "dlopen2_derive", "once_cell", "rustls-native-certs", @@ -1861,7 +1903,7 @@ dependencies = [ "elliptic-curve", "errno 0.2.8", "faster-hex", - "h2 0.4.4", + "h2 0.4.5", "hkdf", "home", "http 1.1.0", @@ -1944,7 +1986,7 @@ dependencies = [ "quote", "strum", "strum_macros", - "syn 2.0.72", + "syn 2.0.74", "thiserror", ] @@ -2007,13 +2049,13 @@ dependencies = [ "deno_webidl", "deno_websocket", "deno_webstorage", - "dlopen2", + "dlopen2 0.6.1", "encoding_rs", "fastwebsockets", "flate2", "http 1.1.0", "http-body-util", - "hyper 0.14.28", + "hyper 0.14.30", "hyper 1.4.1", "hyper-util", "libc", @@ -2177,7 +2219,7 @@ dependencies = [ "deno_permissions", "deno_tls", "fastwebsockets", - "h2 0.4.4", + "h2 0.4.5", "http 1.1.0", "http-body-util", "hyper 1.4.1", @@ -2351,22 +2393,22 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version 0.4.0", - "syn 1.0.109", + "syn 2.0.74", ] [[package]] name = "deunicode" -version = "1.4.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" [[package]] name = "diatomic-waker" @@ -2419,13 +2461,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2446,6 +2488,18 @@ dependencies = [ "winapi", ] +[[package]] +name = "dlopen2" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi", +] + [[package]] name = "dlopen2_derive" version = "0.4.0" @@ -2454,14 +2508,14 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "document-features" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" dependencies = [ "litrs", ] @@ -2480,7 +2534,7 @@ checksum = "f3ab0dd2bedc109d25f0d21afb09b7d329f6c6fa83b095daf31d2d967e091548" dependencies = [ "anyhow", "bumpalo", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "rustc-hash 1.1.0", "serde", @@ -2506,7 +2560,7 @@ dependencies = [ "anyhow", "dprint-core", "dprint-core-macros", - "jsonc-parser", + "jsonc-parser 0.23.0", "serde", "text_lines", ] @@ -2519,7 +2573,7 @@ checksum = "c67b0e54b552a4775c221b44ed33be918c400bd8041d1f044f947fbb01025cc0" dependencies = [ "anyhow", "dprint-core", - "jsonc-parser", + "jsonc-parser 0.23.0", "serde", "serde_json", ] @@ -2672,9 +2726,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -2727,7 +2781,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -2762,9 +2816,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2788,12 +2842,9 @@ checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "escape8259" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4911e3666fcd7826997b4745c8224295a6f3072f1418c3067b97a67557ee" -dependencies = [ - "rustversion", -] +checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6" [[package]] name = "eszip" @@ -2840,6 +2891,12 @@ dependencies = [ "regex", ] +[[package]] +name = "fast-glob" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239ce881ea1fc42c19951979aa7fc75d740f6cd553101922b4d1f48d68429234" + [[package]] name = "fast-socks5" version = "0.9.6" @@ -2874,9 +2931,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fastwebsockets" @@ -2930,9 +2987,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "file_test_runner" @@ -2950,14 +3007,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -2989,9 +3046,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "libz-sys", @@ -3031,7 +3088,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -3051,19 +3108,19 @@ dependencies = [ [[package]] name = "fqdn" -version = "0.3.4" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf664d6b0598fea5600b85cddc79e60d4c1f262f42faf75c2d77dc2164c9a8b" +checksum = "08b1eaa7dfddeab6036292995620bf0435712e619db6d7690605897e76975eb0" [[package]] name = "from_variant" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc9cc75639b041067353b9bce2450d6847e547276c6fbe4487d7407980e07db" +checksum = "32016f1242eb82af5474752d00fd8ebcd9004bd69b462b1c91de833972d08ed4" dependencies = [ "proc-macro2", "swc_macros_common", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -3209,7 +3266,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -3277,9 +3334,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -3300,9 +3357,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gl_generator" @@ -3339,8 +3396,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -3370,7 +3427,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -3380,7 +3437,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3389,9 +3446,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -3400,7 +3457,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3444,15 +3501,15 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http 1.1.0", "indexmap", "slab", @@ -3467,7 +3524,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8588661a8607108a5ca69cab034063441a0413a0b041c13618a7dd348021ef6f" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", "serde", ] @@ -3486,6 +3543,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + [[package]] name = "hashbrown" version = "0.14.5" @@ -3502,7 +3568,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -3511,7 +3577,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -3584,11 +3650,11 @@ dependencies = [ [[package]] name = "hstr" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9de2bdef6354361892492bab5e316b2d78a0ee9971db4d36da9b1eb0e11999" +checksum = "dae404c0c5d4e95d4858876ab02eecd6a196bb8caa42050dfa809938833fc412" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", "new_debug_unreachable", "once_cell", "phf 0.11.2", @@ -3654,9 +3720,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.1.0", @@ -3671,15 +3737,15 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -3695,9 +3761,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -3726,9 +3792,9 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.4", + "h2 0.4.5", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", @@ -3766,7 +3832,7 @@ dependencies = [ "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "hyper 1.4.1", "pin-project-lite", "socket2", @@ -3776,6 +3842,29 @@ dependencies = [ "tracing", ] +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -3864,12 +3953,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.5", "rayon", "serde", ] @@ -3912,9 +4001,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -3957,14 +4046,14 @@ dependencies = [ [[package]] name = "is-macro" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" +checksum = "2069faacbe981460232f880d26bf3c7634e322d49053aa48c27e3ae642f728f1" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -3994,6 +4083,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.10.5" @@ -4003,6 +4098,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.13.0" @@ -4026,9 +4130,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.29" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f08474e32172238f2827bd160c67871cdb2801430f65c3979184dc362e3ca118" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -4057,6 +4161,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "jsonc-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b56a20e76235284255a09fcd1f45cf55d3c524ea657ebd3854735925c57743d" +dependencies = [ + "serde_json", +] + [[package]] name = "jsonc-parser" version = "0.23.0" @@ -4106,7 +4219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading 0.8.5", "pkg-config", ] @@ -4138,9 +4251,9 @@ dependencies = [ [[package]] name = "lazy-regex" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d12be4595afdf58bd19e4a9f4e24187da2a66700786ff660a418e9059937a4c" +checksum = "576c8060ecfdf2e56995cf3274b4f2d71fa5e4fa3607c1c0b63c10180ee58741" dependencies = [ "lazy-regex-proc_macros", "once_cell", @@ -4149,23 +4262,23 @@ dependencies = [ [[package]] name = "lazy-regex-proc_macros" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bcd58e6c97a7fcbaffcdc95728b393b8d98933bfadad49ed4097845b57ef0b" +checksum = "9efb9e65d4503df81c615dc33ff07042a9408ac7f26b45abee25566f7fbfd12c" dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -4249,9 +4362,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libffi" @@ -4284,12 +4397,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -4304,8 +4417,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall 0.5.3", ] [[package]] @@ -4334,9 +4448,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "cmake", @@ -4351,11 +4465,20 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linked_hash_set" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litrs" @@ -4365,9 +4488,9 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -4375,9 +4498,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "serde", ] @@ -4395,6 +4518,15 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "lru" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" +dependencies = [ + "hashbrown 0.13.2", +] + [[package]] name = "lru-cache" version = "0.1.2" @@ -4531,7 +4663,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types", @@ -4583,7 +4715,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4594,7 +4726,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4621,9 +4753,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -4641,6 +4773,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "monch" version = "0.5.0" @@ -4661,7 +4805,7 @@ checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "codespan-reporting", "hexf-parse", "indexmap", @@ -4683,11 +4827,11 @@ checksum = "ebd4419172727423cf30351406c54f6cc1b354a2cfb4f1dba3e6cd07f6d5522b" [[package]] name = "napi-sys" -version = "2.2.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529671ebfae679f2ce9630b62dd53c72c56b3eb8b2c852e7e2fa91704ff93d67" +checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3" dependencies = [ - "libloading 0.7.4", + "libloading 0.8.5", ] [[package]] @@ -4697,7 +4841,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -4754,7 +4898,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "libc", ] @@ -4813,7 +4957,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -4821,7 +4965,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] @@ -4847,11 +4991,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", "rand", @@ -4893,9 +5036,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -4904,9 +5047,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -4933,9 +5076,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -4985,9 +5128,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open" -version = "5.1.2" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -5129,7 +5272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -5148,15 +5291,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -5172,9 +5315,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "path-clean" @@ -5230,9 +5373,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.9" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -5241,9 +5384,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.9" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -5251,22 +5394,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.9" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "pest_meta" -version = "2.7.9" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -5275,9 +5418,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", @@ -5342,7 +5485,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5380,7 +5523,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5455,9 +5598,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "precomputed-hash" @@ -5465,6 +5611,24 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +[[package]] +name = "preset_env_base" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b30eab18be480c194938e433e269d5298a279f6410f02fbc73f3576a325c110" +dependencies = [ + "ahash", + "anyhow", + "browserslist-rs", + "dashmap 5.5.3", + "from_variant", + "once_cell", + "semver 1.0.23", + "serde", + "st-map", + "tracing", +] + [[package]] name = "pretty_assertions" version = "1.4.0" @@ -5498,12 +5662,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5547,7 +5711,7 @@ checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f" dependencies = [ "proc-macro-rules-macros", "proc-macro2", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5559,7 +5723,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -5666,7 +5830,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "memchr", "unicase", ] @@ -5702,16 +5866,17 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", "rustls", + "socket2", "thiserror", "tokio", "tracing", @@ -5719,14 +5884,14 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" dependencies = [ "bytes", "rand", "ring", - "rustc-hash 1.1.0", + "rustc-hash 2.0.0", "rustls", "slab", "thiserror", @@ -5736,9 +5901,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ "libc", "once_cell", @@ -5816,9 +5981,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "raw-window-handle" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" @@ -5858,6 +6023,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "redox_users" version = "0.4.5" @@ -5871,34 +6045,34 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -5912,13 +6086,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -5929,9 +6103,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "regress" @@ -5939,15 +6113,15 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16fe0a24af5daaae947294213d2fd2646fbf5e1fbacc1d4ba3e84b2393854842" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", "memchr", ] [[package]] name = "relative-path" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" +checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "reqwest" @@ -5960,9 +6134,9 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "h2 0.4.4", + "h2 0.4.5", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "hyper 1.4.1", "hyper-rustls", @@ -6026,7 +6200,7 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin 0.9.8", + "spin", "untrusted", "windows-sys 0.52.0", ] @@ -6047,11 +6221,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] +[[package]] +name = "ropey" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5" +dependencies = [ + "smallvec", + "str_indices", +] + [[package]] name = "rowan" version = "0.15.15" @@ -6059,7 +6243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49" dependencies = [ "countme", - "hashbrown", + "hashbrown 0.14.5", "memoffset 0.9.1", "rustc-hash 1.1.0", "text-size", @@ -6098,16 +6282,26 @@ dependencies = [ ] [[package]] -name = "rspack_collections" +name = "rspack_base64" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685548b590a7597cbd8c4a75a8de65b8fc3e69ad405c3158fcded9833073b781" +checksum = "afafd28cb7f2e62cc750c051dda4a83da7ea9aaacd5ee093455f50c172c32ba3" dependencies = [ - "dashmap 5.5.3", - "hashlink 0.9.1", - "indexmap", - "rayon", - "serde", + "base64-simd 0.8.0", + "regex", +] + +[[package]] +name = "rspack_collections" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685548b590a7597cbd8c4a75a8de65b8fc3e69ad405c3158fcded9833073b781" +dependencies = [ + "dashmap 5.5.3", + "hashlink 0.9.1", + "indexmap", + "rayon", + "serde", "ustr-fxhash", ] @@ -6120,7 +6314,7 @@ dependencies = [ "anymap", "async-recursion", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "dashmap 5.5.3", "derivative", "dyn-clone", @@ -6228,6 +6422,22 @@ dependencies = [ "rustc-hash 1.1.0", ] +[[package]] +name = "rspack_ids" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94a676f699cab10388af6e127cf82c5904fb64b86949feddec620c67a0f1c0bf" +dependencies = [ + "itertools 0.13.0", + "rayon", + "regex", + "rspack_core", + "rspack_error", + "rspack_hook", + "rspack_util", + "tracing", +] + [[package]] name = "rspack_loader_runner" version = "0.1.0" @@ -6256,7 +6466,76 @@ checksum = "6349db5190261972178f4794eda0a66eb10f035b989ac9da3615cea0a6689c32" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", +] + +[[package]] +name = "rspack_plugin_entry" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c3f9c2e070725e937fb4420b5ce846d7f626768070b9c2a463917ecf0222c6" +dependencies = [ + "async-trait", + "rspack_core", + "rspack_error", + "rspack_hook", + "tracing", +] + +[[package]] +name = "rspack_plugin_javascript" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5b01e005056219e359b36df0565c21774c4ef90ee695e8b5e675c57bc69015e" +dependencies = [ + "anymap", + "async-trait", + "bitflags 2.6.0", + "dashmap 5.5.3", + "fast-glob", + "indexmap", + "indoc", + "itertools 0.13.0", + "linked_hash_set", + "num-bigint", + "once_cell", + "rayon", + "regex", + "ropey", + "rspack_ast", + "rspack_collections", + "rspack_core", + "rspack_error", + "rspack_hash", + "rspack_hook", + "rspack_ids", + "rspack_regex", + "rspack_util", + "rustc-hash 1.1.0", + "serde_json", + "stacker", + "sugar_path", + "swc_core", + "swc_node_comments", + "tracing", + "url", +] + +[[package]] +name = "rspack_plugin_schemes" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5cd44681a41b16deb5d751f32b0f11b37be507d1b456f8de222a4e8a4b6d5f" +dependencies = [ + "async-trait", + "regex", + "rspack_base64", + "rspack_core", + "rspack_error", + "rspack_hook", + "tracing", + "url", + "urlencoding", ] [[package]] @@ -6265,7 +6544,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48162a03ce5d42de1eeb0a0c793dbd6d272b273fa483ef9271e88fe9c92a294" dependencies = [ - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", "regress", "rspack_error", "swc_core", @@ -6312,7 +6591,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a01182a1cfb318b48dcc3fefa5c038952f3652db47a1607728ff61230b72ff5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "concat-string", "dashmap 5.5.3", "indexmap", @@ -6356,7 +6635,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "fallible-iterator", "fallible-streaming-iterator", "hashlink 0.8.4", @@ -6366,9 +6645,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -6397,7 +6676,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.14", + "semver 1.0.23", ] [[package]] @@ -6411,12 +6690,12 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", - "errno 0.3.8", + "bitflags 2.6.0", + "errno 0.3.9", "libc", "linux-raw-sys", "windows-sys 0.52.0", @@ -6424,9 +6703,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.11" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "log", "once_cell", @@ -6439,9 +6718,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -6452,9 +6731,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -6462,9 +6741,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-tokio-stream" @@ -6480,9 +6759,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.5" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -6491,9 +6770,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustyline" @@ -6501,7 +6780,7 @@ version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "clipboard-win", "fd-lock", @@ -6530,9 +6809,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "ryu-js" @@ -6617,11 +6896,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -6630,9 +6909,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -6649,9 +6928,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -6664,9 +6943,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.205" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" +checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" dependencies = [ "serde_derive", ] @@ -6683,29 +6962,29 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.205" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" +checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" dependencies = [ "indexmap", "itoa", @@ -6722,14 +7001,14 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -6772,9 +7051,9 @@ dependencies = [ [[package]] name = "sha1_smol" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "sha2" @@ -6839,9 +7118,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -6873,9 +7152,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simd-json" -version = "0.13.9" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b84c23a1066e1d650ebc99aa8fb9f8ed0ab96fd36e2e836173c92fc9fb29bc" +checksum = "570c430b3d902ea083097e853263ae782dfe40857d93db019a12356c8e8143fa" dependencies = [ "getrandom", "halfbrown", @@ -6970,12 +7249,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6997,12 +7276,6 @@ dependencies = [ "url", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -7015,7 +7288,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -7028,6 +7301,16 @@ dependencies = [ "der", ] +[[package]] +name = "st-map" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8257dd592de7614be71a2342d36ba2d527ddad3f9a0c8d09d6ceed4c371531e4" +dependencies = [ + "arrayvec", + "static-map-macro", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -7047,6 +7330,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "static-map-macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "710e9696ef338691287aeb937ee6ffe60022f579d3c8d2fd9d58973a9a10a466" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -7094,7 +7388,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7131,7 +7425,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7145,9 +7439,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sugar_path" @@ -7183,6 +7477,56 @@ dependencies = [ "is-terminal", ] +[[package]] +name = "swc" +version = "0.282.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f76ba75c4eaace11f3b1f22f31fbba74bd5983bf7581caef939c2c7aa1af7f4f" +dependencies = [ + "anyhow", + "base64 0.21.7", + "dashmap 5.5.3", + "either", + "indexmap", + "jsonc-parser 0.21.1", + "lru", + "once_cell", + "parking_lot 0.12.3", + "pathdiff", + "regex", + "rustc-hash 1.1.0", + "serde", + "serde_json", + "sourcemap", + "swc_atoms", + "swc_cached", + "swc_common", + "swc_compiler_base", + "swc_config", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_ext_transforms", + "swc_ecma_lints", + "swc_ecma_loader", + "swc_ecma_minifier", + "swc_ecma_parser", + "swc_ecma_preset_env", + "swc_ecma_transforms", + "swc_ecma_transforms_base", + "swc_ecma_transforms_compat", + "swc_ecma_transforms_optimization", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_error_reporters", + "swc_node_comments", + "swc_timer", + "swc_transform_common", + "swc_typescript", + "swc_visit", + "tracing", + "url", +] + [[package]] name = "swc_allocator" version = "0.1.8" @@ -7190,7 +7534,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc8bd3075d1c6964010333fae9ddcd91ad422a4f8eb8b3206a9b2b6afb4209e" dependencies = [ "bumpalo", - "hashbrown", + "hashbrown 0.14.5", "ptr_meta", "rustc-hash 1.1.0", "triomphe", @@ -7258,6 +7602,7 @@ version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1802b1642488aec58597dc55ea88992c165660d6e44e9838d4d93f7b78ab95f3" dependencies = [ + "ahash", "ast_node", "better_scoped_tls", "cfg-if", @@ -7281,6 +7626,32 @@ dependencies = [ "url", ] +[[package]] +name = "swc_compiler_base" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd217a48b2061a6fbb602450f347abed706246464f5a5ac24054502f2ab8923" +dependencies = [ + "anyhow", + "base64 0.21.7", + "once_cell", + "pathdiff", + "rustc-hash 1.1.0", + "serde", + "serde_json", + "sourcemap", + "swc_allocator", + "swc_atoms", + "swc_common", + "swc_config", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_minifier", + "swc_ecma_parser", + "swc_ecma_visit", + "swc_timer", +] + [[package]] name = "swc_config" version = "0.1.14" @@ -7291,6 +7662,7 @@ dependencies = [ "indexmap", "serde", "serde_json", + "sourcemap", "swc_cached", "swc_config_macro", ] @@ -7304,7 +7676,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7313,6 +7685,7 @@ version = "0.99.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9fb414e03336f9f4d238fb2463ccabe43b2cb22b7184b64a7ab21ac8845881f" dependencies = [ + "swc", "swc_allocator", "swc_atoms", "swc_common", @@ -7326,10 +7699,14 @@ dependencies = [ "swc_ecma_ast", "swc_ecma_codegen", "swc_ecma_parser", + "swc_ecma_preset_env", "swc_ecma_quote_macros", "swc_ecma_transforms_base", + "swc_ecma_transforms_compat", "swc_ecma_transforms_module", + "swc_ecma_transforms_optimization", "swc_ecma_transforms_react", + "swc_ecma_transforms_typescript", "swc_ecma_utils", "swc_ecma_visit", "vergen", @@ -7354,7 +7731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae8e731ef1e9f1399548fcaaf2bc5c154d16adc29546a2e7120d692ae4260487" dependencies = [ "auto_impl", - "bitflags 2.5.0", + "bitflags 2.6.0", "rustc-hash 1.1.0", "serde", "swc_atoms", @@ -7373,7 +7750,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7382,7 +7759,7 @@ version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d9f4440b5fbd45253926497f21a69510bb20d5422c24128667aa6c2031fefbc" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "once_cell", "serde", "serde_json", @@ -7410,93 +7787,321 @@ dependencies = [ ] [[package]] -name = "swc_css_parser" -version = "0.153.1" +name = "swc_css_parser" +version = "0.153.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98be1caea76ea9b38ddf9d9940f133aa491e9bc0c254745cfa7e685dbc2b28b" +dependencies = [ + "lexical", + "serde", + "swc_atoms", + "swc_common", + "swc_css_ast", +] + +[[package]] +name = "swc_css_utils" +version = "0.140.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47ab39714e7f531b892385aeb562e326f525efe738c3294d0d7f16c25fbca982" +dependencies = [ + "once_cell", + "serde", + "serde_json", + "swc_atoms", + "swc_common", + "swc_css_ast", + "swc_css_visit", +] + +[[package]] +name = "swc_css_visit" +version = "0.142.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80600a79fb14fe45ab7b92bb4baf2f34767942c732de19c3d691c2f51bd7a155" +dependencies = [ + "serde", + "swc_atoms", + "swc_common", + "swc_css_ast", + "swc_visit", +] + +[[package]] +name = "swc_ecma_ast" +version = "0.117.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5da2f0310e8cd84b8c803095e75b2cbca872c71fc7f7404d4c9c8117d894960" +dependencies = [ + "bitflags 2.6.0", + "is-macro", + "num-bigint", + "phf 0.11.2", + "scoped-tls", + "serde", + "string_enum", + "swc_atoms", + "swc_common", + "unicode-id-start", +] + +[[package]] +name = "swc_ecma_codegen" +version = "0.154.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7badcda2c45056495ed94b957884099cb000470ae7901ba68db2e7fd48414a4b" +dependencies = [ + "memchr", + "num-bigint", + "once_cell", + "serde", + "sourcemap", + "swc_allocator", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_codegen_macros", + "tracing", +] + +[[package]] +name = "swc_ecma_codegen_macros" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859fabde36db38634f3fad548dd5e3410c1aebba1b67a3c63e67018fa57a0bca" +dependencies = [ + "proc-macro2", + "quote", + "swc_macros_common", + "syn 2.0.74", +] + +[[package]] +name = "swc_ecma_compat_bugfixes" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0729253b3f14e53fe300a7bb701144e319f539d1bcb1839eabab17a93d9fd6b2" +dependencies = [ + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_compat_es2015", + "swc_ecma_transforms_base", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", + "tracing", +] + +[[package]] +name = "swc_ecma_compat_common" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4cc5d93c0517aba5a5cefed6770970a270960f9f3881c3234257244f29f9d81" +dependencies = [ + "swc_common", + "swc_ecma_ast", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", +] + +[[package]] +name = "swc_ecma_compat_es2015" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d705c2e9fa6a7024d1771fa6f8203f28762fbe0995db919a2f5a6cabd9c6b544" +dependencies = [ + "arrayvec", + "indexmap", + "is-macro", + "serde", + "serde_derive", + "smallvec", + "swc_atoms", + "swc_common", + "swc_config", + "swc_ecma_ast", + "swc_ecma_compat_common", + "swc_ecma_transforms_base", + "swc_ecma_transforms_classes", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", + "tracing", +] + +[[package]] +name = "swc_ecma_compat_es2016" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00a32d58418a36a2b41462197c5c4334ed24b21c73be31f2bd09203c0bb962db" +dependencies = [ + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", + "tracing", +] + +[[package]] +name = "swc_ecma_compat_es2017" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f7e60ec1d6a742de6ca35ddff7bc8a01e99ed53d1f68c352d4ea9a494d9b4d" +dependencies = [ + "serde", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", + "tracing", +] + +[[package]] +name = "swc_ecma_compat_es2018" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9623c0aa17f9ec0bded894089b73aa3056f5205a0bf715955fbf36e6f63ae0f9" +dependencies = [ + "serde", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_compat_common", + "swc_ecma_transforms_base", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", + "tracing", +] + +[[package]] +name = "swc_ecma_compat_es2019" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8be9ff518dbca4cb96d3eebcc7c2fb23b73c5d0b5cfb81237ebab92f423a359" +dependencies = [ + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", + "tracing", +] + +[[package]] +name = "swc_ecma_compat_es2020" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc6d451268aa73f105b2f663d20e7876ea4949c796bc25d62d58f598a776ea6" +dependencies = [ + "serde", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_compat_es2022", + "swc_ecma_transforms_base", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", + "tracing", +] + +[[package]] +name = "swc_ecma_compat_es2021" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98be1caea76ea9b38ddf9d9940f133aa491e9bc0c254745cfa7e685dbc2b28b" +checksum = "c14bde6cfd6612cab24560f1db1aa26b0e09325d85a0c9cac3c84c196ea80397" dependencies = [ - "lexical", - "serde", "swc_atoms", "swc_common", - "swc_css_ast", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", + "tracing", ] [[package]] -name = "swc_css_utils" -version = "0.140.0" +name = "swc_ecma_compat_es2022" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47ab39714e7f531b892385aeb562e326f525efe738c3294d0d7f16c25fbca982" +checksum = "a6454665fdfd1f74f1de8fd58dd2a4736903987b7ef840e1ad6f5e695555920c" dependencies = [ - "once_cell", - "serde", - "serde_json", "swc_atoms", "swc_common", - "swc_css_ast", - "swc_css_visit", + "swc_ecma_ast", + "swc_ecma_compat_common", + "swc_ecma_transforms_base", + "swc_ecma_transforms_classes", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", + "tracing", ] [[package]] -name = "swc_css_visit" -version = "0.142.1" +name = "swc_ecma_compat_es3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80600a79fb14fe45ab7b92bb4baf2f34767942c732de19c3d691c2f51bd7a155" +checksum = "5092a2e55629997e8dd5191d1183b33b64707576fe719c17302fbd5cd2f8ac7a" dependencies = [ - "serde", - "swc_atoms", "swc_common", - "swc_css_ast", - "swc_visit", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", + "tracing", ] [[package]] -name = "swc_ecma_ast" -version = "0.117.4" +name = "swc_ecma_ext_transforms" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5da2f0310e8cd84b8c803095e75b2cbca872c71fc7f7404d4c9c8117d894960" +checksum = "45036094d488b0f01706b9a385116326dd7912d8001e9451c506be171154a680" dependencies = [ - "bitflags 2.5.0", - "is-macro", - "num-bigint", "phf 0.11.2", - "scoped-tls", - "serde", - "string_enum", "swc_atoms", "swc_common", - "unicode-id-start", + "swc_ecma_ast", + "swc_ecma_utils", + "swc_ecma_visit", ] [[package]] -name = "swc_ecma_codegen" -version = "0.154.4" +name = "swc_ecma_lints" +version = "0.98.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7badcda2c45056495ed94b957884099cb000470ae7901ba68db2e7fd48414a4b" +checksum = "1e008805fad22a9ca42a24395e9e46bacbc4b464048dba259fa5cf69e95cadd2" dependencies = [ - "memchr", - "num-bigint", - "once_cell", + "auto_impl", + "dashmap 5.5.3", + "parking_lot 0.12.3", + "rayon", + "regex", "serde", - "sourcemap", - "swc_allocator", "swc_atoms", "swc_common", + "swc_config", "swc_ecma_ast", - "swc_ecma_codegen_macros", - "tracing", -] - -[[package]] -name = "swc_ecma_codegen_macros" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859fabde36db38634f3fad548dd5e3410c1aebba1b67a3c63e67018fa57a0bca" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.72", + "swc_ecma_utils", + "swc_ecma_visit", ] [[package]] @@ -7507,14 +8112,52 @@ checksum = "a201c65ccbaa0c80fbcfd5c90dcc0bfc7ae62ac596f2233651ac715caf5d2c12" dependencies = [ "anyhow", "dashmap 5.5.3", + "lru", "normpath", "once_cell", + "parking_lot 0.12.3", "path-clean 0.1.0", "pathdiff", "serde", "serde_json", "swc_atoms", + "swc_cached", + "swc_common", + "tracing", +] + +[[package]] +name = "swc_ecma_minifier" +version = "0.200.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624e23b532c9a2f74ea850120b19079ab67f6e85af53c83d1984adbecc820b03" +dependencies = [ + "arrayvec", + "indexmap", + "num-bigint", + "num_cpus", + "once_cell", + "parking_lot 0.12.3", + "phf 0.11.2", + "radix_fmt", + "regex", + "rustc-hash 1.1.0", + "ryu-js", + "serde", + "serde_json", + "swc_allocator", + "swc_atoms", "swc_common", + "swc_config", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_optimization", + "swc_ecma_usage_analyzer", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_timer", "tracing", ] @@ -7540,6 +8183,31 @@ dependencies = [ "typed-arena", ] +[[package]] +name = "swc_ecma_preset_env" +version = "0.213.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae5f069e49b3ed41fa8136913497fa05357c24be2a29d205094d716d2d541a0a" +dependencies = [ + "anyhow", + "dashmap 5.5.3", + "indexmap", + "once_cell", + "preset_env_base", + "rustc-hash 1.1.0", + "semver 1.0.23", + "serde", + "serde_json", + "st-map", + "string_enum", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms", + "swc_ecma_utils", + "swc_ecma_visit", +] + [[package]] name = "swc_ecma_quote_macros" version = "0.59.2" @@ -7554,7 +8222,27 @@ dependencies = [ "swc_ecma_ast", "swc_ecma_parser", "swc_macros_common", - "syn 2.0.72", + "syn 2.0.74", +] + +[[package]] +name = "swc_ecma_transforms" +version = "0.235.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bae99435503b117b96ffe1030976270c6ec6bdb6f5c62fcb2ce63674b48b1465" +dependencies = [ + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_transforms_compat", + "swc_ecma_transforms_module", + "swc_ecma_transforms_optimization", + "swc_ecma_transforms_proposal", + "swc_ecma_transforms_react", + "swc_ecma_transforms_typescript", + "swc_ecma_utils", + "swc_ecma_visit", ] [[package]] @@ -7564,7 +8252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6df81c1cbb920d9c47abe6fb105363b0f78df2c8f6b0910c4fdd2ad7cbdfb23d" dependencies = [ "better_scoped_tls", - "bitflags 2.5.0", + "bitflags 2.6.0", "indexmap", "once_cell", "phf 0.11.2", @@ -7594,6 +8282,42 @@ dependencies = [ "swc_ecma_visit", ] +[[package]] +name = "swc_ecma_transforms_compat" +version = "0.169.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f689e03f059ebbff4455331d7e419933574fe409977f8c1d0005c480a89949e" +dependencies = [ + "arrayvec", + "indexmap", + "is-macro", + "num-bigint", + "serde", + "smallvec", + "swc_atoms", + "swc_common", + "swc_config", + "swc_ecma_ast", + "swc_ecma_compat_bugfixes", + "swc_ecma_compat_common", + "swc_ecma_compat_es2015", + "swc_ecma_compat_es2016", + "swc_ecma_compat_es2017", + "swc_ecma_compat_es2018", + "swc_ecma_compat_es2019", + "swc_ecma_compat_es2020", + "swc_ecma_compat_es2021", + "swc_ecma_compat_es2022", + "swc_ecma_compat_es3", + "swc_ecma_transforms_base", + "swc_ecma_transforms_classes", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_trace_macro", + "tracing", +] + [[package]] name = "swc_ecma_transforms_macros" version = "0.5.5" @@ -7603,7 +8327,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7614,7 +8338,7 @@ checksum = "f3d55d9d19cb00dfb661d571fd5d8b18e75c6b3bb080968449e71f785ecced00" dependencies = [ "Inflector", "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "indexmap", "is-macro", "path-clean 1.0.1", @@ -7719,6 +8443,23 @@ dependencies = [ "swc_ecma_visit", ] +[[package]] +name = "swc_ecma_usage_analyzer" +version = "0.29.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f583b8db3cb9848537bd6f91c75398407e64332aee982337fe62ea4dec7e7b" +dependencies = [ + "indexmap", + "rustc-hash 1.1.0", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_timer", + "tracing", +] + [[package]] name = "swc_ecma_utils" version = "0.133.4" @@ -7761,7 +8502,7 @@ checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7810,7 +8551,7 @@ checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7824,6 +8565,51 @@ dependencies = [ "swc_common", ] +[[package]] +name = "swc_timer" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78cf01b1f8a318614f566145b0016b2a0e84ac66d78c1374cdc3438e06c27740" +dependencies = [ + "tracing", +] + +[[package]] +name = "swc_trace_macro" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff9719b6085dd2824fd61938a881937be14b08f95e2d27c64c825a9f65e052ba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "swc_transform_common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda3e80e1ad638d3575bc07745a914af13dcb02215098659f864731078271f2c" +dependencies = [ + "better_scoped_tls", + "once_cell", + "rustc-hash 1.1.0", + "serde", + "serde_json", +] + +[[package]] +name = "swc_typescript" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03d9845b6dfbfb23aee9a990644a3c9560ef49243098149b5c8ef7ef4171f316" +dependencies = [ + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "thiserror", +] + [[package]] name = "swc_visit" version = "0.6.1" @@ -7843,7 +8629,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -7859,9 +8645,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -7898,7 +8684,7 @@ dependencies = [ "fnv", "once_cell", "onig", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", "serde", "serde_derive", "serde_json", @@ -7925,14 +8711,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.0.2", + "fastrand 2.1.0", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7997,12 +8784,12 @@ dependencies = [ "flate2", "futures", "glob", - "h2 0.4.4", + "h2 0.4.5", "http 1.1.0", "http-body-util", "hyper 1.4.1", "hyper-util", - "jsonc-parser", + "jsonc-parser 0.23.0", "lazy-regex", "libc", "lsp-types", @@ -8018,7 +8805,7 @@ dependencies = [ "reqwest", "rustls-pemfile", "rustls-tokio-stream", - "semver 1.0.14", + "semver 1.0.23", "serde", "serde_json", "sha2", @@ -8070,22 +8857,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -8137,9 +8924,9 @@ checksum = "4b3f46f0549180b9c6f7f76270903f1a06867c43a03998b99dce81aa1760c3b2" [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -8152,32 +8939,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.1", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -8205,9 +8991,9 @@ dependencies = [ [[package]] name = "tokio-socks" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" dependencies = [ "either", "futures-util", @@ -8228,20 +9014,19 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "futures-util", - "hashbrown", + "hashbrown 0.14.5", "pin-project-lite", "slab", "tokio", - "tracing", ] [[package]] @@ -8267,9 +9052,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -8309,11 +9094,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ "async-compression", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "futures-core", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "http-body-util", "pin-project-lite", "tokio", @@ -8359,7 +9144,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -8387,7 +9172,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -8704,6 +9489,12 @@ dependencies = [ "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "urlpattern" version = "0.3.0" @@ -8743,15 +9534,15 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "serde", @@ -8765,14 +9556,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88a710d5b95bff79a90708203cf9f74384e080d21fc6664aa4df463f2c66ac83" dependencies = [ "bindgen", - "bitflags 2.5.0", + "bitflags 2.6.0", "fslock", "gzip-header", "home", "miniz_oxide", "once_cell", "paste", - "which 6.0.1", + "which 6.0.2", ] [[package]] @@ -8781,7 +9572,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97599c400fc79925922b58303e98fcb8fa88f573379a08ddb652e72cbd2e70f6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "encoding_rs", "indexmap", "num-bigint", @@ -8828,9 +9619,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vsimd" @@ -8851,9 +9642,9 @@ dependencies = [ [[package]] name = "vte_generate_state_changes" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" dependencies = [ "proc-macro2", "quote", @@ -8918,7 +9709,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", "wasm-bindgen-shared", ] @@ -8952,7 +9743,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8988,9 +9779,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -9003,7 +9794,7 @@ checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases", "codespan-reporting", "document-features", @@ -9034,7 +9825,7 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "cfg_aliases", "core-graphics-types", @@ -9046,7 +9837,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading 0.8.5", "log", "metal", "naga", @@ -9072,7 +9863,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "serde", "web-sys", @@ -9092,9 +9883,9 @@ dependencies = [ [[package]] name = "which" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" +checksum = "3d9c5ed668ee1f17edb3b627225343d210006a90bb1e3745ce1f30b1fb115075" dependencies = [ "either", "home", @@ -9147,11 +9938,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -9176,7 +9967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -9185,7 +9976,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -9203,7 +9994,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -9223,17 +10023,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -9244,9 +10045,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -9256,9 +10057,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -9268,9 +10069,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -9280,9 +10087,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -9292,9 +10099,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -9304,9 +10111,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -9316,9 +10123,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -9331,9 +10138,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -9430,9 +10237,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" [[package]] name = "xxhash-rust" @@ -9447,7 +10254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a6a39b6b5ba0d02c910d05d7fbc366a4befb8901ea107dcde9c1c97acb8a366" dependencies = [ "rowan", - "winnow 0.6.15", + "winnow 0.6.18", ] [[package]] @@ -9458,9 +10265,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", "zerocopy-derive", @@ -9468,20 +10275,20 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -9494,7 +10301,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.74", ] [[package]] @@ -9545,9 +10352,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", diff --git a/answer.mjs b/answer.mjs new file mode 100644 index 00000000000000..7814b2b1c195ba --- /dev/null +++ b/answer.mjs @@ -0,0 +1 @@ +export const answer = 42; \ No newline at end of file diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 205558f1f07525..4f0d085eb2ff4d 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -167,6 +167,7 @@ rspack_error = { workspace = true} rspack_core = { workspace = true} rspack_plugin_entry = { workspace =true } rspack_fs = { workspace=true} +swc_core = { version = "0.99.6"} [target.'cfg(windows)'.dependencies] junction.workspace = true diff --git a/cli/main.rs b/cli/main.rs index 9cb2b264432408..a38dcb0d4e142a 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -107,7 +107,8 @@ async fn run_subcommand(flags: Arc) -> Result { } }), DenoSubcommand::Bundle(bundle_flags) => spawn_subcommand(async { - tools::bundle::bundle(flags, bundle_flags).await + //tools::bundle::bundle(flags, bundle_flags).await + tools::pack::pack(flags, bundle_flags).await }), DenoSubcommand::Doc(doc_flags) => { spawn_subcommand(async { tools::doc::doc(flags, doc_flags).await }) diff --git a/cli/tools/bundle.rs b/cli/tools/bundle.rs index 93767b6cf6acf1..cf3787f6d5f953 100644 --- a/cli/tools/bundle.rs +++ b/cli/tools/bundle.rs @@ -1,5 +1,4 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -mod rspack_bundle; use std::path::PathBuf; use std::sync::Arc; diff --git a/cli/tools/mod.rs b/cli/tools/mod.rs index 4593092ed225dd..60a85466f1f6ea 100644 --- a/cli/tools/mod.rs +++ b/cli/tools/mod.rs @@ -19,3 +19,4 @@ pub mod task; pub mod test; pub mod upgrade; pub mod vendor; +pub mod pack; diff --git a/cli/tools/pack.rs b/cli/tools/pack.rs new file mode 100644 index 00000000000000..baadca8c0a1cfe --- /dev/null +++ b/cli/tools/pack.rs @@ -0,0 +1,54 @@ +// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. + +mod rspack_bundle; +use std::sync::Arc; + +use deno_core::error::AnyError; + +use deno_terminal::colors; + +use crate::args::BundleFlags; +use crate::args::Flags; + +use crate::factory::CliFactory; +use crate::util; +use crate::tools::pack::rspack_bundle::rspack; +pub async fn pack( + flags: Arc, + bundle_flags: BundleFlags, +) -> Result<(), AnyError> { + log::info!( + "{}", + colors::yellow("⚠️ Warning: `deno bundle` is deprecated and will be removed in Deno 2.0.\nUse an alternative bundler like \"deno_emit\", \"esbuild\" or \"rollup\" instead."), + ); + + if let Some(watch_flags) = &bundle_flags.watch { + util::file_watcher::watch_func( + flags, + util::file_watcher::PrintConfig::new( + "Bundle", + !watch_flags.no_clear_screen, + ), + move |flags, watcher_communicator, _changed_paths| { + let bundle_flags = bundle_flags.clone(); + Ok(async move { + let factory = CliFactory::from_flags_for_watcher( + flags, + watcher_communicator.clone(), + ); + let cli_options = factory.cli_options()?; + let _ = watcher_communicator.watch_paths(cli_options.watch_paths()); + rspack(factory, &bundle_flags).await?; + + Ok(()) + }) + }, + ) + .await?; + } else { + let factory = CliFactory::from_flags(flags); + rspack(factory, &bundle_flags).await?; + } + + Ok(()) +} diff --git a/cli/tools/bundle/rspack_bundle.rs b/cli/tools/pack/rspack_bundle.rs similarity index 89% rename from cli/tools/bundle/rspack_bundle.rs rename to cli/tools/pack/rspack_bundle.rs index 8f053f3e154061..7f4f4855ec1cf8 100644 --- a/cli/tools/bundle/rspack_bundle.rs +++ b/cli/tools/pack/rspack_bundle.rs @@ -1,4 +1,5 @@ use std::path::Path; +use deno_core::error::AnyError; use rspack_ids::NaturalChunkIdsPlugin; use rspack_ids::NamedModuleIdsPlugin; use rspack_core::JavascriptParserOptions; @@ -6,7 +7,7 @@ use rspack_core::ModuleType; use rspack_core::ParserOptions; use rspack_core::ParserOptionsByModuleType; use rspack_core::{ - Builtins, CacheOptions, ChunkLoading, ChunkLoadingType, Compiler, CompilerOptions, Context, + CacheOptions, ChunkLoading, ChunkLoadingType, Compiler, CompilerOptions, Context, CrossOriginLoading, DevServerOptions, EntryOptions, Environment, Experiments, Filename, HashDigest, HashFunction, HashSalt, MangleExportsOption, Mode, ModuleOptions, Optimization, OutputOptions, PathInfo, Plugin, PublicPath, Resolve, SideEffectOption, SnapshotOptions, @@ -16,35 +17,32 @@ use rspack_fs::AsyncNativeFileSystem; use rspack_plugin_entry::EntryPlugin; use rspack_plugin_javascript::JsPlugin; use rspack_plugin_schemes::DataUriPlugin; -use serde_json::Map; -use serde_json::Value; use std::fs; +use crate::{CliFactory}; +use crate::args::BundleFlags; - -async fn pack() { +pub async fn rspack( + factory: CliFactory, + bundle_flags: &BundleFlags, +) -> Result<(), AnyError> { let output_filesystem = AsyncNativeFileSystem {}; - let root = env!("CARGO_MANIFEST_DIR"); - let context = Context::new(root.to_string()); - let dist: std::path::PathBuf = Path::new(root).join("./dist"); - if !dist.exists() { - fs::create_dir_all(&dist).expect("Failed to create dist directory"); - } - let dist = dist.canonicalize().unwrap(); - let entry_request: String = Path::new(root) - .join("./fixtures/index.js") + let root = std::env::current_dir().unwrap(); + let context = Context::from(root.clone()); + let entry_request: String = root + .join(bundle_flags.source_file.clone()) .canonicalize() .unwrap() .to_string_lossy() .to_string(); let options = CompilerOptions { - context: root.into(), + context: Context::from(root.clone()), dev_server: DevServerOptions::default(), output: OutputOptions { chunk_load_timeout: Default::default(), charset: Default::default(), css_head_data_compression: Default::default(), import_meta_name: Default::default(), - path: dist, + path: root.clone(), pathinfo: PathInfo::Bool(false), clean: false, public_path: PublicPath::Auto, @@ -85,7 +83,7 @@ async fn pack() { arrow_function: Some(true), }, }, - target: Target::new(&vec!["es2022".to_string()]).unwrap(), + target: Target::new(&vec!["es2022".to_string(), "node".to_string()]).unwrap(), mode: Mode::Development, resolve: Resolve { extensions: Some(vec![".js".to_string()]), @@ -133,7 +131,7 @@ async fn pack() { }, profile: false, bail: false, - __references: Map::::new(), + __references:Default::default(), node: None, }; let mut plugins: Vec> = Vec::new(); @@ -156,6 +154,7 @@ async fn pack() { plugins.push(Box::::default()); plugins.push(Box::::default()); plugins.push(Box::::default()); - let mut compiler = Compiler::new(options, plugins, output_filesystem); + let mut compiler = Compiler::new(options, plugins, output_filesystem, None,None); compiler.build().await.expect("build failed"); + Ok(()) } diff --git a/index.mjs b/index.mjs new file mode 100644 index 00000000000000..277a9f226412d0 --- /dev/null +++ b/index.mjs @@ -0,0 +1,2 @@ +import { answer } from './answer.mjs' +console.log('answer:',answer); \ No newline at end of file diff --git a/main.js b/main.js new file mode 100644 index 00000000000000..0f61269233ea7b --- /dev/null +++ b/main.js @@ -0,0 +1,42 @@ +"use strict"; +var __webpack_modules__ = ({ +"./answer.mjs": (function (__unused_webpack_module, __webpack_exports__) { +__webpack_require__.r(__webpack_exports__); +__webpack_require__.d(__webpack_exports__, { + answer: function() { return answer; } +}); +const answer = 42; + +}), + +}); +/************************************************************************/ +// The module cache +var __webpack_module_cache__ = {}; + +// The require function +function __webpack_require__(moduleId) { + +// Check if module is in cache +var cachedModule = __webpack_module_cache__[moduleId]; +if (cachedModule !== undefined) { +return cachedModule.exports; +} +// Create a new module (and put it into the cache) +var module = (__webpack_module_cache__[moduleId] = { +exports: {} +}); +// Execute the module function +__webpack_modules__[moduleId](module, module.exports, __webpack_require__); + +// Return the exports of the module +return module.exports; + +} + +/************************************************************************/ +var __webpack_exports__ = {}; +__webpack_require__.r(__webpack_exports__); +/* harmony import */var _answer_mjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./answer.mjs"); + +console.log('answer:',_answer_mjs__WEBPACK_IMPORTED_MODULE_0__.answer); diff --git a/runtime/tokio_util.rs b/runtime/tokio_util.rs index 0d81f6e235ee55..5d4ee3f2d25ad4 100644 --- a/runtime/tokio_util.rs +++ b/runtime/tokio_util.rs @@ -26,7 +26,8 @@ pub fn create_basic_runtime() -> tokio::runtime::Runtime { let (event_interval, global_queue_interval, max_io_events_per_tick) = tokio_configuration(); - tokio::runtime::Builder::new_current_thread() + tokio::runtime::Builder::new_multi_thread() + .enable_io() .enable_time() .event_interval(tokio_env("DENO_TOKIO_EVENT_INTERVAL", event_interval)) diff --git a/tests/util/server/Cargo.toml b/tests/util/server/Cargo.toml index a321501b85fdf6..a9fe378b74e723 100644 --- a/tests/util/server/Cargo.toml +++ b/tests/util/server/Cargo.toml @@ -45,7 +45,7 @@ regex.workspace = true reqwest.workspace = true rustls-pemfile.workspace = true rustls-tokio-stream.workspace = true -semver = "=1.0.14" +semver = "1.0.14" serde.workspace = true serde_json.workspace = true sha2.workspace = true From 5060d5bd67737a6d147e82020911a163d91bd9b9 Mon Sep 17 00:00:00 2001 From: hardfist Date: Mon, 12 Aug 2024 19:48:15 +0800 Subject: [PATCH 07/13] chore: fix runtime missing --- Cargo.lock | 22 +++++++++++++++++ Cargo.toml | 1 + cli/Cargo.toml | 1 + cli/main.rs | 1 - cli/tools/pack/rspack_bundle.rs | 5 ++-- index.mjs | 2 -- main.js | 42 --------------------------------- 7 files changed, 27 insertions(+), 47 deletions(-) delete mode 100644 index.mjs delete mode 100644 main.js diff --git a/Cargo.lock b/Cargo.lock index 6689696d4591ed..b04c2fa64d91a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1327,6 +1327,7 @@ dependencies = [ "rspack_ids", "rspack_plugin_entry", "rspack_plugin_javascript", + "rspack_plugin_runtime", "rspack_plugin_schemes", "runtimelib", "rustyline", @@ -6521,6 +6522,27 @@ dependencies = [ "url", ] +[[package]] +name = "rspack_plugin_runtime" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93bee3059688b01173069714619be3e2aa6bca70509792572f1f46e716d3bf3" +dependencies = [ + "async-trait", + "indexmap", + "itertools 0.13.0", + "rspack_collections", + "rspack_core", + "rspack_error", + "rspack_hash", + "rspack_hook", + "rspack_plugin_javascript", + "rspack_util", + "rustc-hash 1.1.0", + "serde_json", + "tracing", +] + [[package]] name = "rspack_plugin_schemes" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 3d3d93a85ea0a0..1502d52419d0a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -225,6 +225,7 @@ rspack_error = { version = "0.1.0"} rspack_core = { version = "0.1.0"} rspack_plugin_entry = { version = "0.1.0" } rspack_fs = { version = "0.1.0" } +rspack_plugin_runtime = { version = "0.1.0"} diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 4f0d085eb2ff4d..1e5c15a0a6aa37 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -167,6 +167,7 @@ rspack_error = { workspace = true} rspack_core = { workspace = true} rspack_plugin_entry = { workspace =true } rspack_fs = { workspace=true} +rspack_plugin_runtime = { workspace = true} swc_core = { version = "0.99.6"} [target.'cfg(windows)'.dependencies] diff --git a/cli/main.rs b/cli/main.rs index a38dcb0d4e142a..d0024387678b8e 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -1,5 +1,4 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. - mod args; mod auth_tokens; mod cache; diff --git a/cli/tools/pack/rspack_bundle.rs b/cli/tools/pack/rspack_bundle.rs index 7f4f4855ec1cf8..7d0c8a5a0fcc21 100644 --- a/cli/tools/pack/rspack_bundle.rs +++ b/cli/tools/pack/rspack_bundle.rs @@ -6,6 +6,7 @@ use rspack_core::JavascriptParserOptions; use rspack_core::ModuleType; use rspack_core::ParserOptions; use rspack_core::ParserOptionsByModuleType; +use rspack_plugin_runtime::{RuntimePlugin}; use rspack_core::{ CacheOptions, ChunkLoading, ChunkLoadingType, Compiler, CompilerOptions, Context, CrossOriginLoading, DevServerOptions, EntryOptions, Environment, Experiments, Filename, @@ -17,7 +18,6 @@ use rspack_fs::AsyncNativeFileSystem; use rspack_plugin_entry::EntryPlugin; use rspack_plugin_javascript::JsPlugin; use rspack_plugin_schemes::DataUriPlugin; -use std::fs; use crate::{CliFactory}; use crate::args::BundleFlags; @@ -52,7 +52,7 @@ pub async fn rspack( unique_name: "main".into(), chunk_loading: ChunkLoading::Enable(ChunkLoadingType::Import), chunk_loading_global: String::new(), - filename: Filename::from(String::from("[name].js")), + filename: Filename::from(String::from(bundle_flags.out_file.clone().unwrap_or("output.js".to_string()))), chunk_filename: Filename::from(String::from("[id].js")), cross_origin_loading: CrossOriginLoading::Disable, css_filename: Filename::from(String::from("[name].css")), @@ -154,6 +154,7 @@ pub async fn rspack( plugins.push(Box::::default()); plugins.push(Box::::default()); plugins.push(Box::::default()); + plugins.push(Box::::default()); let mut compiler = Compiler::new(options, plugins, output_filesystem, None,None); compiler.build().await.expect("build failed"); Ok(()) diff --git a/index.mjs b/index.mjs deleted file mode 100644 index 277a9f226412d0..00000000000000 --- a/index.mjs +++ /dev/null @@ -1,2 +0,0 @@ -import { answer } from './answer.mjs' -console.log('answer:',answer); \ No newline at end of file diff --git a/main.js b/main.js deleted file mode 100644 index 0f61269233ea7b..00000000000000 --- a/main.js +++ /dev/null @@ -1,42 +0,0 @@ -"use strict"; -var __webpack_modules__ = ({ -"./answer.mjs": (function (__unused_webpack_module, __webpack_exports__) { -__webpack_require__.r(__webpack_exports__); -__webpack_require__.d(__webpack_exports__, { - answer: function() { return answer; } -}); -const answer = 42; - -}), - -}); -/************************************************************************/ -// The module cache -var __webpack_module_cache__ = {}; - -// The require function -function __webpack_require__(moduleId) { - -// Check if module is in cache -var cachedModule = __webpack_module_cache__[moduleId]; -if (cachedModule !== undefined) { -return cachedModule.exports; -} -// Create a new module (and put it into the cache) -var module = (__webpack_module_cache__[moduleId] = { -exports: {} -}); -// Execute the module function -__webpack_modules__[moduleId](module, module.exports, __webpack_require__); - -// Return the exports of the module -return module.exports; - -} - -/************************************************************************/ -var __webpack_exports__ = {}; -__webpack_require__.r(__webpack_exports__); -/* harmony import */var _answer_mjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./answer.mjs"); - -console.log('answer:',_answer_mjs__WEBPACK_IMPORTED_MODULE_0__.answer); From 2847a42123a017550e61ebc8350a26bab9ded356 Mon Sep 17 00:00:00 2001 From: hardfist Date: Mon, 12 Aug 2024 21:44:12 +0800 Subject: [PATCH 08/13] chore: fix core --- cli/tools/pack/rspack_bundle.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cli/tools/pack/rspack_bundle.rs b/cli/tools/pack/rspack_bundle.rs index 7d0c8a5a0fcc21..878607a8d513e0 100644 --- a/cli/tools/pack/rspack_bundle.rs +++ b/cli/tools/pack/rspack_bundle.rs @@ -1,5 +1,7 @@ use std::path::Path; +use std::sync::Arc; use deno_core::error::AnyError; +use rspack_core::ResolverFactory; use rspack_ids::NaturalChunkIdsPlugin; use rspack_ids::NamedModuleIdsPlugin; use rspack_core::JavascriptParserOptions; @@ -148,6 +150,7 @@ pub async fn rspack( depend_on: None, layer: Default::default(), }; + let entry_plugin = Box::new(EntryPlugin::new(context, entry_request, plugin_options)); plugins.push(Box::::default()); plugins.push(entry_plugin); @@ -155,7 +158,9 @@ pub async fn rspack( plugins.push(Box::::default()); plugins.push(Box::::default()); plugins.push(Box::::default()); - let mut compiler = Compiler::new(options, plugins, output_filesystem, None,None); + let resolver_factory = Arc::new(ResolverFactory::new(options.resolve.clone())); + let loader_resolver_factory = Arc::new(ResolverFactory::new(options.resolve_loader.clone())); + let mut compiler = Compiler::new(options, plugins, output_filesystem, resolver_factory, loader_resolver_factory); compiler.build().await.expect("build failed"); Ok(()) } From 346d0c964d46c4f633126d4798a8bbab942c4d50 Mon Sep 17 00:00:00 2001 From: hardfist Date: Mon, 12 Aug 2024 23:02:43 +0800 Subject: [PATCH 09/13] chore: fix compile error --- answer.mjs | 3 ++- cli/main.rs | 11 +++++++---- cli/tools/pack.rs | 27 --------------------------- 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/answer.mjs b/answer.mjs index 7814b2b1c195ba..0c7725e1cfc8e3 100644 --- a/answer.mjs +++ b/answer.mjs @@ -1 +1,2 @@ -export const answer = 42; \ No newline at end of file +export const answer = 42; +console.log('answer:',answer) \ No newline at end of file diff --git a/cli/main.rs b/cli/main.rs index d0024387678b8e..dc2360d078b58e 100644 --- a/cli/main.rs +++ b/cli/main.rs @@ -105,10 +105,13 @@ async fn run_subcommand(flags: Arc) -> Result { tools::bench::run_benchmarks(flags, bench_flags).await } }), - DenoSubcommand::Bundle(bundle_flags) => spawn_subcommand(async { - //tools::bundle::bundle(flags, bundle_flags).await - tools::pack::pack(flags, bundle_flags).await - }), + DenoSubcommand::Bundle(bundle_flags) => { + let result = tokio::spawn(async move { + //tools::bundle::bundle(flags, bundle_flags).await + tools::pack::pack(flags, bundle_flags).await + }).await; + return result.map(|_| 0).map_err(|e|e.into()); + }, DenoSubcommand::Doc(doc_flags) => { spawn_subcommand(async { tools::doc::doc(flags, doc_flags).await }) } diff --git a/cli/tools/pack.rs b/cli/tools/pack.rs index baadca8c0a1cfe..304d14753b0136 100644 --- a/cli/tools/pack.rs +++ b/cli/tools/pack.rs @@ -21,34 +21,7 @@ pub async fn pack( "{}", colors::yellow("⚠️ Warning: `deno bundle` is deprecated and will be removed in Deno 2.0.\nUse an alternative bundler like \"deno_emit\", \"esbuild\" or \"rollup\" instead."), ); - - if let Some(watch_flags) = &bundle_flags.watch { - util::file_watcher::watch_func( - flags, - util::file_watcher::PrintConfig::new( - "Bundle", - !watch_flags.no_clear_screen, - ), - move |flags, watcher_communicator, _changed_paths| { - let bundle_flags = bundle_flags.clone(); - Ok(async move { - let factory = CliFactory::from_flags_for_watcher( - flags, - watcher_communicator.clone(), - ); - let cli_options = factory.cli_options()?; - let _ = watcher_communicator.watch_paths(cli_options.watch_paths()); - rspack(factory, &bundle_flags).await?; - - Ok(()) - }) - }, - ) - .await?; - } else { let factory = CliFactory::from_flags(flags); rspack(factory, &bundle_flags).await?; - } - Ok(()) } From 3e8fc6b1d467b6a676aca1a4b1bb8af82f6a4986 Mon Sep 17 00:00:00 2001 From: hardfist Date: Mon, 12 Aug 2024 23:59:26 +0800 Subject: [PATCH 10/13] chore: fix deno_emit error --- Cargo.lock | 3 +-- Cargo.toml | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b04c2fa64d91a2..64444b0ada29af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1602,8 +1602,7 @@ dependencies = [ [[package]] name = "deno_emit" version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a22b37181789a1b04ef823c168a194e821f8f3145d9d9d6b4da4207eba807d" +source = "git+https://github.com/hardfist/deno_emit?branch=concurrent#21e0828d88dbcde7252f087062059ee2df74600d" dependencies = [ "anyhow", "base64 0.21.7", diff --git a/Cargo.toml b/Cargo.toml index 1502d52419d0a2..4dd4fcc2662c32 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -230,7 +230,9 @@ rspack_plugin_runtime = { version = "0.1.0"} [patch.crates-io] +# patch to use Arc instead of Lrc to support concurrent deno_ast = { git="https://github.com/hardfist/deno_ast", branch = "yj/concurrent_ast"} +deno_emit = { git="https://github.com/hardfist/deno_emit", branch = "concurrent"} # NB: the `bench` and `release` profiles must remain EXACTLY the same. From 501552b17d5a44367c9508959dfbdcdda9af47a7 Mon Sep 17 00:00:00 2001 From: hardfist Date: Mon, 12 Aug 2024 23:59:51 +0800 Subject: [PATCH 11/13] chore: remove unnecessary files --- answer.mjs | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 answer.mjs diff --git a/answer.mjs b/answer.mjs deleted file mode 100644 index 0c7725e1cfc8e3..00000000000000 --- a/answer.mjs +++ /dev/null @@ -1,2 +0,0 @@ -export const answer = 42; -console.log('answer:',answer) \ No newline at end of file From 5e872a62128a8a9b4a8519ff384e88704430b75f Mon Sep 17 00:00:00 2001 From: hardfist Date: Tue, 13 Aug 2024 00:06:29 +0800 Subject: [PATCH 12/13] chore: improve logs --- cli/tools/pack.rs | 2 +- tests/testdata/bundle/npm_import/answer.mjs | 1 + tests/testdata/bundle/npm_import/index.mjs | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 tests/testdata/bundle/npm_import/answer.mjs create mode 100644 tests/testdata/bundle/npm_import/index.mjs diff --git a/cli/tools/pack.rs b/cli/tools/pack.rs index 304d14753b0136..e9d50ec4015ff2 100644 --- a/cli/tools/pack.rs +++ b/cli/tools/pack.rs @@ -19,7 +19,7 @@ pub async fn pack( ) -> Result<(), AnyError> { log::info!( "{}", - colors::yellow("⚠️ Warning: `deno bundle` is deprecated and will be removed in Deno 2.0.\nUse an alternative bundler like \"deno_emit\", \"esbuild\" or \"rollup\" instead."), + colors::yellow("⚠️ Using Rspack to Bundle"), ); let factory = CliFactory::from_flags(flags); rspack(factory, &bundle_flags).await?; diff --git a/tests/testdata/bundle/npm_import/answer.mjs b/tests/testdata/bundle/npm_import/answer.mjs new file mode 100644 index 00000000000000..7814b2b1c195ba --- /dev/null +++ b/tests/testdata/bundle/npm_import/answer.mjs @@ -0,0 +1 @@ +export const answer = 42; \ No newline at end of file diff --git a/tests/testdata/bundle/npm_import/index.mjs b/tests/testdata/bundle/npm_import/index.mjs new file mode 100644 index 00000000000000..68120305f78aa9 --- /dev/null +++ b/tests/testdata/bundle/npm_import/index.mjs @@ -0,0 +1,2 @@ +import { answer } from "./answer.mjs"; +console.log(answer); \ No newline at end of file From ae9a11dd7d86bb0e01d1687e421be0643ab6fe5e Mon Sep 17 00:00:00 2001 From: hardfist Date: Tue, 13 Aug 2024 00:16:44 +0800 Subject: [PATCH 13/13] chore: clear warning --- cli/tools/bundle.rs | 2 +- cli/tools/pack.rs | 1 - cli/tools/pack/rspack_bundle.rs | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cli/tools/bundle.rs b/cli/tools/bundle.rs index cf3787f6d5f953..c7a97855154207 100644 --- a/cli/tools/bundle.rs +++ b/cli/tools/bundle.rs @@ -14,7 +14,7 @@ use crate::factory::CliFactory; use crate::graph_util::error_for_any_npm_specifier; use crate::util; use crate::util::display; - +#[allow(dead_code)] pub async fn bundle( flags: Arc, bundle_flags: BundleFlags, diff --git a/cli/tools/pack.rs b/cli/tools/pack.rs index e9d50ec4015ff2..c8a7b32d1ad576 100644 --- a/cli/tools/pack.rs +++ b/cli/tools/pack.rs @@ -11,7 +11,6 @@ use crate::args::BundleFlags; use crate::args::Flags; use crate::factory::CliFactory; -use crate::util; use crate::tools::pack::rspack_bundle::rspack; pub async fn pack( flags: Arc, diff --git a/cli/tools/pack/rspack_bundle.rs b/cli/tools/pack/rspack_bundle.rs index 878607a8d513e0..7b6e62799efa0b 100644 --- a/cli/tools/pack/rspack_bundle.rs +++ b/cli/tools/pack/rspack_bundle.rs @@ -1,4 +1,3 @@ -use std::path::Path; use std::sync::Arc; use deno_core::error::AnyError; use rspack_core::ResolverFactory; @@ -24,7 +23,7 @@ use crate::{CliFactory}; use crate::args::BundleFlags; pub async fn rspack( - factory: CliFactory, + _factory: CliFactory, bundle_flags: &BundleFlags, ) -> Result<(), AnyError> { let output_filesystem = AsyncNativeFileSystem {};