diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock index 32b5ebb1f6e3e..a7aa03fddc670 100644 --- a/packages/next-swc/Cargo.lock +++ b/packages/next-swc/Cargo.lock @@ -165,9 +165,9 @@ dependencies = [ [[package]] name = "binding_macros" -version = "0.19.4" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee99add2bcb359734864c99dc0c6088b17aa0b9d3f49bba75d1fb816766a2857" +checksum = "6926cc6c93d6d87ea1d81a87860997cd09f3125030711a237af2dd2952558b87" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2866,9 +2866,9 @@ dependencies = [ [[package]] name = "string_enum" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f584cc881e9e5f1fd6bf827b0444aa94c30d8fe6378cf241071b5f5700b2871f" +checksum = "994453cd270ad0265796eb24abf5540091ed03e681c5f3c12bc33e4db33253e1" dependencies = [ "pmutil", "proc-macro2", @@ -2943,9 +2943,9 @@ dependencies = [ [[package]] name = "swc" -version = "0.231.4" +version = "0.232.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52b4fa8bd71c6b15a06d2c4b17fe3f73887ee3b90eb42a27c421905195512183" +checksum = "7dd4abf900c2c08f70ebfb1d7cbe34ea590eb0902caeec421b1dd52a91264bd8" dependencies = [ "ahash", "anyhow", @@ -3007,9 +3007,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.191.4" +version = "0.192.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1921c44d8d05200da2e82e22670d8eb1d674d45749530260c75c3e61b390d7b" +checksum = "d0df0efb0f03b0eb93dd842aafeaceac94b9f5bb593e233e8906cd3666adaa1b" dependencies = [ "ahash", "anyhow", @@ -3056,9 +3056,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.29.4" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b79bef6a4a4a7f273c51f64a61ad601c3b9b101f41f9d43a202832620c2f8cd" +checksum = "34875a019a869ae0e9af55100df92df710e4cba7708cb80e210e24d94b214e72" dependencies = [ "ahash", "anyhow", @@ -3089,9 +3089,9 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc17721410f3f12aeb42dcb99528350adf122681ab4796e48c2cfc0bda0c752c" +checksum = "77bb8e139b2c50858ba9d259df6598ecbe3d266949c1c692938f6f17b894e04d" dependencies = [ "anyhow", "indexmap", @@ -3115,9 +3115,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.29.5" +version = "0.32.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b86736f8670ced8ad8fc72b78a0aea2b812b944254c9e9d0aa7347d2c92b7b" +checksum = "bfc1277188ca41edb57f6ea5159a31b65757c65ba6d7cc6d7237d782a3c65859" dependencies = [ "binding_macros", "swc", @@ -3153,9 +3153,9 @@ dependencies = [ [[package]] name = "swc_css_ast" -version = "0.114.6" +version = "0.116.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35da1b34ed1a4013bf1b047e7c495b68227a2c0fccbb892d1cb62655252aa147" +checksum = "62956b962258a226a89ca9ab946949573ffa15e1c616351b93f8747bbc187818" dependencies = [ "is-macro", "serde", @@ -3166,9 +3166,9 @@ dependencies = [ [[package]] name = "swc_css_codegen" -version = "0.124.6" +version = "0.126.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "815260af29653310c9ecb0677df26d35bae47aca1c9638513e2872d591ab5acf" +checksum = "a99a3bca41c579f6f12fc039bc0793b349a975c0d45bdc30015ab4205ce60326" dependencies = [ "auto_impl", "bitflags", @@ -3196,9 +3196,9 @@ dependencies = [ [[package]] name = "swc_css_parser" -version = "0.123.6" +version = "0.125.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac51eca7321466b299cb4385648a64ad5c847a4d1d554eff3019828b450a1f3" +checksum = "a245259501b5f8dc21d746bc1e1280b5727701c2ef6defeaf02ef99999412d2b" dependencies = [ "bitflags", "lexical", @@ -3210,9 +3210,9 @@ dependencies = [ [[package]] name = "swc_css_prefixer" -version = "0.125.6" +version = "0.127.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e43efaf76c1fb4cb1243f6616045b4786e706e3e5b4a7f42861fc39a136d2069" +checksum = "58fba187856209952c72f2bc70a5a931f1b081687d5e2a7009ab5a7bd34fec9f" dependencies = [ "once_cell", "preset_env_base", @@ -3227,9 +3227,9 @@ dependencies = [ [[package]] name = "swc_css_utils" -version = "0.111.6" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ea175bc397cb77f3811eab3a5649c1842cb12614e3c6dc8f6e0bee76ad5aec" +checksum = "a80276b47f1a8618882a2e4763f3b588bd0ed2dda20e797c2c6aaa9e6189b4e5" dependencies = [ "once_cell", "serde", @@ -3242,9 +3242,9 @@ dependencies = [ [[package]] name = "swc_css_visit" -version = "0.113.6" +version = "0.115.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968d3e48b28e760362c8b00670b52ec60e9e7381db0b45371418e93d7ba01062" +checksum = "3ca311204de3378c939b2446ab1c821df7e3fa48d04fe0831bdc9cda9439431f" dependencies = [ "serde", "swc_atoms", @@ -3255,9 +3255,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.94.4" +version = "0.94.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f35e76f46d51a118ac4a5e08eb4df855a33f8ec764dbdffe7cbe5066e08d82a" +checksum = "dd2f6295690cbee3bee91287f8945cfcf928c6103f9dc03625f101f56ab5cac5" dependencies = [ "bitflags", "is-macro", @@ -3273,9 +3273,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.127.7" +version = "0.127.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc8e054b412f4def211ecfe1f365b3f77e3284706f877b6c7870f50831d0168" +checksum = "0dab60b7c804d249cf4b365f660dab99d4547fd34c52cffd09f2c670417da051" dependencies = [ "memchr", "num-bigint", @@ -3305,9 +3305,9 @@ dependencies = [ [[package]] name = "swc_ecma_ext_transforms" -version = "0.91.6" +version = "0.91.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c028ca81905c093608f5ad84b9e78376ad2b0c1886edff4a99915711932bf155" +checksum = "7bba9c9dd8ba923bee98220b4e5b39647c48f2587ea6cd85c80d01e498e12952" dependencies = [ "phf", "swc_atoms", @@ -3319,9 +3319,9 @@ dependencies = [ [[package]] name = "swc_ecma_lints" -version = "0.66.11" +version = "0.66.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9404193770f98c09d0a785117ae7aa2bd33f79ce4aa87c53625f4d4cbabdf717" +checksum = "f13cb845054f2b87e4371bf0d6bef6ebb79504036285491e8360253ba4bd6cab" dependencies = [ "ahash", "auto_impl", @@ -3340,9 +3340,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.41.4" +version = "0.41.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7e4ef6069a6a03fcb31a139c429211f843225c2c4c256d1f972e86e02f53b4" +checksum = "b0d35f96f058faee2c5f789efa3b88a42f00a80e26c421d5fa63ce3e95a61a57" dependencies = [ "ahash", "anyhow", @@ -3362,9 +3362,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.158.4" +version = "0.159.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f011dcf9af87cc74ca0854062ba191cb2c556ea2f2ff3dcb9b3968a8fe89a31" +checksum = "8336a7595c247b77ec9e053fd9f789f2f6da85cb2ccd1fb4101d1b8568fec1e6" dependencies = [ "ahash", "arrayvec", @@ -3396,9 +3396,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.122.5" +version = "0.122.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d040a13b3c39514255d161345b2730c9fbf52f02ad579a0a68a05af039247b5" +checksum = "329461400909b1ea072cdef4c2ca1563129a8572be94af23d25f968a17a3e126" dependencies = [ "either", "enum_kind", @@ -3415,9 +3415,9 @@ dependencies = [ [[package]] name = "swc_ecma_preset_env" -version = "0.173.2" +version = "0.174.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0f6d56561bfe1b58e54bcf282aa117aa64dc432f72a59fcea7bb3f3af901c3" +checksum = "523f0623eaac6b7ba784b1ead08e4ea130afb17e6a1218f609dbc8a61f713691" dependencies = [ "ahash", "anyhow", @@ -3440,9 +3440,9 @@ dependencies = [ [[package]] name = "swc_ecma_testing" -version = "0.20.5" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a09d0c939e8e691b27f91f430067ad0acca688a3e805b459956fd338966e87" +checksum = "21ecc467eff7ef4ec0a64919402b94da637003015d019de4d649e8efeceafd3f" dependencies = [ "anyhow", "hex", @@ -3456,9 +3456,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms" -version = "0.197.2" +version = "0.198.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7873d4a6ce07f34f256645c731ec4c64bff0430b0c2be200932b3ff0cf39df5" +checksum = "95550fcf15bb60c8bd73951c6747ce953908b816f3e0ce54ed051682b65a72f9" dependencies = [ "swc_atoms", "swc_common", @@ -3476,9 +3476,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.111.12" +version = "0.111.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e8771e64d9c19b9ac78c38b6fccc1ec1f2e964e4e928e291cb95540636b8cb1" +checksum = "0381b4ce41c1db89e60e54ab419bb73c7f538f1fb71eed92d0a4cddd4033cafb" dependencies = [ "better_scoped_tls", "bitflags", @@ -3499,9 +3499,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.100.11" +version = "0.100.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a19903a8e999083e5199300ae89650e3e0ba9dce988c09db4876b14199e30ce" +checksum = "8c810ba2e3e7bb1dadf7eb964fc833dd32b53aab79652fe41a4954f85237707d" dependencies = [ "swc_atoms", "swc_common", @@ -3513,9 +3513,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.135.2" +version = "0.136.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f475ba65bdeda2dd3bae29d2285c7a8c98fb22f35dc8ef8ed29a0cc07423441" +checksum = "e232fb578d97cceb477f7349b51eff468c4adc7fbd2a6c3812ec7a4bb889e593" dependencies = [ "ahash", "arrayvec", @@ -3554,9 +3554,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_module" -version = "0.152.2" +version = "0.153.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f03ae8b6d654cb2fd02c731988ec7db918b55e6fe0c59a17ee583e3e05227fb" +checksum = "a81fc39c2caa6217abfc595473a307512ced8f259baf88a7ddae47ccaa7dbf1e" dependencies = [ "Inflector", "ahash", @@ -3582,9 +3582,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.166.2" +version = "0.167.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b972d650531005a50dd4a2b90b924c998203308042f73fb3ae746be5f3e00584" +checksum = "ab9eb6b6a30a9e7839b35559a218ee63ce9040db8ee81260fcf6db546e918b83" dependencies = [ "ahash", "dashmap", @@ -3608,9 +3608,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.143.2" +version = "0.144.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa530c88885bf8d7553b3e2aacd7d4806b802ceb9759b610582f21c540b4051b" +checksum = "3fba607ba207810f46f1015033b92a5c054f492a41d2d0a1e5a17fa1926b6073" dependencies = [ "either", "serde", @@ -3627,9 +3627,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.154.2" +version = "0.155.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ecaf9321c93fca23f1112a80716f25cdd82232f89862ac799ea4c50deb01b3" +checksum = "5e52fc964f6fd0b0348096c56a241883d711233bac796cf6486612a3d4dae549" dependencies = [ "ahash", "base64", @@ -3654,16 +3654,18 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.113.11" +version = "0.114.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb46ef1f434c80d66ba971e3f6908fa625a11d0658ccff378256a2814f416e2" +checksum = "e4d1f8d8e7204032efb8ee9abce93e9465f2738a261b5c0f38b1f280793980b9" dependencies = [ "ansi_term", "anyhow", + "base64", "hex", "serde", "serde_json", "sha-1", + "sourcemap", "swc_common", "swc_ecma_ast", "swc_ecma_codegen", @@ -3678,9 +3680,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.158.2" +version = "0.159.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51db159e63caae3bf41b754f34a8930e2f2e0852394d270ba7f42bb44f2b10f8" +checksum = "d0cbc30331fa65792d3942abdf0f597905653fe212ac035aeae7ab163e4f76b8" dependencies = [ "serde", "swc_atoms", @@ -3694,9 +3696,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.105.6" +version = "0.105.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1064b08af03fe7ea2887cf80d4b3200544158520e324abe48d3b57eab31317" +checksum = "dbec1685dd0a16a4784d1a8f9c7416a684b084154fcb9360316b8bbd464eef4f" dependencies = [ "indexmap", "num_cpus", @@ -3712,9 +3714,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.80.4" +version = "0.80.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e5e96387513533be7c2094aefd1cb7ab05b17477def007fd709ea00d730e2" +checksum = "e28a10555d75328f954c168caf204e407c970b527ecd294c95b7ca8e4a959255" dependencies = [ "num-bigint", "swc_atoms", @@ -3756,9 +3758,9 @@ dependencies = [ [[package]] name = "swc_error_reporters" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7e3246738064b3b5c151638eeb8b71701711e5aec2002fbe083793dacdf412" +checksum = "87c296e1d533b27fb738b6ec1d2b8d44845e61f6ad373e042fb2cf8b5416b561" dependencies = [ "anyhow", "miette", @@ -3769,9 +3771,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.17.4" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1c896c7b96b1af515498979546dd8a00bf892fde1f727d32ad6ae9461e38bc2" +checksum = "1206921ee3d7c5b4f9211a3c1cc56a9f0839437c8133511cf57e8d9c13b2c4bc" dependencies = [ "ahash", "indexmap", @@ -3781,9 +3783,9 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.18.4" +version = "0.18.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e691625cb09e967935f499a13eb1fb6db0b03c9714de1fa83d872ee81c261c" +checksum = "a0e5b87736c72988c9437525a9de16d94179de20ea31fb9fcd2b1ced79ec3f93" dependencies = [ "ahash", "auto_impl", @@ -3816,9 +3818,9 @@ dependencies = [ [[package]] name = "swc_node_comments" -version = "0.16.4" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d17400e0f0175824465905e006cd02d7c5df765fe8d0508e5d1b91da19e6b61" +checksum = "a1f0ac98ee6c95c69b78a20f7f6abbc70ceaab00902033861c0437cc5baec8af" dependencies = [ "ahash", "dashmap", @@ -3828,9 +3830,9 @@ dependencies = [ [[package]] name = "swc_plugin_proxy" -version = "0.22.4" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2270658050fd6b570339138103b0a22a62336d62e3af7b44dc8cd60b29f681c" +checksum = "d66076da80105bb86f4c0b8a5776d663774ca59e9f1125d42d81905f73cb4653" dependencies = [ "better_scoped_tls", "rkyv", @@ -3842,9 +3844,9 @@ dependencies = [ [[package]] name = "swc_plugin_runner" -version = "0.77.5" +version = "0.77.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5ef3d009b91af32a3d5195ddda48c32cbe7fb1169f93cba7d43cbb53a24ce0" +checksum = "d3565cb5b0a4daf32918e683f65863dceed470369b56fde8fd2a759a59ad011e" dependencies = [ "anyhow", "once_cell", @@ -3862,9 +3864,9 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.17.4" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90d1d5acb5f25421d1c528c58b413553080329307b972a0fc004385ee8e8be9" +checksum = "44209841ce5f00bef5dd32b1de5840143488b3c7f690b817b79e23c6a75dd4ad" dependencies = [ "tracing", ] @@ -3956,9 +3958,9 @@ dependencies = [ [[package]] name = "testing" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542cacf565846829c5ab5bcf64f601a1f412b1de5fcc9d4b1f5297926c16fddf" +checksum = "1e7d110e76eb708ab08846d2c52cf54c56e3c97e704809fced27b78db2ef444e" dependencies = [ "ansi_term", "difference", diff --git a/packages/next-swc/crates/core/Cargo.toml b/packages/next-swc/crates/core/Cargo.toml index b518a53fe121d..660bc6f1f1fd5 100644 --- a/packages/next-swc/crates/core/Cargo.toml +++ b/packages/next-swc/crates/core/Cargo.toml @@ -45,9 +45,9 @@ swc_core = { features = [ "ecma_parser_typescript", "cached", "base" -], version = "0.29.5" } +], version = "0.32.8" } [dev-dependencies] -swc_core = { features = ["testing_transform"], version = "0.29.5" } -testing = "0.31.4" +swc_core = { features = ["testing_transform"], version = "0.32.8" } +testing = "0.31.5" walkdir = "2.3.2" diff --git a/packages/next-swc/crates/core/tests/errors.rs b/packages/next-swc/crates/core/tests/errors.rs index 73010669cd7ce..303262c1356e6 100644 --- a/packages/next-swc/crates/core/tests/errors.rs +++ b/packages/next-swc/crates/core/tests/errors.rs @@ -8,8 +8,10 @@ use next_swc::{ use std::path::PathBuf; use swc_core::{ common::FileName, - ecma::parser::{EsConfig, Syntax}, - ecma::transforms::testing::test_fixture_allowing_error, + ecma::{ + parser::{EsConfig, Syntax}, + transforms::testing::{test_fixture, FixtureTestConfig}, + }, }; use testing::fixture; @@ -23,18 +25,22 @@ fn syntax() -> Syntax { #[fixture("tests/errors/re-export-all-in-page/**/input.js")] fn re_export_all_in_page(input: PathBuf) { let output = input.parent().unwrap().join("output.js"); - test_fixture_allowing_error( + test_fixture( syntax(), &|_tr| disallow_re_export_all_in_page(true), &input, &output, + FixtureTestConfig { + allow_error: true, + ..Default::default() + }, ); } #[fixture("tests/errors/next-dynamic/**/input.js")] fn next_dynamic_errors(input: PathBuf) { let output = input.parent().unwrap().join("output.js"); - test_fixture_allowing_error( + test_fixture( syntax(), &|_tr| { next_dynamic( @@ -46,24 +52,32 @@ fn next_dynamic_errors(input: PathBuf) { }, &input, &output, + FixtureTestConfig { + allow_error: true, + ..Default::default() + }, ); } #[fixture("tests/errors/next-ssg/**/input.js")] fn next_ssg_errors(input: PathBuf) { let output = input.parent().unwrap().join("output.js"); - test_fixture_allowing_error( + test_fixture( syntax(), &|_tr| next_ssg(Default::default()), &input, &output, + FixtureTestConfig { + allow_error: true, + ..Default::default() + }, ); } #[fixture("tests/errors/react-server-components/server-graph/**/input.js")] fn react_server_components_server_graph_errors(input: PathBuf) { let output = input.parent().unwrap().join("output.js"); - test_fixture_allowing_error( + test_fixture( syntax(), &|tr| { server_components( @@ -76,13 +90,17 @@ fn react_server_components_server_graph_errors(input: PathBuf) { }, &input, &output, + FixtureTestConfig { + allow_error: true, + ..Default::default() + }, ); } #[fixture("tests/errors/react-server-components/client-graph/**/input.js")] fn react_server_components_client_graph_errors(input: PathBuf) { let output = input.parent().unwrap().join("output.js"); - test_fixture_allowing_error( + test_fixture( syntax(), &|tr| { server_components( @@ -95,13 +113,17 @@ fn react_server_components_client_graph_errors(input: PathBuf) { }, &input, &output, + FixtureTestConfig { + allow_error: true, + ..Default::default() + }, ); } #[fixture("tests/errors/next-font-loaders/**/input.js")] fn next_font_loaders_errors(input: PathBuf) { let output = input.parent().unwrap().join("output.js"); - test_fixture_allowing_error( + test_fixture( syntax(), &|_tr| { next_font_loaders(FontLoaderConfig { @@ -111,5 +133,9 @@ fn next_font_loaders_errors(input: PathBuf) { }, &input, &output, + FixtureTestConfig { + allow_error: true, + ..Default::default() + }, ); } diff --git a/packages/next-swc/crates/core/tests/fixture.rs b/packages/next-swc/crates/core/tests/fixture.rs index 104e8d26fb3e9..cc7f9cd85b334 100644 --- a/packages/next-swc/crates/core/tests/fixture.rs +++ b/packages/next-swc/crates/core/tests/fixture.rs @@ -29,7 +29,13 @@ fn syntax() -> Syntax { #[fixture("tests/fixture/amp/**/input.js")] fn amp_attributes_fixture(input: PathBuf) { let output = input.parent().unwrap().join("output.js"); - test_fixture(syntax(), &|_tr| amp_attributes(), &input, &output); + test_fixture( + syntax(), + &|_tr| amp_attributes(), + &input, + &output, + Default::default(), + ); } #[fixture("tests/fixture/next-dynamic/**/input.js")] @@ -49,6 +55,7 @@ fn next_dynamic_fixture(input: PathBuf) { }, &input, &output_dev, + Default::default(), ); test_fixture( syntax(), @@ -62,6 +69,7 @@ fn next_dynamic_fixture(input: PathBuf) { }, &input, &output_prod, + Default::default(), ); test_fixture( syntax(), @@ -75,6 +83,7 @@ fn next_dynamic_fixture(input: PathBuf) { }, &input, &output_server, + Default::default(), ); } @@ -106,13 +115,20 @@ fn next_ssg_fixture(input: PathBuf) { }, &input, &output, + Default::default(), ); } #[fixture("tests/fixture/page-config/**/input.js")] fn page_config_fixture(input: PathBuf) { let output = input.parent().unwrap().join("output.js"); - test_fixture(syntax(), &|_tr| page_config_test(), &input, &output); + test_fixture( + syntax(), + &|_tr| page_config_test(), + &input, + &output, + Default::default(), + ); } #[fixture("tests/fixture/relay/**/input.ts*")] @@ -134,6 +150,7 @@ fn relay_no_artifact_dir_fixture(input: PathBuf) { }, &input, &output, + Default::default(), ); } @@ -145,6 +162,7 @@ fn remove_console_fixture(input: PathBuf) { &|_tr| remove_console(next_swc::remove_console::Config::All(true)), &input, &output, + Default::default(), ); } @@ -156,6 +174,7 @@ fn react_remove_properties_default_fixture(input: PathBuf) { &|_tr| remove_properties(next_swc::react_remove_properties::Config::All(true)), &input, &output, + Default::default(), ); } @@ -173,6 +192,7 @@ fn react_remove_properties_custom_fixture(input: PathBuf) { }, &input, &output, + Default::default(), ); } @@ -194,6 +214,7 @@ fn shake_exports_fixture(input: PathBuf) { }, &input, &output, + Default::default(), ); } @@ -209,6 +230,7 @@ fn shake_exports_fixture_default(input: PathBuf) { }, &input, &output, + Default::default(), ); } @@ -228,6 +250,7 @@ fn react_server_components_server_graph_fixture(input: PathBuf) { }, &input, &output, + Default::default(), ); } @@ -247,6 +270,7 @@ fn react_server_components_client_graph_fixture(input: PathBuf) { }, &input, &output, + Default::default(), ); } @@ -263,5 +287,6 @@ fn next_font_loaders_fixture(input: PathBuf) { }, &input, &output, + Default::default(), ); } diff --git a/packages/next-swc/crates/emotion/Cargo.toml b/packages/next-swc/crates/emotion/Cargo.toml index 80129ece62016..db5c9a4aa46e5 100644 --- a/packages/next-swc/crates/emotion/Cargo.toml +++ b/packages/next-swc/crates/emotion/Cargo.toml @@ -19,9 +19,9 @@ regex = "1.5" serde = "1" sourcemap = "6.0.1" tracing = { version = "0.1.32", features = ["release_max_level_info"] } -swc_core = { features = ["common", "ecma_ast","ecma_codegen", "ecma_utils", "ecma_visit", "trace_macro"], version = "0.29.5" } +swc_core = { features = ["common", "ecma_ast","ecma_codegen", "ecma_utils", "ecma_visit", "trace_macro"], version = "0.32.8" } [dev-dependencies] -swc_core = { features = ["testing_transform", "ecma_transforms_react"], version = "0.29.5" } -testing = "0.31.4" +swc_core = { features = ["testing_transform", "ecma_transforms_react"], version = "0.32.8" } +testing = "0.31.5" serde_json = "1" diff --git a/packages/next-swc/crates/emotion/tests/fixture.rs b/packages/next-swc/crates/emotion/tests/fixture.rs index 1068a3d8cd158..732ba23925569 100644 --- a/packages/next-swc/crates/emotion/tests/fixture.rs +++ b/packages/next-swc/crates/emotion/tests/fixture.rs @@ -59,5 +59,6 @@ fn next_emotion_fixture(input: PathBuf) { }, &input, &output, + Default::default(), ); } diff --git a/packages/next-swc/crates/modularize_imports/Cargo.toml b/packages/next-swc/crates/modularize_imports/Cargo.toml index f352727f79582..97b7e29a8a96a 100644 --- a/packages/next-swc/crates/modularize_imports/Cargo.toml +++ b/packages/next-swc/crates/modularize_imports/Cargo.toml @@ -15,8 +15,8 @@ handlebars = "4.2.1" once_cell = "1.13.0" regex = "1.5" serde = "1" -swc_core = { features = ["cached", "ecma_ast", "ecma_visit"], version = "0.29.5" } +swc_core = { features = ["cached", "ecma_ast", "ecma_visit"], version = "0.32.8" } [dev-dependencies] -swc_core = { features = ["testing_transform"], version = "0.29.5" } -testing = "0.31.4" +swc_core = { features = ["testing_transform"], version = "0.32.8" } +testing = "0.31.5" diff --git a/packages/next-swc/crates/modularize_imports/tests/fixture.rs b/packages/next-swc/crates/modularize_imports/tests/fixture.rs index 1f17c81978de1..5e5c0dbbb5768 100644 --- a/packages/next-swc/crates/modularize_imports/tests/fixture.rs +++ b/packages/next-swc/crates/modularize_imports/tests/fixture.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use modularize_imports::{modularize_imports, PackageConfig}; use swc_core::{ ecma::parser::{EsConfig, Syntax}, - ecma::transforms::testing::test_fixture, + ecma::transforms::testing::{test_fixture, FixtureTestConfig}, }; use testing::fixture; @@ -61,5 +61,8 @@ fn modularize_imports_fixture(input: PathBuf) { }, &input, &output, + FixtureTestConfig { + ..Default::default() + }, ); } diff --git a/packages/next-swc/crates/napi/Cargo.toml b/packages/next-swc/crates/napi/Cargo.toml index e8c87f7deeb1e..d8cd0b10472fe 100644 --- a/packages/next-swc/crates/napi/Cargo.toml +++ b/packages/next-swc/crates/napi/Cargo.toml @@ -49,7 +49,7 @@ swc_core = { features = [ "ecma_transforms_typescript", "ecma_utils", "ecma_visit" -], version = "0.29.5" } +], version = "0.32.8" } tracing = { version = "0.1.32", features = ["release_max_level_info"] } tracing-futures = "0.2.5" tracing-subscriber = "0.3.9" diff --git a/packages/next-swc/crates/styled_components/Cargo.toml b/packages/next-swc/crates/styled_components/Cargo.toml index 72a049919ce12..ca8d81fb6eebf 100644 --- a/packages/next-swc/crates/styled_components/Cargo.toml +++ b/packages/next-swc/crates/styled_components/Cargo.toml @@ -21,13 +21,13 @@ swc_core = { features = [ "ecma_ast", "ecma_utils", "ecma_visit" -], version = "0.29.5" } +], version = "0.32.8" } [dev-dependencies] serde_json = "1" -testing = "0.31.4" +testing = "0.31.5" swc_core = { features = [ "ecma_parser", "ecma_transforms", "testing_transform" -], version = "0.29.5" } +], version = "0.32.8" } diff --git a/packages/next-swc/crates/styled_components/tests/fixture.rs b/packages/next-swc/crates/styled_components/tests/fixture.rs index 509ac5bc6c214..f2fb43aede468 100644 --- a/packages/next-swc/crates/styled_components/tests/fixture.rs +++ b/packages/next-swc/crates/styled_components/tests/fixture.rs @@ -32,5 +32,6 @@ fn fixture(input: PathBuf) { }, &input, &dir.join("output.js"), + Default::default(), ) } diff --git a/packages/next-swc/crates/styled_jsx/Cargo.toml b/packages/next-swc/crates/styled_jsx/Cargo.toml index 21246913d466d..b4ab129a454dd 100644 --- a/packages/next-swc/crates/styled_jsx/Cargo.toml +++ b/packages/next-swc/crates/styled_jsx/Cargo.toml @@ -24,10 +24,10 @@ swc_core = { features = [ "ecma_minifier", "ecma_utils", "ecma_visit" -], version = "0.29.5" } +], version = "0.32.8" } [dev-dependencies] -testing = "0.31.4" +testing = "0.31.5" swc_core = { features = [ "testing_transform" -], version = "0.29.5" } +], version = "0.32.8" } diff --git a/packages/next-swc/crates/styled_jsx/tests/fixture.rs b/packages/next-swc/crates/styled_jsx/tests/fixture.rs index d851a562d0b66..6e87c8297345d 100644 --- a/packages/next-swc/crates/styled_jsx/tests/fixture.rs +++ b/packages/next-swc/crates/styled_jsx/tests/fixture.rs @@ -4,8 +4,8 @@ use styled_jsx::styled_jsx; use swc_core::{ common::{chain, FileName, Mark, Span, DUMMY_SP}, ecma::parser::{EsConfig, Syntax}, - ecma::transforms::base::resolver, - ecma::transforms::testing::{test_fixture, test_fixture_allowing_error}, + ecma::transforms::testing::test_fixture, + ecma::transforms::{base::resolver, testing::FixtureTestConfig}, }; use testing::fixture; @@ -32,6 +32,7 @@ fn styled_jsx_fixture(input: PathBuf) { }, &input, &output, + Default::default(), ); test_fixture( @@ -56,6 +57,7 @@ fn styled_jsx_fixture(input: PathBuf) { }, &input, &output, + Default::default(), ); } @@ -74,10 +76,14 @@ fn styled_jsx_errors(input: PathBuf) { false => FileName::Real(PathBuf::from("/some-project/src/some-file.js")), }; - test_fixture_allowing_error( + test_fixture( syntax(), &|t| styled_jsx(t.cm.clone(), file_name.clone()), &input, &output, + FixtureTestConfig { + allow_error: true, + ..Default::default() + }, ); } diff --git a/packages/next-swc/crates/styled_jsx/tests/fixture/css-selector-after-pseudo/output.js b/packages/next-swc/crates/styled_jsx/tests/fixture/css-selector-after-pseudo/output.js index c0cd6ea4718bf..038e73e4b66f8 100644 --- a/packages/next-swc/crates/styled_jsx/tests/fixture/css-selector-after-pseudo/output.js +++ b/packages/next-swc/crates/styled_jsx/tests/fixture/css-selector-after-pseudo/output.js @@ -1,5 +1,5 @@ import _JSXStyle from "styled-jsx/style"; -function NavigationItem({ active , className , }) { +function NavigationItem({ active , className }) { return diff --git a/packages/next-swc/crates/styled_jsx/tests/fixture/too-many/output.js b/packages/next-swc/crates/styled_jsx/tests/fixture/too-many/output.js index 55a7eb25e8d22..4a79e8cbc9b52 100644 --- a/packages/next-swc/crates/styled_jsx/tests/fixture/too-many/output.js +++ b/packages/next-swc/crates/styled_jsx/tests/fixture/too-many/output.js @@ -1,5 +1,5 @@ import _JSXStyle from "styled-jsx/style"; -export const Red = ({ Component ='button' , })=>{ +export const Red = ({ Component ='button' })=>{ return