From f694e6c42f4b7ebee735e20de13e7ae60e26755c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 12 Jul 2022 00:10:57 +0900 Subject: [PATCH] chore(deps): Update swc (#38347) This PR updates swc to https://github.com/swc-project/swc/commit/fa66ee86e5434d1b401e350d5727df378b193699 --- packages/next-swc/Cargo.lock | 453 +++++++++++------- packages/next-swc/crates/core/Cargo.toml | 18 +- packages/next-swc/crates/core/tests/full.rs | 3 +- .../core/tests/full/auto-cjs/1/output.js | 3 + .../crates/core/tests/full/example/output.js | 44 +- packages/next-swc/crates/emotion/Cargo.toml | 14 +- .../crates/modularize_imports/Cargo.toml | 10 +- packages/next-swc/crates/napi/Cargo.toml | 18 +- packages/next-swc/crates/napi/src/minify.rs | 10 +- .../crates/styled_components/Cargo.toml | 16 +- .../next-swc/crates/styled_jsx/Cargo.toml | 14 +- packages/next-swc/crates/wasm/Cargo.toml | 10 +- 12 files changed, 363 insertions(+), 250 deletions(-) diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock index 186d168c68ee..91699a811883 100644 --- a/packages/next-swc/Cargo.lock +++ b/packages/next-swc/Cargo.lock @@ -77,11 +77,11 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "ast_node" -version = "0.7.7" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc4c00309ed1c8104732df4a5fa9acc3b796b6f8531dfbd5ce0078c86f997244" +checksum = "87549fcb780f81054407f313a1693d102396c223f5c49ccc5d90b46a6cbef34a" dependencies = [ - "darling 0.10.2", + "darling", "pmutil", "proc-macro2", "quote", @@ -212,9 +212,9 @@ dependencies = [ [[package]] name = "browserslist-rs" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55d9cadf66efd56338797ada06140423bd87f290eac200027265d79d621a266" +checksum = "7c689fb4e42bd511c1927856b078d8a582690f5be196199d1c9005b9d4feae8c" dependencies = [ "ahash", "anyhow", @@ -534,38 +534,14 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - [[package]] name = "darling" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", + "darling_core", + "darling_macro", ] [[package]] @@ -578,17 +554,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", + "strsim", "syn", ] @@ -598,7 +564,7 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core 0.13.4", + "darling_core", "quote", "syn", ] @@ -739,7 +705,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea83a3fbdc1d999ccfbcbee717eab36f8edf2d71693a23ce0d7cca19e085304c" dependencies = [ - "darling 0.13.4", + "darling", "proc-macro2", "quote", "syn", @@ -1509,7 +1475,7 @@ dependencies = [ [[package]] name = "modularize_imports" -version = "0.9.0" +version = "0.11.0" dependencies = [ "handlebars", "once_cell", @@ -1517,7 +1483,7 @@ dependencies = [ "serde", "swc_cached", "swc_ecma_transforms_testing", - "swc_ecmascript", + "swc_ecmascript 0.180.0", "testing", ] @@ -1608,7 +1574,7 @@ dependencies = [ "swc_common", "swc_ecma_loader", "swc_ecma_transforms_testing", - "swc_ecmascript", + "swc_ecmascript 0.180.0", "swc_emotion", "swc_plugin_runner", "testing", @@ -1638,7 +1604,7 @@ dependencies = [ "swc_bundler", "swc_common", "swc_ecma_loader", - "swc_ecmascript", + "swc_ecmascript 0.180.0", "swc_node_base", "swc_plugin_runner", "tracing", @@ -1750,9 +1716,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "opaque-debug" @@ -2045,9 +2011,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "preset_env_base" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc18e8adbb06ba551365c59c16f28746d6d4e0540597448da53b9a3d803fa1d7" +checksum = "5f68dc2366d2258e280ad44221403aa0af50868b3e6dc1cb9fb14a302cc01948" dependencies = [ "ahash", "anyhow", @@ -2361,9 +2327,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.38" +version = "0.7.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "517a3034eb2b1499714e9d1e49b2367ad567e07639b69776d35e259d9c27cca6" +checksum = "cec2b3485b07d96ddfd3134767b8a447b45ea4eb91448d0a35180ec0ffd5ed15" dependencies = [ "bytecheck", "hashbrown 0.12.1", @@ -2375,9 +2341,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.38" +version = "0.7.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505c209ee04111a006431abf39696e640838364d67a107c559ababaf6fd8c9dd" +checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4" dependencies = [ "proc-macro2", "quote", @@ -2632,11 +2598,10 @@ dependencies = [ [[package]] name = "serde-wasm-bindgen" -version = "0.3.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618365e8e586c22123d692b72a7d791d5ee697817b65a218cdf12a98870af0f7" +checksum = "1cfc62771e7b829b517cb213419236475f434fb480eddd76112ae182d274434a" dependencies = [ - "fnv", "js-sys", "serde", "wasm-bindgen", @@ -2921,13 +2886,13 @@ dependencies = [ [[package]] name = "strsim" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "styled_components" -version = "0.34.0" +version = "0.36.0" dependencies = [ "Inflector", "once_cell", @@ -2937,21 +2902,21 @@ dependencies = [ "swc_atoms", "swc_common", "swc_ecma_transforms_testing", - "swc_ecmascript", + "swc_ecmascript 0.180.0", "testing", "tracing", ] [[package]] name = "styled_jsx" -version = "0.9.0" +version = "0.11.0" dependencies = [ "easy-error", "swc_common", "swc_css", "swc_css_prefixer", "swc_ecma_transforms_testing", - "swc_ecmascript", + "swc_ecmascript 0.180.0", "testing", "tracing", ] @@ -2992,9 +2957,9 @@ dependencies = [ [[package]] name = "swc" -version = "0.188.0" +version = "0.205.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916f71eea6c661d9654b919cef11543c23bbc85ee712545cc185351ddc7fc19b" +checksum = "4195b25dda45f4e2baf7cecab6455bada2fbccc8884e377ebf75cb7da591f976" dependencies = [ "ahash", "anyhow", @@ -3021,16 +2986,16 @@ dependencies = [ "swc_ecma_ext_transforms", "swc_ecma_lints", "swc_ecma_loader", - "swc_ecma_minifier", + "swc_ecma_minifier 0.135.0", "swc_ecma_parser", "swc_ecma_preset_env", - "swc_ecma_transforms", + "swc_ecma_transforms 0.174.0", "swc_ecma_transforms_base", "swc_ecma_transforms_compat", - "swc_ecma_transforms_optimization", + "swc_ecma_transforms_optimization 0.143.0", "swc_ecma_utils", "swc_ecma_visit", - "swc_ecmascript", + "swc_ecmascript 0.179.0", "swc_error_reporters", "swc_node_comments", "swc_plugin_proxy", @@ -3042,11 +3007,13 @@ dependencies = [ [[package]] name = "swc_atoms" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4447e91cfebfe09f630f909358998fe6621afd10389ba5d6d7711e26105dc87c" +checksum = "0d99c0ac33707dd1162a3665d6ca1a28b2f6594e9c37c4703e417fc5e1ce532e" dependencies = [ + "bytecheck", "once_cell", + "rkyv", "rustc-hash", "serde", "string_cache", @@ -3055,9 +3022,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.154.0" +version = "0.169.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37c2865f8c821e5e2a2530fc6b19133cccf71690ab5e1384dec38c9f228b3df" +checksum = "3fd675a730040ce147232e7021aebebfbe16098079824763578cd6b597632ccc" dependencies = [ "ahash", "anyhow", @@ -3079,7 +3046,7 @@ dependencies = [ "swc_ecma_loader", "swc_ecma_parser", "swc_ecma_transforms_base", - "swc_ecma_transforms_optimization", + "swc_ecma_transforms_optimization 0.144.0", "swc_ecma_utils", "swc_ecma_visit", "swc_fast_graph", @@ -3104,15 +3071,16 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.18.9" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7fd4917e5f1f563e475d7adf1cb343f9275ffa602f168b896b0ea8f35d70895" +checksum = "68e76a324fa0d7240e790c78914f39fdecfa9d87ef4efed591124b58607a4a4a" dependencies = [ "ahash", "anyhow", "ast_node", "atty", "better_scoped_tls", + "bytecheck", "cfg-if 1.0.0", "debug_unreachable", "either", @@ -3126,6 +3094,7 @@ dependencies = [ "siphasher", "sourcemap", "string_cache", + "swc_atoms", "swc_eq_ignore_macros", "swc_visit", "termcolor", @@ -3162,9 +3131,9 @@ dependencies = [ [[package]] name = "swc_css" -version = "0.106.0" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803663dcd6b4ef69b82cfc440fa8269840c56985e704a4f4a4706f26eaedb552" +checksum = "846d9d0f8f7c0850d771a6ad59cb71812d2bbbf36d0e6f5fed1fc95bed1a2943" dependencies = [ "swc_css_ast", "swc_css_codegen", @@ -3175,9 +3144,9 @@ dependencies = [ [[package]] name = "swc_css_ast" -version = "0.93.1" +version = "0.98.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b53cf0017be1488363f6dc20dda4625abeb2b4f8e72a22a0f949c191cc5377df" +checksum = "bc70b5ccb766255af46b6891062ab919d32a891bc5169ba638998ef7495b24a5" dependencies = [ "is-macro", "serde", @@ -3188,9 +3157,9 @@ dependencies = [ [[package]] name = "swc_css_codegen" -version = "0.103.0" +version = "0.108.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1357d8228d88002fa40f344b7b714a9298371ebef3463bc3da18ba4126fa5789" +checksum = "56840a824cd5f23766657b4f3140d06cf3c3925b5d9218b5b12b3667ba5d069f" dependencies = [ "auto_impl", "bitflags", @@ -3215,9 +3184,9 @@ dependencies = [ [[package]] name = "swc_css_parser" -version = "0.102.0" +version = "0.107.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda9da90c2c69346857272ff051a4c91fa052b1f8053ae0004c4bb29a4b411a8" +checksum = "55c03bfad51ae4d97888deafad14108cc195620e54d562ce86bbc7765e1fa86d" dependencies = [ "bitflags", "lexical", @@ -3228,9 +3197,9 @@ dependencies = [ [[package]] name = "swc_css_prefixer" -version = "0.101.0" +version = "0.107.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f62c197a08d0f6a621fa347702a1315244f1e39bc40c60544243f1321be1d9e0" +checksum = "6f352e03d4b39cdd201a6a48360cd4c71b830987f3e573fbf26879f4253a65ea" dependencies = [ "swc_atoms", "swc_common", @@ -3241,9 +3210,9 @@ dependencies = [ [[package]] name = "swc_css_utils" -version = "0.90.0" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666d3ffe10903949ed4805efea7376bb04bf12e8e051c429d1bcc36da20b6218" +checksum = "e85a0dc84117c44f4e14f015c527a04ce97bfbd009404a02c732023afea65b5a" dependencies = [ "once_cell", "serde", @@ -3256,9 +3225,9 @@ dependencies = [ [[package]] name = "swc_css_visit" -version = "0.92.0" +version = "0.97.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "823d45d2dc37777c71f599a29a928709a385bea5d109ff4b753d0950a31a00a4" +checksum = "d8320cb496efeb4c8409ae85e808a2256043464e2d592e7a77f2abafb62eb13d" dependencies = [ "swc_atoms", "swc_common", @@ -3268,11 +3237,12 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.79.0" +version = "0.84.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f559057f0a573fe3575605cdb5f6d6523b090995e0022444c24e4d206eb4bd57" +checksum = "cce1fb31e3a100feb31f94647fe27e457bc13b17a8931204fdc9bc58a15c936a" dependencies = [ "bitflags", + "bytecheck", "is-macro", "num-bigint", "rkyv", @@ -3286,9 +3256,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.109.1" +version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305da34eaf4d8ec3f908003304d6305fbb455053df9a538c8a491872d167483d" +checksum = "d09abf1639f76d3d174225fdb608805f9c21d4c455f4dd2ef6ab156701f1f82a" dependencies = [ "memchr", "num-bigint", @@ -3317,9 +3287,9 @@ dependencies = [ [[package]] name = "swc_ecma_ext_transforms" -version = "0.72.0" +version = "0.79.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeac28dc8c9c1a626b40b50ffe80583aab398615aacc2234dc0d88627e88826" +checksum = "54352547664f85f8c418adadfecf9292459f77b442e41b162c4415421b01273b" dependencies = [ "phf", "swc_atoms", @@ -3331,9 +3301,9 @@ dependencies = [ [[package]] name = "swc_ecma_lints" -version = "0.44.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e66d2f686d1561b88e4bca1d3ece8b90a48c9259b786e7d5dbc4095937e0a4" +checksum = "34303f7c81d31629d504c01481ad5241edc5198d3f3e340e59b17b10ff489594" dependencies = [ "ahash", "auto_impl", @@ -3352,9 +3322,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.30.2" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917dcd19c429254113981e746e3f6b46446145c8e4d353a8727f92bc8fa307cc" +checksum = "710c86eb2b253160d4a02fa77057f1c493b3932d1b83430cbbc1e7823eb47e8c" dependencies = [ "ahash", "anyhow", @@ -3374,9 +3344,43 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.121.0" +version = "0.135.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674790b5bd78c092542be60627c506632ea1fdea300e13b36ec71ae86be00b95" +dependencies = [ + "ahash", + "arrayvec", + "indexmap", + "num_cpus", + "once_cell", + "parking_lot", + "rayon", + "regex", + "retain_mut", + "rustc-hash", + "serde", + "serde_json", + "swc_atoms", + "swc_cached", + "swc_common", + "swc_config", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_optimization 0.143.0", + "swc_ecma_utils", + "swc_ecma_visit", + "swc_timer", + "tracing", + "unicode-id", +] + +[[package]] +name = "swc_ecma_minifier" +version = "0.136.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b6cd4d6519ece043c947c97f77ad58912e95ba485870d5e6dff83336978f816" +checksum = "13d66a95e4d19a742f38db0907b55eeb0e89928b345eb5186fae5a9f66370a0e" dependencies = [ "ahash", "arrayvec", @@ -3398,7 +3402,7 @@ dependencies = [ "swc_ecma_codegen", "swc_ecma_parser", "swc_ecma_transforms_base", - "swc_ecma_transforms_optimization", + "swc_ecma_transforms_optimization 0.144.0", "swc_ecma_utils", "swc_ecma_visit", "swc_timer", @@ -3408,9 +3412,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.105.3" +version = "0.111.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98afcaed711bd6ac6f10cd80661c6f18e63bbd1ecefd29804be49db3bd13df4b" +checksum = "cc1766e5b969c59e51a5dfe9337755d7380a891e579dd6b0eb7816587c7ea7aa" dependencies = [ "either", "enum_kind", @@ -3427,9 +3431,9 @@ dependencies = [ [[package]] name = "swc_ecma_preset_env" -version = "0.135.0" +version = "0.149.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1622bbe51049f066f53a8498a42d69ee157d43453dc992647dbd5a62daa5990a" +checksum = "d27c37e693b1deda42bc2f70254234d79d2c10797701f261cbb7797b8f37bb2d" dependencies = [ "ahash", "anyhow", @@ -3445,16 +3449,16 @@ dependencies = [ "swc_atoms", "swc_common", "swc_ecma_ast", - "swc_ecma_transforms", + "swc_ecma_transforms 0.174.0", "swc_ecma_utils", "swc_ecma_visit", ] [[package]] name = "swc_ecma_testing" -version = "0.2.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b415441d28ecc726222a542ee16b47ae978143622457d9416b3e82e888c21926" +checksum = "f9b7feb84eeec46d1772bcb10c04c2a6e68f504913896d80ac19bfd0ebb45c35" dependencies = [ "anyhow", "hex", @@ -3468,9 +3472,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms" -version = "0.160.0" +version = "0.174.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a167f29ffc4fba57c8ef1719f95a4d5b22d37945e0e60ddd4744a8c420a787" +checksum = "a30f3386dbaa8490ac3ed65240c057ea3a3b20d37c4dba50c876adce5201f673" dependencies = [ "swc_atoms", "swc_common", @@ -3478,24 +3482,43 @@ dependencies = [ "swc_ecma_transforms_base", "swc_ecma_transforms_compat", "swc_ecma_transforms_module", - "swc_ecma_transforms_optimization", + "swc_ecma_transforms_optimization 0.143.0", "swc_ecma_transforms_proposal", - "swc_ecma_transforms_react", - "swc_ecma_transforms_typescript", + "swc_ecma_transforms_react 0.132.0", + "swc_ecma_transforms_typescript 0.136.0", + "swc_ecma_utils", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_transforms" +version = "0.175.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6881a9a87fd851c4ee452ab7b305551a23b9a1af429b5b988dbe6709a313d8d5" +dependencies = [ + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_transforms_optimization 0.144.0", + "swc_ecma_transforms_react 0.133.0", + "swc_ecma_transforms_typescript 0.137.0", "swc_ecma_utils", "swc_ecma_visit", ] [[package]] name = "swc_ecma_transforms_base" -version = "0.89.5" +version = "0.97.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b9d00145582f172117a56a184931288501f745bfb2fb3cbe21b5d768d2e8bc" +checksum = "66b316a99dde0ef85f1878aaa9f4bf9b15f16e999c56ed31a1433928c754ae4e" dependencies = [ "better_scoped_tls", + "bitflags", "num_cpus", "once_cell", "phf", + "rayon", "rustc-hash", "serde", "smallvec", @@ -3510,9 +3533,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.77.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44cc21dcecfa8d566ef4b7daf77c4e11087d5799dada6592fcdb414f05d9474" +checksum = "c853c4366e81092d38b746e71adffc1150c694f02c1068c9fa24abbdc373a65f" dependencies = [ "swc_atoms", "swc_common", @@ -3524,9 +3547,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.104.1" +version = "0.114.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4f7739a82047c74eeb6cdfa0c6b93599c1e35afcba44b826877217ff912c89" +checksum = "ace2890c492568b47abb6eecbbb2dcb8f2218adcf0d8a3b73d84b88fddc7d87f" dependencies = [ "ahash", "arrayvec", @@ -3564,16 +3587,19 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_module" -version = "0.118.1" +version = "0.130.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df63009d3856a23933935f543401e4041e16ba3c2a58a02c9c6b0fe80f47f0e" +checksum = "bb92de6bc25bf1f9af2e70b744dae53a21ec2d2fbec8da2b2f67ef14d63e8a36" dependencies = [ "Inflector", "ahash", "anyhow", + "bitflags", "indexmap", + "is-macro", "path-clean", "pathdiff", + "regex", "serde", "swc_atoms", "swc_cached", @@ -3589,9 +3615,32 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.130.0" +version = "0.143.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8081a64271041a199dd399ef50543130e4e28330c3c7592c4c5f958d330596" +checksum = "a9def3dc7a6afe6b44cacd61c200181507396ee3c21a3751299718fecebce51d" +dependencies = [ + "ahash", + "dashmap", + "indexmap", + "once_cell", + "rustc-hash", + "serde_json", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", + "tracing", +] + +[[package]] +name = "swc_ecma_transforms_optimization" +version = "0.144.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9413ed145b0c3e693d18760a72c72bb7ac3e522edbb88bfe0c6c161a7b148281" dependencies = [ "ahash", "dashmap", @@ -3612,9 +3661,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.112.0" +version = "0.122.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "101817a33d344ab1e8afe898743972324b4d0641aca46a124b5d4620d561244c" +checksum = "78ebc6e03a51f9adcbc40ec144c9bbe78de872bf6f8f581f3abd51187ec6e648" dependencies = [ "either", "serde", @@ -3631,9 +3680,35 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.120.0" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae89d33f52f9d0a6ca30d3ff1151c69a97793a2847c5ed5642f75ac8da2af30" +checksum = "438ffd11b17c3c6565e44a9a0d596687459de9f13b9ea302f5baf8e20c07a860" +dependencies = [ + "ahash", + "base64 0.13.0", + "dashmap", + "indexmap", + "once_cell", + "regex", + "serde", + "sha-1 0.10.0", + "string_enum", + "swc_atoms", + "swc_common", + "swc_config", + "swc_ecma_ast", + "swc_ecma_parser", + "swc_ecma_transforms_base", + "swc_ecma_transforms_macros", + "swc_ecma_utils", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_transforms_react" +version = "0.133.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6b0516e231008722175bc0841bf4f3fdcfd3276ca0bf4878d6e87af5c50f324" dependencies = [ "ahash", "base64 0.13.0", @@ -3657,9 +3732,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.91.0" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57f3f19004d100b068927ba608532738c8a3e72f760151e0675fe22549528d85" +checksum = "a0829603243a7b6c127c110bf752bd59c3bffc118d23ef11498a1c6fb310ef35" dependencies = [ "ansi_term", "anyhow", @@ -3681,25 +3756,41 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.123.0" +version = "0.136.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d8c061e8ad8a3f47e9d49f85cea3ab1edca0a6585354ea23923d18e75368eb4" +dependencies = [ + "serde", + "swc_atoms", + "swc_common", + "swc_ecma_ast", + "swc_ecma_transforms_base", + "swc_ecma_transforms_react 0.132.0", + "swc_ecma_utils", + "swc_ecma_visit", +] + +[[package]] +name = "swc_ecma_transforms_typescript" +version = "0.137.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ce88b6efe1c1cca74d1d41af744f3c101869ce568fe371ee4686aad4ae3e84" +checksum = "6716a73401b5d717d6fd20159385ce09adbdd3afc765c3890859d84ada8af729" dependencies = [ "serde", "swc_atoms", "swc_common", "swc_ecma_ast", "swc_ecma_transforms_base", - "swc_ecma_transforms_react", + "swc_ecma_transforms_react 0.133.0", "swc_ecma_utils", "swc_ecma_visit", ] [[package]] name = "swc_ecma_utils" -version = "0.86.2" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978a609c13b5d3fe9afe31c065bfb40e1bf6e974961e2e2fef959ee9ce668bf3" +checksum = "70981d5ef10c0ff0a002e21decbca9dde5b40c2fc0d0bc6eaebb219a8e0a5f7d" dependencies = [ "indexmap", "once_cell", @@ -3708,13 +3799,14 @@ dependencies = [ "swc_ecma_ast", "swc_ecma_visit", "tracing", + "unicode-id", ] [[package]] name = "swc_ecma_visit" -version = "0.65.0" +version = "0.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066077ce3279b593cbdbbb379735e230a794df7aef7206ba142850eb7197e91f" +checksum = "fcd081250d664808fcd23110202728811236c87f527656ffc1db7f00ac1a06dd" dependencies = [ "num-bigint", "swc_atoms", @@ -3726,22 +3818,32 @@ dependencies = [ [[package]] name = "swc_ecmascript" -version = "0.164.0" +version = "0.179.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44e4fa994e933838459cfbfce2913f34b054ff3ecc4988e6f1eb993d7bb1a7ef" +dependencies = [ + "swc_ecma_ast", + "swc_ecma_parser", +] + +[[package]] +name = "swc_ecmascript" +version = "0.180.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bddc3ca2e380a16cb2fb870999cb240feebb3ec9fcc00a84212a0e7feedd17f" +checksum = "1059b3c228636812089e7a3d662c49d1378c943a75b142a02c93708b9b49c9ec" dependencies = [ "swc_ecma_ast", "swc_ecma_codegen", - "swc_ecma_minifier", + "swc_ecma_minifier 0.136.1", "swc_ecma_parser", - "swc_ecma_transforms", + "swc_ecma_transforms 0.175.0", "swc_ecma_utils", "swc_ecma_visit", ] [[package]] name = "swc_emotion" -version = "0.10.0" +version = "0.12.0" dependencies = [ "base64 0.13.0", "byteorder", @@ -3754,7 +3856,7 @@ dependencies = [ "swc_atoms", "swc_common", "swc_ecma_transforms_testing", - "swc_ecmascript", + "swc_ecmascript 0.180.0", "swc_trace_macro", "testing", "tracing", @@ -3774,9 +3876,9 @@ dependencies = [ [[package]] name = "swc_error_reporters" -version = "0.2.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd346c54737891742238ee43f62d4d6f87267412290e087facc9e12f80ed8147" +checksum = "72971d433142768c6364e5a99ba520c70fe61c7fd92492f10a9f2ee513a9cf5b" dependencies = [ "anyhow", "miette", @@ -3787,9 +3889,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.6.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dccdc7e1f2d987c1e2fc7dfb36ef86666f04e5fad4fe88d3a1d05e4f01181d95" +checksum = "9260826bb82481fb946ca653d10196f2653beba1b566b72f42ba7046e4ad0c8f" dependencies = [ "ahash", "indexmap", @@ -3799,9 +3901,9 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.7.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c279894062688a31a6de1c95e00eb7cfcaa2a471334f6b741f083b86096f2a84" +checksum = "a9b192a3b556cf0a81b4dcb8fa35374d306cd46f806dce937599b40e2d945e51" dependencies = [ "ahash", "auto_impl", @@ -3834,9 +3936,9 @@ dependencies = [ [[package]] name = "swc_node_comments" -version = "0.5.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b4340b405efbc7c78d6f9d207c58956156ba9e2f020cf6225100fe4ab4e0991" +checksum = "86ee4d9f6ae1f863eee49b5336190b9292174c81fe76f6b05e673ee7f68aad7d" dependencies = [ "ahash", "dashmap", @@ -3845,11 +3947,12 @@ dependencies = [ [[package]] name = "swc_plugin_proxy" -version = "0.4.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e16b7a2aef40332a25d2601d08f0750c8ca30143dc71f70ad7ec808ba7d7c8" +checksum = "93b79b1fc945e653bf7d8d37636bb6b26ae335d6f5901647108fae27f88b69e2" dependencies = [ "better_scoped_tls", + "bytecheck", "rkyv", "swc_common", "swc_ecma_ast", @@ -3857,9 +3960,9 @@ dependencies = [ [[package]] name = "swc_plugin_runner" -version = "0.56.0" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e5f26140c3dc265be5ad158f5902609a3e302d71cc99af5cf161ff82b370de" +checksum = "46039074c4e3934754daffddd4883757c8521da643df49b8b7177c00a1b8919d" dependencies = [ "anyhow", "once_cell", @@ -3877,9 +3980,9 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.6.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60ca6c177dc2b848c73d721eea6c33f047c82a1e4a5795ea9b8114ced027f8ed" +checksum = "75c07b738c3a6ab390fcb29b60377e33358945879387009097e1d5f504384c08" dependencies = [ "tracing", ] @@ -3897,9 +4000,9 @@ dependencies = [ [[package]] name = "swc_visit" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c639379dd2a8a0221fa1e12fafbdd594ba53a0cace6560054da52409dfcc1a" +checksum = "fafa6c946bdbe601f5511140776d59e82a03f52a5e5039192b4b96f3ca639d88" dependencies = [ "either", "swc_visit_macros", @@ -3907,9 +4010,9 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b9b72892df873972549838bf84d6c56234c7502148a7e23b5a3da6e0fedfb8" +checksum = "cad1b8e0b2d48660bc454f70495e9bb583f9bf501f28165568569946e62f44a2" dependencies = [ "Inflector", "pmutil", @@ -3971,9 +4074,9 @@ dependencies = [ [[package]] name = "testing" -version = "0.20.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12a89c9a6a6475156bf53bfd58e16efdf99559b002996db0d30ceb401bc25883" +checksum = "cdc6de80b7854362068e93c64c6e672257a5cbd1485af8f17b8b2ef98cb63c75" dependencies = [ "ansi_term", "difference", @@ -4199,9 +4302,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ "cfg-if 1.0.0", "log", @@ -4234,11 +4337,11 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.26" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" dependencies = [ - "lazy_static", + "once_cell", "valuable", ] @@ -4265,13 +4368,13 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.11" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" +checksum = "3a713421342a5a666b7577783721d3117f1b69a393df803ee17bb73b1e122a59" dependencies = [ "ansi_term", - "lazy_static", "matchers", + "once_cell", "regex", "sharded-slab", "smallvec", @@ -4466,7 +4569,7 @@ dependencies = [ "serde_json", "swc", "swc_common", - "swc_ecmascript", + "swc_ecmascript 0.180.0", "swc_plugin_runner", "tracing", "wasm-bindgen", diff --git a/packages/next-swc/crates/core/Cargo.toml b/packages/next-swc/crates/core/Cargo.toml index 4fabae25cd7f..585ada4f0e3b 100644 --- a/packages/next-swc/crates/core/Cargo.toml +++ b/packages/next-swc/crates/core/Cargo.toml @@ -17,7 +17,7 @@ chrono = "0.4" easy-error = "1.0.0" either = "1" fxhash = "0.2.1" -once_cell = "1.8.0" +once_cell = "1.13.0" pathdiff = "0.2.0" regex = "1.5" serde = "1" @@ -26,18 +26,18 @@ swc_emotion = {path="../emotion"} styled_components = {path="../styled_components"} styled_jsx = {path="../styled_jsx"} modularize_imports = {path="../modularize_imports"} -swc = "0.188.0" -swc_atoms = "0.2.12" -swc_common = { version = "0.18.9", features = ["concurrent", "sourcemap"] } -swc_ecma_loader = { version = "0.30.2", features = ["node", "lru"] } -swc_ecmascript = { version = "0.164.0", features = ["codegen", "minifier", "optimization", "parser", "react", "transforms", "typescript", "utils", "visit"] } -swc_plugin_runner = { version = "0.56.0", optional = true, default-features = false } +swc = "0.205.0" +swc_atoms = "0.2.13" +swc_common = { version = "0.23.0", features = ["concurrent", "sourcemap"] } +swc_ecma_loader = { version = "0.35.0", features = ["node", "lru"] } +swc_ecmascript = { version = "0.180.0", features = ["codegen", "minifier", "optimization", "parser", "react", "transforms", "typescript", "utils", "visit"] } +swc_plugin_runner = { version = "0.64.0", optional = true, default-features = false } swc_cached = "0.1.1" tracing = { version = "0.1.32", features = ["release_max_level_info"] } wasmer = { version = "2.3.0", optional = true, default-features = false } wasmer-wasi = { version = "2.3.0", optional = true, default-features = false } [dev-dependencies] -swc_ecma_transforms_testing = "0.91.0" -testing = "0.20.1" +swc_ecma_transforms_testing = "0.99.0" +testing = "0.25.0" walkdir = "2.3.2" diff --git a/packages/next-swc/crates/core/tests/full.rs b/packages/next-swc/crates/core/tests/full.rs index f9af7b3c9db1..8466972a49a0 100644 --- a/packages/next-swc/crates/core/tests/full.rs +++ b/packages/next-swc/crates/core/tests/full.rs @@ -30,10 +30,11 @@ fn test(input: &Path, minify: bool) { let options = TransformOptions { swc: swc::config::Options { swcrc: true, - is_module: swc::config::IsModule::Bool(true), output_path: Some(output.clone()), config: swc::config::Config { + is_module: swc::config::IsModule::Bool(true), + jsc: swc::config::JscConfig { minify: if minify { Some(assert_json("{ \"compress\": true, \"mangle\": true }")) diff --git a/packages/next-swc/crates/core/tests/full/auto-cjs/1/output.js b/packages/next-swc/crates/core/tests/full/auto-cjs/1/output.js index 9cc7b3a4a1b7..183071cf9540 100644 --- a/packages/next-swc/crates/core/tests/full/auto-cjs/1/output.js +++ b/packages/next-swc/crates/core/tests/full/auto-cjs/1/output.js @@ -1,4 +1,7 @@ "use strict"; +Object.defineProperty(exports, "__esModule", { + value: !0 +}); var a = function(a) { return a && a.__esModule ? a : { default: a diff --git a/packages/next-swc/crates/core/tests/full/example/output.js b/packages/next-swc/crates/core/tests/full/example/output.js index bdda6ea773d1..03ada8af92ec 100644 --- a/packages/next-swc/crates/core/tests/full/example/output.js +++ b/packages/next-swc/crates/core/tests/full/example/output.js @@ -1,40 +1,40 @@ -function b(c, a) { - (null == a || a > c.length) && (a = c.length); - for(var b = 0, d = new Array(a); b < a; b++)d[b] = c[b]; +function a(a, b) { + (null == b || b > a.length) && (b = a.length); + for(var c = 0, d = new Array(b); c < b; c++)d[c] = a[c]; return d; } -import a from "other"; -(function(a, c) { +import b from "other"; +(function(b, c) { return function(a) { if (Array.isArray(a)) return a; - }(a) || function(b, e) { - var f, g, a = null == b ? null : "undefined" != typeof Symbol && b[Symbol.iterator] || b["@@iterator"]; - if (null != a) { - var c = [], d = !0, h = !1; + }(b) || function(a, b) { + var c, d, e = null == a ? null : "undefined" != typeof Symbol && a[Symbol.iterator] || a["@@iterator"]; + if (null != e) { + var f = [], g = !0, h = !1; try { - for(a = a.call(b); !(d = (f = a.next()).done) && (c.push(f.value), !e || c.length !== e); d = !0); + for(e = e.call(a); !(g = (c = e.next()).done) && (f.push(c.value), !b || f.length !== b); g = !0); } catch (i) { - h = !0, g = i; + h = !0, d = i; } finally{ try { - d || null == a.return || a.return(); + g || null == e.return || e.return(); } finally{ - if (h) throw g; + if (h) throw d; } } - return c; + return f; } - }(a, c) || function e(a, d) { - if (a) { - if ("string" == typeof a) return b(a, d); - var c = Object.prototype.toString.call(a).slice(8, -1); - if ("Object" === c && a.constructor && (c = a.constructor.name), "Map" === c || "Set" === c) return Array.from(c); - if ("Arguments" === c || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(c)) return b(a, d); + }(b, c) || function b(c, d) { + if (c) { + if ("string" == typeof c) return a(c, d); + var e = Object.prototype.toString.call(c).slice(8, -1); + if ("Object" === e && c.constructor && (e = c.constructor.name), "Map" === e || "Set" === e) return Array.from(e); + if ("Arguments" === e || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)) return a(c, d); } - }(a, c) || function() { + }(b, c) || function() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }(); -})(a, 1)[0]; +})(b, 1)[0]; var c = function() { "use strict"; !function(a, b) { diff --git a/packages/next-swc/crates/emotion/Cargo.toml b/packages/next-swc/crates/emotion/Cargo.toml index 1057a9efbfbd..0eaa2735c151 100644 --- a/packages/next-swc/crates/emotion/Cargo.toml +++ b/packages/next-swc/crates/emotion/Cargo.toml @@ -5,7 +5,7 @@ description = "AST Transforms for emotion" license = "Apache-2.0" name = "swc_emotion" repository = "https://github.com/vercel/next.js.git" -version = "0.10.0" +version = "0.12.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -13,17 +13,17 @@ version = "0.10.0" base64 = "0.13" byteorder = "1" fxhash = "0.2.1" -once_cell = "1.8.0" +once_cell = "1.13.0" radix_fmt = "1" regex = "1.5" serde = "1" sourcemap = "6.0.1" -swc_atoms = "0.2.12" -swc_common = { version = "0.18.9", features = ["concurrent", "sourcemap"] } -swc_ecmascript = { version = "0.164.0", features = ["codegen", "utils", "visit"] } +swc_atoms = "0.2.13" +swc_common = { version = "0.23.0", features = ["concurrent", "sourcemap"] } +swc_ecmascript = { version = "0.180.0", features = ["codegen", "utils", "visit"] } swc_trace_macro = "0.1.1" tracing = { version = "0.1.32", features = ["release_max_level_info"] } [dev-dependencies] -swc_ecma_transforms_testing = "0.91.0" -testing = "0.20.1" +swc_ecma_transforms_testing = "0.99.0" +testing = "0.25.0" diff --git a/packages/next-swc/crates/modularize_imports/Cargo.toml b/packages/next-swc/crates/modularize_imports/Cargo.toml index 350437499237..188d151ca6b1 100644 --- a/packages/next-swc/crates/modularize_imports/Cargo.toml +++ b/packages/next-swc/crates/modularize_imports/Cargo.toml @@ -5,18 +5,18 @@ edition = "2018" license = "Apache-2.0" name = "modularize_imports" repository = "https://github.com/vercel/next.js.git" -version = "0.9.0" +version = "0.11.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] handlebars = "4.2.1" -once_cell = "1.8.0" +once_cell = "1.13.0" regex = "1.5" serde = "1" swc_cached = "0.1.1" -swc_ecmascript = { version = "0.164.0", features = ["visit"] } +swc_ecmascript = { version = "0.180.0", features = ["visit"] } [dev-dependencies] -swc_ecma_transforms_testing = "0.91.0" -testing = "0.20.1" +swc_ecma_transforms_testing = "0.99.0" +testing = "0.25.0" diff --git a/packages/next-swc/crates/napi/Cargo.toml b/packages/next-swc/crates/napi/Cargo.toml index 04880ee0eb16..59eb0fe4d22a 100644 --- a/packages/next-swc/crates/napi/Cargo.toml +++ b/packages/next-swc/crates/napi/Cargo.toml @@ -30,16 +30,16 @@ fxhash = "0.2.1" napi = {version = "1", features = ["serde-json"]} napi-derive = "1" next-swc = {version = "0.0.0", path = "../core"} -once_cell = "1.8.0" +once_cell = "1.13.0" serde = "1" serde_json = "1" -swc = "0.188.0" -swc_atoms = "0.2.12" -swc_bundler = { version = "0.154.0", features = ["concurrent"] } -swc_common = { version = "0.18.9", features = ["concurrent", "sourcemap"] } -swc_ecma_loader = { version = "0.30.2", features = ["node", "lru"] } -swc_ecmascript = { version = "0.164.0", features = ["codegen", "minifier", "optimization", "parser", "react", "transforms", "typescript", "utils", "visit"] } -swc_plugin_runner = { version = "0.56.0", optional = true } +swc = "0.205.0" +swc_atoms = "0.2.13" +swc_bundler = { version = "0.169.0", features = ["concurrent"] } +swc_common = { version = "0.23.0", features = ["concurrent", "sourcemap"] } +swc_ecma_loader = { version = "0.35.0", features = ["node", "lru"] } +swc_ecmascript = { version = "0.180.0", features = ["codegen", "minifier", "optimization", "parser", "react", "transforms", "typescript", "utils", "visit"] } +swc_plugin_runner = { version = "0.64.0", optional = true } swc_node_base = "0.5.5" tracing = { version = "0.1.32", features = ["release_max_level_info"] } tracing-futures = "0.2.5" @@ -63,4 +63,4 @@ _sentry_rustls = { package = "sentry", version = "0.27.0", default-features = fa [build-dependencies] napi-build = "1" serde = "1" -serde_json = "1" \ No newline at end of file +serde_json = "1" diff --git a/packages/next-swc/crates/napi/src/minify.rs b/packages/next-swc/crates/napi/src/minify.rs index 40b0545f4bfc..042373c65389 100644 --- a/packages/next-swc/crates/napi/src/minify.rs +++ b/packages/next-swc/crates/napi/src/minify.rs @@ -33,7 +33,7 @@ use fxhash::FxHashMap; use napi::{CallContext, JsObject, Task}; use serde::Deserialize; use std::sync::Arc; -use swc::{try_with_handler, TransformOutput}; +use swc::{config::JsMinifyOptions, try_with_handler, TransformOutput}; use swc_common::{errors::ColorConfig, sync::Lrc, FileName, SourceFile, SourceMap}; struct MinifyTask { @@ -85,7 +85,13 @@ impl Task for MinifyTask { |handler| { let fm = self.code.to_file(self.c.cm.clone()); - self.c.minify(fm, handler, &self.opts) + self.c.minify( + fm, + handler, + &JsMinifyOptions { + ..self.opts.clone() + }, + ) }, ) .convert_err() diff --git a/packages/next-swc/crates/styled_components/Cargo.toml b/packages/next-swc/crates/styled_components/Cargo.toml index f3b8d4e9ee18..9095ed02c289 100644 --- a/packages/next-swc/crates/styled_components/Cargo.toml +++ b/packages/next-swc/crates/styled_components/Cargo.toml @@ -6,22 +6,22 @@ include = ["Cargo.toml", "src/**/*.rs"] license = "Apache-2.0" name = "styled_components" repository = "https://github.com/vercel/next.js.git" -version = "0.34.0" +version = "0.36.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] Inflector = "0.11.4" -once_cell = "1.10.0" +once_cell = "1.13.0" regex = {version = "1.5.4", features = ["std", "perf"], default-features = false} serde = {version = "1.0.130", features = ["derive"]} -swc_atoms = "0.2.12" -swc_common = { version = "0.18.9", features = ["concurrent"] } -swc_ecmascript = { version = "0.164.0", features = ["utils", "visit"] } +swc_atoms = "0.2.13" +swc_common = { version = "0.23.0", features = ["concurrent"] } +swc_ecmascript = { version = "0.180.0", features = ["utils", "visit"] } tracing = "0.1.32" [dev-dependencies] serde_json = "1" -swc_ecma_transforms_testing = "0.91.0" -swc_ecmascript = { version = "0.164.0", features = ["parser", "transforms"] } -testing = "0.20.1" +swc_ecma_transforms_testing = "0.99.0" +swc_ecmascript = { version = "0.180.0", features = ["parser", "transforms"] } +testing = "0.25.0" diff --git a/packages/next-swc/crates/styled_jsx/Cargo.toml b/packages/next-swc/crates/styled_jsx/Cargo.toml index 532756a0b23a..9b5a1eb0452d 100644 --- a/packages/next-swc/crates/styled_jsx/Cargo.toml +++ b/packages/next-swc/crates/styled_jsx/Cargo.toml @@ -5,18 +5,18 @@ edition = "2018" license = "Apache-2.0" name = "styled_jsx" repository = "https://github.com/vercel/next.js.git" -version = "0.9.0" +version = "0.11.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] easy-error = "1.0.0" -swc_common = { version = "0.18.9", features = ["concurrent", "sourcemap"] } -swc_css = "0.106.0" -swc_css_prefixer = "0.101.0" -swc_ecmascript = { version = "0.164.0", features = ["parser", "minifier", "utils", "visit"] } +swc_common = { version = "0.23.0", features = ["concurrent", "sourcemap"] } +swc_css = "0.111.0" +swc_css_prefixer = "0.107.0" +swc_ecmascript = { version = "0.180.0", features = ["parser", "minifier", "utils", "visit"] } tracing = "0.1.32" [dev-dependencies] -swc_ecma_transforms_testing = "0.91.0" -testing = "0.20.1" +swc_ecma_transforms_testing = "0.99.0" +testing = "0.25.0" diff --git a/packages/next-swc/crates/wasm/Cargo.toml b/packages/next-swc/crates/wasm/Cargo.toml index 76a4c49724ba..2bb249507988 100644 --- a/packages/next-swc/crates/wasm/Cargo.toml +++ b/packages/next-swc/crates/wasm/Cargo.toml @@ -20,15 +20,15 @@ plugin = [ anyhow = "1.0.42" console_error_panic_hook = "0.1.6" next-swc = {version = "0.0.0", path = "../core"} -once_cell = "1.3.1" +once_cell = "1.13.0" parking_lot_core = "=0.8.0" path-clean = "0.1" serde = {version = "1", features = ["derive"]} serde_json = "1" -swc = "0.188.0" -swc_common = { version = "0.18.9", features = ["concurrent", "sourcemap"] } -swc_ecmascript = { version = "0.164.0", features = ["codegen", "minifier", "optimization", "parser", "react", "transforms", "typescript", "utils", "visit"] } -swc_plugin_runner = { version = "0.56.0", default-features = false, optional = true } +swc = "0.205.0" +swc_common = { version = "0.23.0", features = ["concurrent", "sourcemap"] } +swc_ecmascript = { version = "0.180.0", features = ["codegen", "minifier", "optimization", "parser", "react", "transforms", "typescript", "utils", "visit"] } +swc_plugin_runner = { version = "0.64.0", default-features = false, optional = true } tracing = { version = "0.1.32", features = ["release_max_level_off"] } wasm-bindgen = {version = "0.2", features = ["serde-serialize"]} wasm-bindgen-futures = "0.4.8"