From cc600813179ffbfb71c598254efcbe27332af732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Mon, 26 Sep 2022 20:03:15 +0900 Subject: [PATCH 1/7] Update swc --- packages/next-swc/Cargo.lock | 161 +++++++++--------- packages/next-swc/crates/core/Cargo.toml | 6 +- packages/next-swc/crates/emotion/Cargo.toml | 6 +- .../crates/modularize_imports/Cargo.toml | 6 +- packages/next-swc/crates/napi/Cargo.toml | 2 +- .../crates/styled_components/Cargo.toml | 6 +- .../next-swc/crates/styled_jsx/Cargo.toml | 6 +- packages/next-swc/crates/wasm/Cargo.toml | 2 +- 8 files changed, 97 insertions(+), 98 deletions(-) diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock index f814c51d89312..dc212fd2df615 100644 --- a/packages/next-swc/Cargo.lock +++ b/packages/next-swc/Cargo.lock @@ -162,9 +162,9 @@ dependencies = [ [[package]] name = "binding_macros" -version = "0.16.0" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceea0286ed654e11f014210fbfd23c5d4aac93fc76809275f11062f07b1d09c8" +checksum = "27863a262bf46619b7a15e57d10286c3c2554590441866ed1478ad4a8796fe77" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2987,9 +2987,9 @@ dependencies = [ [[package]] name = "swc" -version = "0.228.0" +version = "0.229.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6a3c9aa6fd3eb25e3e0eaa05ca6dc1705979badbec359fdf93ffa13c7f077e" +checksum = "6ea2ebfc521beccad8282e849331d12ffc8cc5fcb12760f498735a630105668c" dependencies = [ "ahash", "anyhow", @@ -3051,9 +3051,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.189.0" +version = "0.190.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f3fbf030930093f3a2c5fa81aa5f23de59a35e1a09f433a2b50d6330e76959" +checksum = "de9f216108630b807dc3c747329f647e5af68e24906f34f5ff90f608b402048b" dependencies = [ "ahash", "anyhow", @@ -3100,9 +3100,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.28.10" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3926afd43f50edea791744d97d5fa38bde997978531d36ed507b2b908f920695" +checksum = "4b95d085a4d538abe1559a48e52e294c04ec2a1dc6388227834e016b5247cad2" dependencies = [ "ahash", "anyhow", @@ -3159,9 +3159,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2690f8c60fae7628d7def61441b48040aaaccfa1e05bbaae25845777cccca48e" +checksum = "3a3f6be8151406951f0ef3fb76cc24b10f3c29c0d9fc8a2912361c5cdad5e058" dependencies = [ "binding_macros", "swc", @@ -3197,9 +3197,9 @@ dependencies = [ [[package]] name = "swc_css_ast" -version = "0.113.2" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f131c72ef8d472fc42d646ecfe57fe796a00e9239204faea329810d659436b9" +checksum = "6659ea06457fbcdc9c6e9e316f299ff9fc1b7c51f71b1bdb055bd40b54c39d77" dependencies = [ "is-macro", "serde", @@ -3210,9 +3210,9 @@ dependencies = [ [[package]] name = "swc_css_codegen" -version = "0.123.4" +version = "0.124.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1aaa07d2079f789c258130a89a842f85fee092c8d2571cf7181f004352b863" +checksum = "464def2cb7c2d0cf2fda0671ac86ea60513481154e509be81fb572cce6e1aec8" dependencies = [ "auto_impl", "bitflags", @@ -3239,9 +3239,9 @@ dependencies = [ [[package]] name = "swc_css_parser" -version = "0.122.4" +version = "0.123.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04185aba148e49292f5ef767307c6079a79765e55d40c9f2c635068bf3293e37" +checksum = "1d2f4256093f4ae40309198abf2f73e71e2e703fb525b98524829abbd2496f13" dependencies = [ "bitflags", "lexical", @@ -3253,9 +3253,9 @@ dependencies = [ [[package]] name = "swc_css_prefixer" -version = "0.124.4" +version = "0.125.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff72bb96537bf8ae56624547fc92f5bbf228ce3fe9582850527099ad4dae3a8" +checksum = "435b66fd766f61173446a37d260a25dbce1c3c74b28e70c1586f99d8bbb5245c" dependencies = [ "once_cell", "preset_env_base", @@ -3270,9 +3270,9 @@ dependencies = [ [[package]] name = "swc_css_utils" -version = "0.110.2" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bea1364664e6b5e1681ae50b77a854988a3adc620430196cac480c0b388396" +checksum = "2989aeaf9dfddfe59bbdc9766d3dd454289c5f53abd93d947b39958941f4b155" dependencies = [ "once_cell", "serde", @@ -3285,9 +3285,9 @@ dependencies = [ [[package]] name = "swc_css_visit" -version = "0.112.3" +version = "0.113.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd2e1949103f672b9f4401feedd2d4ba53a2295997d832e9c89e3a0b1769f00" +checksum = "a1f5a6a1faf28505c05603aa0d38e8444d6b3285b4e3c969a9713a8bbf42ca7f" dependencies = [ "serde", "swc_atoms", @@ -3298,9 +3298,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.93.0" +version = "0.94.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d9721a0e1a6a2ff6f0d127a337a5124e88be0429d93bd2833e83bad8d7bf324" +checksum = "f8626020a22a0691bf167b08617942364ee45590ac8f14a3a129c1ed5c31d054" dependencies = [ "bitflags", "is-macro", @@ -3316,9 +3316,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.126.0" +version = "0.127.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b63ef4fa9a6ff791c8b43a120e7f7386530e0970a53f69fee494388e2f0fc6" +checksum = "8f2fd4680eaee1cf7baf7e50f35b89ee49306a701c93d0c5a970912088f3af34" dependencies = [ "memchr", "num-bigint", @@ -3348,9 +3348,9 @@ dependencies = [ [[package]] name = "swc_ecma_ext_transforms" -version = "0.90.0" +version = "0.91.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da0ab1b64fa81f2670e40a122a5ad8416a95bbb0425829c774088155358d45a" +checksum = "c3f5f951aa77cf9b3fd95259b5342eca82cbfb7534ebce206fa34795565d3ad4" dependencies = [ "phf", "swc_atoms", @@ -3362,9 +3362,9 @@ dependencies = [ [[package]] name = "swc_ecma_lints" -version = "0.65.0" +version = "0.66.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af606e1eebb93f1d9d09cdc5200ff7e6c491cbe0493948cb29ba5f8d3e6327d7" +checksum = "8d91d3e136e2c08ce22417daf988b2c41ae3ab7032c77cc848159f11ae71113a" dependencies = [ "ahash", "auto_impl", @@ -3383,9 +3383,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.40.10" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cf15b506bf98839d91d0a5f7f21cd1ced9e3eeaa3be2664991f0b1788e8b9" +checksum = "350139badbf8e73a47377fe7ae0a1e149934b001f057f9f937404502480c6a88" dependencies = [ "ahash", "anyhow", @@ -3405,9 +3405,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.156.0" +version = "0.157.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a0efeb9a4954a5f2c1201c5ca13706f917fdd41928c412cd74746405aca372" +checksum = "4915098f45fe9221e4c5afd0842d585de0046b9d4746f3807a9646d65426169f" dependencies = [ "ahash", "arrayvec", @@ -3439,9 +3439,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.121.0" +version = "0.122.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b669d504192a57a6e7fdb801c980fcbd3c7447cd2e3750f21aaeb44092a96665" +checksum = "cb31221942e547f6bea8a7893f98687fbd804a689621ca4a9d0c77050a617516" dependencies = [ "either", "enum_kind", @@ -3458,9 +3458,9 @@ dependencies = [ [[package]] name = "swc_ecma_preset_env" -version = "0.171.0" +version = "0.172.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a428026cd44fee29c8bb566b610163b27a920ea85d2675d4261348f686657a7f" +checksum = "c5398a8c8e875a27e89082ae8240b6277011fcb5e41c4a0316025027322fb049" dependencies = [ "ahash", "anyhow", @@ -3483,9 +3483,9 @@ dependencies = [ [[package]] name = "swc_ecma_testing" -version = "0.19.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f66dbab0f4e3bdf728d0e60fb83672c52347da018de280868ce07ff53633fc7" +checksum = "e51e0ed2f95be51c6a8ae1180ffbe6bc8c3e0162d2e6a568b84c0437eebfc2bb" dependencies = [ "anyhow", "hex", @@ -3493,16 +3493,15 @@ dependencies = [ "swc_atoms", "swc_common", "swc_ecma_ast", - "swc_ecma_codegen", "testing", "tracing", ] [[package]] name = "swc_ecma_transforms" -version = "0.195.0" +version = "0.196.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ad3638d8e60c57b78cc2b6a5d25c19241ae6f9189ea3b9dd7b4b6eb1f313f3" +checksum = "51e750deaa69d95100659aad20505da9d4c400f84f00276d583927d1b2a663f3" dependencies = [ "swc_atoms", "swc_common", @@ -3520,9 +3519,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.110.0" +version = "0.111.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2066e43ea098251d8cd3bea4115a9139913e27cfbbe91377bee6126e5c54b04" +checksum = "5b0a1da8117284fe62eaccbd15a8f7ba36596a227168df5edb3a50fbf11f4e47" dependencies = [ "better_scoped_tls", "bitflags", @@ -3543,9 +3542,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.99.0" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c67e13a366caff8c127c960d26494b9a50209c3da23baa53a3651db025b3f" +checksum = "cf689963f9c19940de02f491d8e24c1e714b74fc7fce27adbbf720edd95d827a" dependencies = [ "swc_atoms", "swc_common", @@ -3557,9 +3556,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.133.0" +version = "0.134.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4894b38cec47aecf6b4e2fec852499c8c3577d8af25729146e98233015192576" +checksum = "f7100adc60c95490d6e06d72bb96dc7f778b5a204e26b85f533d6d4a7775179b" dependencies = [ "ahash", "arrayvec", @@ -3598,9 +3597,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_module" -version = "0.150.0" +version = "0.151.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b204d3efdc29c84a0661480cc5d7bc917fa9062623b7fcca008c8efc568a40" +checksum = "63015aeabf9c9d234551b5417c9cc12ca0472969c0979e252c8d30274a1e76a6" dependencies = [ "Inflector", "ahash", @@ -3626,9 +3625,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.164.0" +version = "0.165.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dc0c237a127b075942baf0796c788dbe1adfe6dd98a87fe50090aa026a0156" +checksum = "8341b29ba20abdb61b1d6eb78e40ec9f9f3817c5a77d7eaf243c4caa3d90f351" dependencies = [ "ahash", "dashmap", @@ -3652,9 +3651,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.141.0" +version = "0.142.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83ed71de103b38f257d962aa2289844011aee572861ff1490c061d2df8cc827c" +checksum = "2c11d788fc5e88614f8f13a182acebf838e66827e7f6a5a003ef7a31b886402a" dependencies = [ "either", "serde", @@ -3671,9 +3670,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.152.0" +version = "0.153.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e56ed952dd5a53b57b1b2b3e4bf26347f4af7f152ed621fe820f939678d570e" +checksum = "43c587cd309664b38257d5a790d49668f73cd6c24783d6d4784564a528f52c3b" dependencies = [ "ahash", "base64 0.13.0", @@ -3698,9 +3697,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.112.0" +version = "0.113.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5b3d434e5c38eab5ba74a474112c221f571f15acda24cc4b47ded516444b0e" +checksum = "cab0308971d9089e54e3cdcee32c55d88682bf93b7f12761a109897ee175c0ad" dependencies = [ "ansi_term", "anyhow", @@ -3722,9 +3721,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.156.0" +version = "0.157.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e9cac5e6fb44a735aa5af23187f900fda02f98ee29d21ad88a90e21ec0b3c" +checksum = "ec559f7359507646bdbc3288122b5a04e3395f111ba70b58c012d749ba9f862b" dependencies = [ "serde", "swc_atoms", @@ -3738,9 +3737,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.104.0" +version = "0.105.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cb804f9c7d09b5bbae3daf0a9dc4d678b70c21b07cbb0c864e50a978a14502" +checksum = "c9edefea41d7ab524ecff81acd6c7a123547a74c696f380bcf42047abb1f3149" dependencies = [ "indexmap", "num_cpus", @@ -3756,9 +3755,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.79.0" +version = "0.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d041e63b7034961e52c969e094469fa01b22dbd840c928590e5cac2154f82d0b" +checksum = "8ddb5d0ee90a60e59fa61f275eaf5b5197d5b6dc30854c752b254ad067c54696" dependencies = [ "num-bigint", "swc_atoms", @@ -3800,9 +3799,9 @@ dependencies = [ [[package]] name = "swc_error_reporters" -version = "0.12.10" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d57d1b1fb0da73e20caadb86755db4d3371849c704c86dbaecd3f3968fc1cb4" +checksum = "5799716d1810cb8525df980291de685b3d6c6bc65fb9582dd4167b8309a3bd58" dependencies = [ "anyhow", "miette", @@ -3813,9 +3812,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.16.10" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97abd88688673d693aec09551783b067f4d4fff82f8e982b91160dd7febad484" +checksum = "b62ef71d800c58a2dc5b4e657e77c62543f0d15991063417acbd323dbd7e2c32" dependencies = [ "ahash", "indexmap", @@ -3825,9 +3824,9 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "849c10de6bc42b930d54186137c177bfc5e4c525870ed0dccdd5bf963be1ea10" +checksum = "b414e0b8b6ff70348d44202584ca304b368dc5637ae274c654651d751644da71" dependencies = [ "ahash", "auto_impl", @@ -3860,9 +3859,9 @@ dependencies = [ [[package]] name = "swc_node_comments" -version = "0.15.10" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c7e415e35959e8118fd74ffee2d4a18bf459dac1293163735a294cba476cb9" +checksum = "e8e89032596708c0355644b3924a1cb9d88b07e0ed269a1e0bd6cc11c9920772" dependencies = [ "ahash", "dashmap", @@ -3872,9 +3871,9 @@ dependencies = [ [[package]] name = "swc_plugin_proxy" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e089036738edc1c1cd8d521226cbdb0235cc6bafde99b04baffb0133e5c238ae" +checksum = "f28339049cdb77f539250b9630fa7fc421eada85a992b63047c613cb46c8ef64" dependencies = [ "better_scoped_tls", "rkyv", @@ -3886,9 +3885,9 @@ dependencies = [ [[package]] name = "swc_plugin_runner" -version = "0.76.0" +version = "0.77.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd8229d2ed13027ddf59912ca973b8e062b368f32953e877498831e1ac6414bd" +checksum = "88359757a9b03ec4939dcb9799d61eb841d7d12be4f3f8b6839e1a400772a524" dependencies = [ "anyhow", "once_cell", @@ -3906,9 +3905,9 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.16.10" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e626e120ae437a135d679de736089493e5ba1c2d9b6e8c726f7105a17867858" +checksum = "81cec1c10268bcd3e134553483b6b964dade269d1d027046723b6c08fd22a73d" dependencies = [ "tracing", ] @@ -4000,9 +3999,9 @@ dependencies = [ [[package]] name = "testing" -version = "0.30.10" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5584041a02f6327d9ec378b4e389dc0b5e748bb99705b765941a8e55f7d83d14" +checksum = "8a1058cadca72c32c3a06b460cd6a025acc5655d058d476c8a636749618d02f7" dependencies = [ "ansi_term", "difference", diff --git a/packages/next-swc/crates/core/Cargo.toml b/packages/next-swc/crates/core/Cargo.toml index 867158924899c..2053ff1596447 100644 --- a/packages/next-swc/crates/core/Cargo.toml +++ b/packages/next-swc/crates/core/Cargo.toml @@ -28,7 +28,7 @@ styled_jsx = {path="../styled_jsx"} modularize_imports = {path="../modularize_imports"} tracing = { version = "0.1.32", features = ["release_max_level_info"] } -swc_core = { version = "0.26.0", features = [ +swc_core = { version = "0.27.2", features = [ "common_concurrent", "ecma_ast", "ecma_visit", @@ -48,6 +48,6 @@ swc_core = { version = "0.26.0", features = [ ] } [dev-dependencies] -swc_core = { version = "0.26.0", features = ["testing_transform"] } -testing = "0.30.10" +swc_core = { version = "0.27.2", features = ["testing_transform"] } +testing = "0.31.1" walkdir = "2.3.2" diff --git a/packages/next-swc/crates/emotion/Cargo.toml b/packages/next-swc/crates/emotion/Cargo.toml index 32281c8865b5b..c140eca19a257 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 = { version = "0.26.0", features = ["common", "ecma_ast","ecma_codegen", "ecma_utils", "ecma_visit", "trace_macro"] } +swc_core = { version = "0.27.2", features = ["common", "ecma_ast","ecma_codegen", "ecma_utils", "ecma_visit", "trace_macro"] } [dev-dependencies] -swc_core = { version = "0.26.0", features = ["testing_transform", "ecma_transforms_react"] } -testing = "0.30.10" +swc_core = { version = "0.27.2", features = ["testing_transform", "ecma_transforms_react"] } +testing = "0.31.1" serde_json = "1" diff --git a/packages/next-swc/crates/modularize_imports/Cargo.toml b/packages/next-swc/crates/modularize_imports/Cargo.toml index 3f3ad4b9b95c8..299e5ed4de01a 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 = { version = "0.26.0", features = ["cached", "ecma_ast", "ecma_visit"] } +swc_core = { version = "0.27.2", features = ["cached", "ecma_ast", "ecma_visit"] } [dev-dependencies] -swc_core = { version = "0.26.0", features = ["testing_transform"] } -testing = "0.30.10" +swc_core = { version = "0.27.2", features = ["testing_transform"] } +testing = "0.31.1" diff --git a/packages/next-swc/crates/napi/Cargo.toml b/packages/next-swc/crates/napi/Cargo.toml index d113298bd2722..c7b85fd039fbf 100644 --- a/packages/next-swc/crates/napi/Cargo.toml +++ b/packages/next-swc/crates/napi/Cargo.toml @@ -30,7 +30,7 @@ next-swc = {version = "0.0.0", path = "../core"} once_cell = "1.13.0" serde = "1" serde_json = "1" -swc_core = { version = "0.26.0", features = [ +swc_core = { version = "0.27.2", features = [ "allocator_node", "base_concurrent", # concurrent? "common_concurrent", diff --git a/packages/next-swc/crates/styled_components/Cargo.toml b/packages/next-swc/crates/styled_components/Cargo.toml index 98166ecf94210..226721a05e033 100644 --- a/packages/next-swc/crates/styled_components/Cargo.toml +++ b/packages/next-swc/crates/styled_components/Cargo.toml @@ -16,7 +16,7 @@ once_cell = "1.13.0" regex = {version = "1.5.4", features = ["std", "perf"], default-features = false} serde = {version = "1.0.130", features = ["derive"]} tracing = "0.1.32" -swc_core = { version = "0.26.0", features = [ +swc_core = { version = "0.27.2", features = [ "common", "ecma_ast", "ecma_utils", @@ -25,8 +25,8 @@ swc_core = { version = "0.26.0", features = [ [dev-dependencies] serde_json = "1" -testing = "0.30.10" -swc_core = { version = "0.26.0", features = [ +testing = "0.31.1" +swc_core = { version = "0.27.2", features = [ "ecma_parser", "ecma_transforms", "testing_transform" diff --git a/packages/next-swc/crates/styled_jsx/Cargo.toml b/packages/next-swc/crates/styled_jsx/Cargo.toml index 2b44064f4704b..8cb8b68f3db68 100644 --- a/packages/next-swc/crates/styled_jsx/Cargo.toml +++ b/packages/next-swc/crates/styled_jsx/Cargo.toml @@ -13,7 +13,7 @@ version = "0.19.0" easy-error = "1.0.0" tracing = "0.1.32" -swc_core = { version = "0.26.0", features = [ +swc_core = { version = "0.27.2", features = [ "common", "css_ast", "css_codegen", @@ -27,7 +27,7 @@ swc_core = { version = "0.26.0", features = [ ] } [dev-dependencies] -testing = "0.30.10" -swc_core = { version = "0.26.0", features = [ +testing = "0.31.1" +swc_core = { version = "0.27.2", features = [ "testing_transform" ] } diff --git a/packages/next-swc/crates/wasm/Cargo.toml b/packages/next-swc/crates/wasm/Cargo.toml index 3779772219e05..2e46b2bda0847 100644 --- a/packages/next-swc/crates/wasm/Cargo.toml +++ b/packages/next-swc/crates/wasm/Cargo.toml @@ -31,7 +31,7 @@ wasm-bindgen-futures = "0.4.8" getrandom = { version = "0.2.5", optional = true, default-features = false } js-sys = "0.3.59" -swc_core = { version = "0.26.0", features = [ +swc_core = { version = "0.27.2", features = [ "common_concurrent", "binding_macro_wasm", "ecma_codegen", From 00dad18b7d4f72889aeb7f7a82f24238b63d70bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 27 Sep 2022 12:11:03 +0900 Subject: [PATCH 2/7] rustc --- packages/next-swc/rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next-swc/rust-toolchain b/packages/next-swc/rust-toolchain index 928512b397cc7..fdd6c8279e690 100644 --- a/packages/next-swc/rust-toolchain +++ b/packages/next-swc/rust-toolchain @@ -1 +1 @@ -nightly-2022-06-12 \ No newline at end of file +nightly-2022-09-14 From 1490f742610f8a8f175342a962ba4cf0369fc322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 27 Sep 2022 12:24:28 +0900 Subject: [PATCH 3/7] UPdate swc --- packages/next-swc/Cargo.lock | 20 +++++++++---------- packages/next-swc/crates/core/Cargo.toml | 4 ++-- packages/next-swc/crates/emotion/Cargo.toml | 4 ++-- .../crates/modularize_imports/Cargo.toml | 4 ++-- packages/next-swc/crates/napi/Cargo.toml | 2 +- .../crates/styled_components/Cargo.toml | 4 ++-- .../next-swc/crates/styled_jsx/Cargo.toml | 4 ++-- packages/next-swc/crates/wasm/Cargo.toml | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock index dc212fd2df615..d28e54c7678b6 100644 --- a/packages/next-swc/Cargo.lock +++ b/packages/next-swc/Cargo.lock @@ -162,9 +162,9 @@ dependencies = [ [[package]] name = "binding_macros" -version = "0.17.2" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27863a262bf46619b7a15e57d10286c3c2554590441866ed1478ad4a8796fe77" +checksum = "544c4328d391914666891ceddf95b29c573ed80a48060f1a50cac203d8bba5b5" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2987,9 +2987,9 @@ dependencies = [ [[package]] name = "swc" -version = "0.229.2" +version = "0.229.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea2ebfc521beccad8282e849331d12ffc8cc5fcb12760f498735a630105668c" +checksum = "a709e9a5a674d61d4f008049c63ba448f3503561ef79e666f7b04aee25882ea0" dependencies = [ "ahash", "anyhow", @@ -3051,9 +3051,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.190.2" +version = "0.190.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de9f216108630b807dc3c747329f647e5af68e24906f34f5ff90f608b402048b" +checksum = "74faca71deca740b65919a879582a480affcf15122bb839aa89db706a39fafe2" dependencies = [ "ahash", "anyhow", @@ -3159,9 +3159,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.27.2" +version = "0.27.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3f6be8151406951f0ef3fb76cc24b10f3c29c0d9fc8a2912361c5cdad5e058" +checksum = "85f56c4d3c88e027b0be8190622f35bf14950facd30a074205937647ddbe5d0c" dependencies = [ "binding_macros", "swc", @@ -3405,9 +3405,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.157.2" +version = "0.157.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4915098f45fe9221e4c5afd0842d585de0046b9d4746f3807a9646d65426169f" +checksum = "c82fe448df0b80f5f0220615fa42a0a431a604e7c7703cac14918da8beb3931e" dependencies = [ "ahash", "arrayvec", diff --git a/packages/next-swc/crates/core/Cargo.toml b/packages/next-swc/crates/core/Cargo.toml index 2053ff1596447..2816c87b7bc14 100644 --- a/packages/next-swc/crates/core/Cargo.toml +++ b/packages/next-swc/crates/core/Cargo.toml @@ -28,7 +28,7 @@ styled_jsx = {path="../styled_jsx"} modularize_imports = {path="../modularize_imports"} tracing = { version = "0.1.32", features = ["release_max_level_info"] } -swc_core = { version = "0.27.2", features = [ +swc_core = { version = "0.27.4", features = [ "common_concurrent", "ecma_ast", "ecma_visit", @@ -48,6 +48,6 @@ swc_core = { version = "0.27.2", features = [ ] } [dev-dependencies] -swc_core = { version = "0.27.2", features = ["testing_transform"] } +swc_core = { version = "0.27.4", features = ["testing_transform"] } testing = "0.31.1" walkdir = "2.3.2" diff --git a/packages/next-swc/crates/emotion/Cargo.toml b/packages/next-swc/crates/emotion/Cargo.toml index c140eca19a257..eaa47dfee3e8f 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 = { version = "0.27.2", features = ["common", "ecma_ast","ecma_codegen", "ecma_utils", "ecma_visit", "trace_macro"] } +swc_core = { version = "0.27.4", features = ["common", "ecma_ast","ecma_codegen", "ecma_utils", "ecma_visit", "trace_macro"] } [dev-dependencies] -swc_core = { version = "0.27.2", features = ["testing_transform", "ecma_transforms_react"] } +swc_core = { version = "0.27.4", features = ["testing_transform", "ecma_transforms_react"] } testing = "0.31.1" serde_json = "1" diff --git a/packages/next-swc/crates/modularize_imports/Cargo.toml b/packages/next-swc/crates/modularize_imports/Cargo.toml index 299e5ed4de01a..d7e547b03f5ed 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 = { version = "0.27.2", features = ["cached", "ecma_ast", "ecma_visit"] } +swc_core = { version = "0.27.4", features = ["cached", "ecma_ast", "ecma_visit"] } [dev-dependencies] -swc_core = { version = "0.27.2", features = ["testing_transform"] } +swc_core = { version = "0.27.4", features = ["testing_transform"] } testing = "0.31.1" diff --git a/packages/next-swc/crates/napi/Cargo.toml b/packages/next-swc/crates/napi/Cargo.toml index c7b85fd039fbf..7f1af952f2952 100644 --- a/packages/next-swc/crates/napi/Cargo.toml +++ b/packages/next-swc/crates/napi/Cargo.toml @@ -30,7 +30,7 @@ next-swc = {version = "0.0.0", path = "../core"} once_cell = "1.13.0" serde = "1" serde_json = "1" -swc_core = { version = "0.27.2", features = [ +swc_core = { version = "0.27.4", features = [ "allocator_node", "base_concurrent", # concurrent? "common_concurrent", diff --git a/packages/next-swc/crates/styled_components/Cargo.toml b/packages/next-swc/crates/styled_components/Cargo.toml index 226721a05e033..d21cc899ff9f4 100644 --- a/packages/next-swc/crates/styled_components/Cargo.toml +++ b/packages/next-swc/crates/styled_components/Cargo.toml @@ -16,7 +16,7 @@ once_cell = "1.13.0" regex = {version = "1.5.4", features = ["std", "perf"], default-features = false} serde = {version = "1.0.130", features = ["derive"]} tracing = "0.1.32" -swc_core = { version = "0.27.2", features = [ +swc_core = { version = "0.27.4", features = [ "common", "ecma_ast", "ecma_utils", @@ -26,7 +26,7 @@ swc_core = { version = "0.27.2", features = [ [dev-dependencies] serde_json = "1" testing = "0.31.1" -swc_core = { version = "0.27.2", features = [ +swc_core = { version = "0.27.4", features = [ "ecma_parser", "ecma_transforms", "testing_transform" diff --git a/packages/next-swc/crates/styled_jsx/Cargo.toml b/packages/next-swc/crates/styled_jsx/Cargo.toml index 8cb8b68f3db68..11fa2fcb3c298 100644 --- a/packages/next-swc/crates/styled_jsx/Cargo.toml +++ b/packages/next-swc/crates/styled_jsx/Cargo.toml @@ -13,7 +13,7 @@ version = "0.19.0" easy-error = "1.0.0" tracing = "0.1.32" -swc_core = { version = "0.27.2", features = [ +swc_core = { version = "0.27.4", features = [ "common", "css_ast", "css_codegen", @@ -28,6 +28,6 @@ swc_core = { version = "0.27.2", features = [ [dev-dependencies] testing = "0.31.1" -swc_core = { version = "0.27.2", features = [ +swc_core = { version = "0.27.4", features = [ "testing_transform" ] } diff --git a/packages/next-swc/crates/wasm/Cargo.toml b/packages/next-swc/crates/wasm/Cargo.toml index 2e46b2bda0847..5f51c681093ea 100644 --- a/packages/next-swc/crates/wasm/Cargo.toml +++ b/packages/next-swc/crates/wasm/Cargo.toml @@ -31,7 +31,7 @@ wasm-bindgen-futures = "0.4.8" getrandom = { version = "0.2.5", optional = true, default-features = false } js-sys = "0.3.59" -swc_core = { version = "0.27.2", features = [ +swc_core = { version = "0.27.4", features = [ "common_concurrent", "binding_macro_wasm", "ecma_codegen", From 8f8978c3741ecbb86bc7aa34caba6712c9a46cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 27 Sep 2022 12:28:04 +0900 Subject: [PATCH 4/7] Bump --- packages/next-swc/Cargo.lock | 8 ++++---- packages/next-swc/crates/emotion/Cargo.toml | 2 +- packages/next-swc/crates/modularize_imports/Cargo.toml | 2 +- packages/next-swc/crates/styled_components/Cargo.toml | 2 +- packages/next-swc/crates/styled_jsx/Cargo.toml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock index d28e54c7678b6..4993b84fb399e 100644 --- a/packages/next-swc/Cargo.lock +++ b/packages/next-swc/Cargo.lock @@ -1531,7 +1531,7 @@ dependencies = [ [[package]] name = "modularize_imports" -version = "0.19.0" +version = "0.20.0" dependencies = [ "convert_case", "handlebars", @@ -2929,7 +2929,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "styled_components" -version = "0.44.0" +version = "0.45.0" dependencies = [ "Inflector", "once_cell", @@ -2943,7 +2943,7 @@ dependencies = [ [[package]] name = "styled_jsx" -version = "0.19.0" +version = "0.20.0" dependencies = [ "easy-error", "swc_core", @@ -3769,7 +3769,7 @@ dependencies = [ [[package]] name = "swc_emotion" -version = "0.21.0" +version = "0.22.0" dependencies = [ "base64 0.13.0", "byteorder", diff --git a/packages/next-swc/crates/emotion/Cargo.toml b/packages/next-swc/crates/emotion/Cargo.toml index eaa47dfee3e8f..01d5eb73961c6 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.21.0" +version = "0.22.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/packages/next-swc/crates/modularize_imports/Cargo.toml b/packages/next-swc/crates/modularize_imports/Cargo.toml index d7e547b03f5ed..f798f0db7e4a8 100644 --- a/packages/next-swc/crates/modularize_imports/Cargo.toml +++ b/packages/next-swc/crates/modularize_imports/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" license = "Apache-2.0" name = "modularize_imports" repository = "https://github.com/vercel/next.js.git" -version = "0.19.0" +version = "0.20.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/packages/next-swc/crates/styled_components/Cargo.toml b/packages/next-swc/crates/styled_components/Cargo.toml index d21cc899ff9f4..59f2eafec5565 100644 --- a/packages/next-swc/crates/styled_components/Cargo.toml +++ b/packages/next-swc/crates/styled_components/Cargo.toml @@ -6,7 +6,7 @@ include = ["Cargo.toml", "src/**/*.rs"] license = "Apache-2.0" name = "styled_components" repository = "https://github.com/vercel/next.js.git" -version = "0.44.0" +version = "0.45.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/packages/next-swc/crates/styled_jsx/Cargo.toml b/packages/next-swc/crates/styled_jsx/Cargo.toml index 11fa2fcb3c298..9764ed1923bf8 100644 --- a/packages/next-swc/crates/styled_jsx/Cargo.toml +++ b/packages/next-swc/crates/styled_jsx/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" license = "Apache-2.0" name = "styled_jsx" repository = "https://github.com/vercel/next.js.git" -version = "0.19.0" +version = "0.20.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From c5d34f5fdb90827c80074dbd474f775f38f94aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 27 Sep 2022 12:36:46 +0900 Subject: [PATCH 5/7] Fix CI --- .github/workflows/build_test_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml index 85558349a7e79..b50ad040edc54 100644 --- a/.github/workflows/build_test_deploy.yml +++ b/.github/workflows/build_test_deploy.yml @@ -9,7 +9,7 @@ name: Build, test, and deploy env: NAPI_CLI_VERSION: 2.7.0 TURBO_VERSION: 1.3.2-canary.1 - RUST_TOOLCHAIN: nightly-2022-06-12 + RUST_TOOLCHAIN: nightly-2022-09-14 PNPM_VERSION: 7.2.1 jobs: From a9f69e082fc2c47f55e9ef20bf4999bc9d8fcdeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 27 Sep 2022 12:46:22 +0900 Subject: [PATCH 6/7] --fix --- packages/next-swc/crates/core/src/next_dynamic.rs | 2 +- .../core/src/next_font_loaders/font_imports_generator.rs | 6 +++--- .../next-swc/crates/styled_components/src/utils/analyzer.rs | 4 ++-- .../styled_components/src/visitors/display_name_and_id.rs | 2 +- .../src/visitors/transpile_css_prop/transpile.rs | 4 ++-- packages/next-swc/crates/styled_jsx/src/lib.rs | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/next-swc/crates/core/src/next_dynamic.rs b/packages/next-swc/crates/core/src/next_dynamic.rs index 0bd30a6682b0e..ecc3d726cdcf4 100644 --- a/packages/next-swc/crates/core/src/next_dynamic.rs +++ b/packages/next-swc/crates/core/src/next_dynamic.rs @@ -319,7 +319,7 @@ fn rel_filename(base: Option<&Path>, file: &FileName) -> String { } }; - let rel_path = diff_paths(&file, base); + let rel_path = diff_paths(file, base); let rel_path = match rel_path { Some(v) => v, diff --git a/packages/next-swc/crates/core/src/next_font_loaders/font_imports_generator.rs b/packages/next-swc/crates/core/src/next_font_loaders/font_imports_generator.rs index ae92e811e406d..169a46c1d7262 100644 --- a/packages/next-swc/crates/core/src/next_font_loaders/font_imports_generator.rs +++ b/packages/next-swc/crates/core/src/next_font_loaders/font_imports_generator.rs @@ -31,7 +31,7 @@ impl<'a> FontImportsGenerator<'a> { }); } - expr_to_json(&*expr_or_spread.expr) + expr_to_json(&expr_or_spread.expr) }) .collect(); @@ -182,7 +182,7 @@ fn object_lit_to_json(object_lit: &ObjectLit) -> Value { Err(()) } }; - let val = expr_to_json(&*key_val.value); + let val = expr_to_json(&key_val.value); if let (Ok(key), Ok(val)) = (key, val) { values.insert(key, val); } @@ -226,7 +226,7 @@ fn expr_to_json(expr: &Expr) -> Result { .emit(); Err(()) }), - None => expr_to_json(&*expr.expr), + None => expr_to_json(&expr.expr), } } else { HANDLER.with(|handler| { diff --git a/packages/next-swc/crates/styled_components/src/utils/analyzer.rs b/packages/next-swc/crates/styled_components/src/utils/analyzer.rs index 9336b6112aefa..47adc9970ff71 100644 --- a/packages/next-swc/crates/styled_components/src/utils/analyzer.rs +++ b/packages/next-swc/crates/styled_components/src/utils/analyzer.rs @@ -23,7 +23,7 @@ impl VisitMut for AsAnalyzer { fn visit_mut_module(&mut self, p: &mut Module) { let mut v = Analyzer { config: &self.config, - state: &mut *self.state.borrow_mut(), + state: &mut self.state.borrow_mut(), }; p.visit_with(&mut v); @@ -32,7 +32,7 @@ impl VisitMut for AsAnalyzer { fn visit_mut_script(&mut self, p: &mut Script) { let mut v = Analyzer { config: &self.config, - state: &mut *self.state.borrow_mut(), + state: &mut self.state.borrow_mut(), }; p.visit_with(&mut v); diff --git a/packages/next-swc/crates/styled_components/src/visitors/display_name_and_id.rs b/packages/next-swc/crates/styled_components/src/visitors/display_name_and_id.rs index 1df6852878851..15e50117945c2 100644 --- a/packages/next-swc/crates/styled_components/src/visitors/display_name_and_id.rs +++ b/packages/next-swc/crates/styled_components/src/visitors/display_name_and_id.rs @@ -354,7 +354,7 @@ impl VisitMut for DisplayNameAndId { self.add_config( expr, - display_name.map(|s| DISPLAY_NAME_REGEX.replace_all(&*s, "").into()), + display_name.map(|s| DISPLAY_NAME_REGEX.replace_all(&s, "").into()), component_id, ) } diff --git a/packages/next-swc/crates/styled_components/src/visitors/transpile_css_prop/transpile.rs b/packages/next-swc/crates/styled_components/src/visitors/transpile_css_prop/transpile.rs index fcc1b7e18eacc..8ad2a45d1a8fc 100644 --- a/packages/next-swc/crates/styled_components/src/visitors/transpile_css_prop/transpile.rs +++ b/packages/next-swc/crates/styled_components/src/visitors/transpile_css_prop/transpile.rs @@ -251,7 +251,7 @@ impl VisitMut for TranspileCssProp { if expr.is_fn_expr() || expr.is_arrow() { acc.push(expr); return acc; - } else if let Some(root) = trace_root_value(&mut *expr) { + } else if let Some(root) = trace_root_value(&mut expr) { let direct_access = match root { Expr::Lit(_) => true, Expr::Ident(id) if self.is_top_level_ident(id) => true, @@ -643,7 +643,7 @@ fn trace_root_value(e: &mut Expr) -> Option<&mut Expr> { match e { Expr::Member(e) => trace_root_value(&mut e.obj), Expr::Call(e) => match &mut e.callee { - Callee::Expr(e) => trace_root_value(&mut **e), + Callee::Expr(e) => trace_root_value(e), _ => None, }, Expr::Ident(_) => Some(e), diff --git a/packages/next-swc/crates/styled_jsx/src/lib.rs b/packages/next-swc/crates/styled_jsx/src/lib.rs index 86236d700100c..bbf88931d63c4 100644 --- a/packages/next-swc/crates/styled_jsx/src/lib.rs +++ b/packages/next-swc/crates/styled_jsx/src/lib.rs @@ -176,7 +176,7 @@ impl Fold for StyledJSXTransformer { if let JSXElementName::Ident(Ident { sym, span, .. }) = &el.name { if sym != "style" && sym != self.style_import_name.as_ref().unwrap() - && (!is_capitalized(&**sym) + && (!is_capitalized(sym) || self .nearest_scope_bindings .contains(&(sym.clone(), span.ctxt))) @@ -750,7 +750,7 @@ fn get_style_expr(el: &JSXElement) -> Result { { return Ok(match &**expr { Expr::Lit(Lit::Str(str)) => StyleExpr::Str(str), - Expr::Tpl(tpl) => StyleExpr::Tpl(tpl, &**expr), + Expr::Tpl(tpl) => StyleExpr::Tpl(tpl, expr), Expr::Ident(ident) => StyleExpr::Ident(ident), _ => { HANDLER.with(|handler| { From b43527750c43a42375faf6a25c850c66ac19e732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Tue, 27 Sep 2022 12:47:40 +0900 Subject: [PATCH 7/7] More fix --- packages/next-swc/crates/core/src/relay.rs | 6 +----- .../src/visitors/display_name_and_id.rs | 10 ++++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/packages/next-swc/crates/core/src/relay.rs b/packages/next-swc/crates/core/src/relay.rs index 934d9207716da..dfae8c6ccf16d 100644 --- a/packages/next-swc/crates/core/src/relay.rs +++ b/packages/next-swc/crates/core/src/relay.rs @@ -173,11 +173,7 @@ impl<'a> Relay<'a> { } } -pub fn relay<'a>( - config: &'a Config, - file_name: FileName, - pages_dir: Option, -) -> impl Fold + '_ { +pub fn relay(config: &Config, file_name: FileName, pages_dir: Option) -> impl Fold + '_ { Relay { root_dir: std::env::current_dir().unwrap(), file_name, diff --git a/packages/next-swc/crates/styled_components/src/visitors/display_name_and_id.rs b/packages/next-swc/crates/styled_components/src/visitors/display_name_and_id.rs index 15e50117945c2..12e3cc15be78b 100644 --- a/packages/next-swc/crates/styled_components/src/visitors/display_name_and_id.rs +++ b/packages/next-swc/crates/styled_components/src/visitors/display_name_and_id.rs @@ -309,12 +309,10 @@ impl VisitMut for DisplayNameAndId { PropOrSpread::Prop(prop) => { match get_prop_name(prop) { Some(PropName::Ident(prop_name)) => { - match &*prop_name.sym { - "componentId" | "displayName" => { - true - } - _ => false, - } + matches!( + &*prop_name.sym, + "componentId" | "displayName" + ) } _ => false, }