From 14502192fbad9f5224e8ebe1c70bb8a965440b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Sun, 22 Oct 2023 14:45:58 -0700 Subject: [PATCH 01/27] fix --- .../css_client_reference_module.rs | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs b/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs index 3b4bef4c7dea5..8a3f6fc73cbd6 100644 --- a/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs +++ b/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs @@ -3,10 +3,14 @@ use turbo_tasks::Vc; use turbopack_binding::turbopack::{ core::{ asset::{Asset, AssetContent}, + chunk::ChunkingContext, ident::AssetIdent, module::Module, }, - turbopack::css::{chunk::CssChunkPlaceable, ParseCss, ParseCssResult}, + turbopack::css::{ + chunk::CssChunkPlaceable, CssWithPlaceholderResult, FinalCssResult, ParseCss, + ParseCssResult, ProcessCss, + }, }; /// A [`CssClientReferenceModule`] is a marker module used to indicate which @@ -63,3 +67,29 @@ impl ParseCss for CssClientReferenceModule { Ok(parse_css.parse_css()) } } + +#[turbo_tasks::value_impl] +impl ProcessCss for CssClientReferenceModule { + #[turbo_tasks::function] + async fn get_css_with_placeholder(&self) -> Result> { + let Some(imp) = Vc::try_resolve_sidecast::>(self.client_module).await? + else { + bail!("CSS client reference client module must be CSS processable"); + }; + + Ok(imp.get_css_with_placeholder()) + } + + #[turbo_tasks::function] + async fn finalize_css( + &self, + chunking_context: Vc>, + ) -> Result> { + let Some(imp) = Vc::try_resolve_sidecast::>(self.client_module).await? + else { + bail!("CSS client reference client module must be CSS processable"); + }; + + Ok(imp.finalize_css(chunking_context)) + } +} From 7a0af6255c1ce2208a1cc798bc5b3fd687e14f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Tue, 24 Oct 2023 17:11:32 -0700 Subject: [PATCH 02/27] Add dbg --- .../css_client_reference/css_client_reference_module.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs b/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs index 8a3f6fc73cbd6..3a1c1afb1c7ad 100644 --- a/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs +++ b/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs @@ -77,6 +77,8 @@ impl ProcessCss for CssClientReferenceModule { bail!("CSS client reference client module must be CSS processable"); }; + dbg!("imp.get_css_with_placeholder"); + Ok(imp.get_css_with_placeholder()) } @@ -90,6 +92,8 @@ impl ProcessCss for CssClientReferenceModule { bail!("CSS client reference client module must be CSS processable"); }; + dbg!("imp.finalize_css"); + Ok(imp.finalize_css(chunking_context)) } } From ca9395f4c3930c058d4013b16cc262c6cb648eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Tue, 24 Oct 2023 21:44:06 -0700 Subject: [PATCH 03/27] Remove dbg! --- .../css_client_reference/css_client_reference_module.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs b/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs index 3a1c1afb1c7ad..8a3f6fc73cbd6 100644 --- a/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs +++ b/packages/next-swc/crates/next-core/src/next_client_reference/css_client_reference/css_client_reference_module.rs @@ -77,8 +77,6 @@ impl ProcessCss for CssClientReferenceModule { bail!("CSS client reference client module must be CSS processable"); }; - dbg!("imp.get_css_with_placeholder"); - Ok(imp.get_css_with_placeholder()) } @@ -92,8 +90,6 @@ impl ProcessCss for CssClientReferenceModule { bail!("CSS client reference client module must be CSS processable"); }; - dbg!("imp.finalize_css"); - Ok(imp.finalize_css(chunking_context)) } } From 1ca3cef927be1d966cb7726f3db26830659921cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Wed, 25 Oct 2023 00:13:04 -0700 Subject: [PATCH 04/27] Patch lightningcss --- Cargo.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 5c989424d0b59..93702741631a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -135,3 +135,8 @@ url = "2.2.2" urlencoding = "2.1.2" webbrowser = "0.8.7" dhat = { version = "0.3.2" } + + +[patch.crates-io] +lightningcss = { git = "https://github.com/kdy1/lightningcss.git", branch = "derive-unsafe"} +parcel_selectors = { git = "https://github.com/kdy1/lightningcss.git", branch = "derive-unsafe" } From 09e1747160252b81350c38595370376b7defd488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Wed, 25 Oct 2023 00:13:23 -0700 Subject: [PATCH 05/27] cargo lockfile --- Cargo.lock | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc9811ebaec1e..0323e12117bfb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2868,8 +2868,7 @@ dependencies = [ [[package]] name = "lightningcss" version = "1.0.0-alpha.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06476660ee1e593a2672e4a342a1289708fd9936dcdf3e74433ad078145e9e3d" +source = "git+https://github.com/kdy1/lightningcss.git?branch=derive-unsafe#67b54837359da576b94c6cb8a73837fa6b41605a" dependencies = [ "ahash 0.7.6", "bitflags 2.4.0", @@ -2894,8 +2893,7 @@ dependencies = [ [[package]] name = "lightningcss-derive" version = "1.0.0-alpha.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f02a09f0b79d31f1ee13ea55e2f7021037c6b72e0a3ab6c1cb0e9bd7ac8a295" +source = "git+https://github.com/kdy1/lightningcss.git?branch=derive-unsafe#67b54837359da576b94c6cb8a73837fa6b41605a" dependencies = [ "proc-macro2", "quote", @@ -3826,8 +3824,7 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parcel_selectors" version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f000cdd23df6cebe999cf2b02a3bf40d55758f74883d7fd43a33690565618c8" +source = "git+https://github.com/kdy1/lightningcss.git?branch=derive-unsafe#67b54837359da576b94c6cb8a73837fa6b41605a" dependencies = [ "bitflags 2.4.0", "cssparser", @@ -5533,8 +5530,7 @@ dependencies = [ [[package]] name = "static-self" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2978fa810a31711d7162d0bb843df1f36d84e393e335ce31ec2c485b2464c44" +source = "git+https://github.com/kdy1/lightningcss.git?branch=derive-unsafe#67b54837359da576b94c6cb8a73837fa6b41605a" dependencies = [ "smallvec", "static-self-derive", @@ -5543,8 +5539,7 @@ dependencies = [ [[package]] name = "static-self-derive" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc53c080b79432d9babd26457df68fb4b002cc7d2ce36a1a5195091cf9fecc14" +source = "git+https://github.com/kdy1/lightningcss.git?branch=derive-unsafe#67b54837359da576b94c6cb8a73837fa6b41605a" dependencies = [ "proc-macro2", "quote", From 7b30826c080f1b1c2ec0c6c67c3a47fea61e6e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Wed, 25 Oct 2023 17:24:02 -0700 Subject: [PATCH 06/27] It's not coming from user request --- .../next-swc/crates/next-core/src/next_font/local/stylesheet.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next-swc/crates/next-core/src/next_font/local/stylesheet.rs b/packages/next-swc/crates/next-core/src/next_font/local/stylesheet.rs index c291d28406b98..b8b310b31225f 100644 --- a/packages/next-swc/crates/next-core/src/next_font/local/stylesheet.rs +++ b/packages/next-swc/crates/next-core/src/next_font/local/stylesheet.rs @@ -59,7 +59,7 @@ pub(super) async fn build_font_face_definitions( }} "#, *scoped_font_family.await?, - &font.path, + &font.path.replace("/index.ts/", "/"), ext_to_format(&font.ext)?, options.display, &font From 54d915592459a58fe34aa5893bb98915051f497c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Wed, 25 Oct 2023 17:24:20 -0700 Subject: [PATCH 07/27] Revert "It's not coming from user request" This reverts commit d57f2c7e0b58bef8de3f4a24ea98f859a852afc9. --- .../next-swc/crates/next-core/src/next_font/local/stylesheet.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next-swc/crates/next-core/src/next_font/local/stylesheet.rs b/packages/next-swc/crates/next-core/src/next_font/local/stylesheet.rs index b8b310b31225f..c291d28406b98 100644 --- a/packages/next-swc/crates/next-core/src/next_font/local/stylesheet.rs +++ b/packages/next-swc/crates/next-core/src/next_font/local/stylesheet.rs @@ -59,7 +59,7 @@ pub(super) async fn build_font_face_definitions( }} "#, *scoped_font_family.await?, - &font.path.replace("/index.ts/", "/"), + &font.path, ext_to_format(&font.ext)?, options.display, &font From 0c84a46c99ef86581179c8c8c6c019b4e6ae668e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Tue, 31 Oct 2023 07:25:39 +0900 Subject: [PATCH 08/27] Remove patch --- Cargo.lock | 23 ++++++++++++++--------- Cargo.toml | 4 ---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0323e12117bfb..d499a77ba9c2a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2867,8 +2867,9 @@ dependencies = [ [[package]] name = "lightningcss" -version = "1.0.0-alpha.49" -source = "git+https://github.com/kdy1/lightningcss.git?branch=derive-unsafe#67b54837359da576b94c6cb8a73837fa6b41605a" +version = "1.0.0-alpha.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2999490cc10a59ad8a87d731791a5d438d2d025e3f137aa7d4c23e1827985b0" dependencies = [ "ahash 0.7.6", "bitflags 2.4.0", @@ -2893,7 +2894,8 @@ dependencies = [ [[package]] name = "lightningcss-derive" version = "1.0.0-alpha.42" -source = "git+https://github.com/kdy1/lightningcss.git?branch=derive-unsafe#67b54837359da576b94c6cb8a73837fa6b41605a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f02a09f0b79d31f1ee13ea55e2f7021037c6b72e0a3ab6c1cb0e9bd7ac8a295" dependencies = [ "proc-macro2", "quote", @@ -3823,8 +3825,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parcel_selectors" -version = "0.26.3" -source = "git+https://github.com/kdy1/lightningcss.git?branch=derive-unsafe#67b54837359da576b94c6cb8a73837fa6b41605a" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d74befe2d076330d9a58bf9ca2da424568724ab278adf15fb5718253133887" dependencies = [ "bitflags 2.4.0", "cssparser", @@ -5529,8 +5532,9 @@ dependencies = [ [[package]] name = "static-self" -version = "0.1.0" -source = "git+https://github.com/kdy1/lightningcss.git?branch=derive-unsafe#67b54837359da576b94c6cb8a73837fa6b41605a" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "253e76c8c993a7b1b201b0539228b334582153cd4364292822d2c30776d469c7" dependencies = [ "smallvec", "static-self-derive", @@ -5538,8 +5542,9 @@ dependencies = [ [[package]] name = "static-self-derive" -version = "0.1.0" -source = "git+https://github.com/kdy1/lightningcss.git?branch=derive-unsafe#67b54837359da576b94c6cb8a73837fa6b41605a" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5268c96d4b907c558a9a52d8492522d6c7b559651a5e1d8f2d551e461b9425d5" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 93702741631a8..8bd66b3bc448e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -136,7 +136,3 @@ urlencoding = "2.1.2" webbrowser = "0.8.7" dhat = { version = "0.3.2" } - -[patch.crates-io] -lightningcss = { git = "https://github.com/kdy1/lightningcss.git", branch = "derive-unsafe"} -parcel_selectors = { git = "https://github.com/kdy1/lightningcss.git", branch = "derive-unsafe" } From 2523c5ebc1cb9cd1503ceb1653d24f46b6057bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Wed, 15 Nov 2023 12:10:42 +0900 Subject: [PATCH 09/27] Update swc crates --- Cargo.toml | 4 ++-- packages/next-swc/crates/core/Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8bd66b3bc448e..f461e48fb99cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,11 +36,11 @@ next-transform-dynamic = { path = "packages/next-swc/crates/next-transform-dynam next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-transform-strip-page-exports" } # SWC crates - swc_core = { version = "0.86.40", features = [ + swc_core = { version = "0.86.60", features = [ "ecma_loader_lru", "ecma_loader_parking_lot", ] } -testing = { version = "0.35.7" } +testing = { version = "0.35.10" } # Turbo crates turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231117.4" } diff --git a/packages/next-swc/crates/core/Cargo.toml b/packages/next-swc/crates/core/Cargo.toml index 990799d2c6f86..a58d780a18d9d 100644 --- a/packages/next-swc/crates/core/Cargo.toml +++ b/packages/next-swc/crates/core/Cargo.toml @@ -38,8 +38,8 @@ turbopack-binding = { workspace = true, features = [ "__swc_transform_modularize_imports", "__swc_transform_relay", ] } -react_remove_properties = "0.10.0" -remove_console = "0.11.0" +react_remove_properties = "0.11.0" +remove_console = "0.12.0" [dev-dependencies] turbopack-binding = { workspace = true, features = [ From ed9a0e100fb35871b90a7c2ea722a01b57862d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Wed, 15 Nov 2023 12:10:51 +0900 Subject: [PATCH 10/27] cargo lockfile --- Cargo.lock | 269 +++++++++++++++++++++++++++++------------------------ 1 file changed, 145 insertions(+), 124 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d499a77ba9c2a..dad6f960b2b20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -522,9 +522,9 @@ dependencies = [ [[package]] name = "binding_macros" -version = "0.60.40" +version = "0.60.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc6d576fb61191dccafc3c5c69fcfe579606c6e64b71f3b57865040a8eff6ad" +checksum = "6fdde7535e3cb901527bb60f69b10958215f8dafde044f2c57fd9fd7cb02e49b" dependencies = [ "anyhow", "console_error_panic_hook", @@ -638,6 +638,27 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "browserslist-rs" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33066f72a558361eeb1077b0aff0f1dce1ac75bdc20b38a642f155f767b2824" +dependencies = [ + "ahash 0.8.6", + "anyhow", + "chrono", + "either", + "itertools", + "nom", + "once_cell", + "quote", + "serde", + "serde_json", + "string_cache", + "string_cache_codegen", + "thiserror", +] + [[package]] name = "built" version = "0.5.2" @@ -1309,7 +1330,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.10.1", + "phf 0.11.2", "smallvec", ] @@ -2250,9 +2271,9 @@ dependencies = [ [[package]] name = "hstr" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f8eaaa1bccc114f3ed94b7b66f0195cbf48151402d3efc27f7f6e362042416" +checksum = "de90d3db62411eb62eddabe402d706ac4970f7ac8d088c05f11069cad9be9857" dependencies = [ "new_debug_unreachable", "once_cell", @@ -4194,13 +4215,13 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "preset_env_base" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a83fddb10b466da126eaf6bf444c878141f691b23c2de6004bf1ef83c38e8e6" +checksum = "3277c43d5ab99ddc71f4a301686c50a1a155339feb0cbe41492aabc211ef474f" dependencies = [ "ahash 0.8.6", "anyhow", - "browserslist-rs", + "browserslist-rs 0.13.0", "dashmap", "from_variant", "once_cell", @@ -4505,9 +4526,9 @@ dependencies = [ [[package]] name = "react_remove_properties" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40e33698331c12e20b0163444c2dffc109122a5ef8abfffa5c9aaaccbb3f383" +checksum = "c179dadcf9e31539e9af8a709153adafa4cf9f907c4df20a4b52a80718bd884d" dependencies = [ "serde", "swc_atoms", @@ -4648,9 +4669,9 @@ checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca" [[package]] name = "remove_console" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4804169f67ce1ac6064588a5256ccd876082ffdf083c34e4114447e4d98d210e" +checksum = "4bb68d00d948a7ffa1dc16aee64cc45640ca8ed9afe14e109d5a1f1d8e4db65e" dependencies = [ "serde", "swc_atoms", @@ -5737,9 +5758,9 @@ dependencies = [ [[package]] name = "swc" -version = "0.269.35" +version = "0.269.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fa4c765e8d643246054b4f4ad83bcf9cb7a7715e094c3f54c5c51754901c24" +checksum = "05849a2ce200bb82aec323cb672d9ecb9e9029316e3d44a0a7d510572d5e5501" dependencies = [ "anyhow", "base64 0.13.1", @@ -5789,9 +5810,9 @@ dependencies = [ [[package]] name = "swc_atoms" -version = "0.6.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad769aeefe4cf20c3ec29e714c91870fa89307faa4280a644c4c65b5cc692" +checksum = "b8a9e1b6d97f27b6abe5571f8fe3bdbd2fa987299fc2126450c7cde6214896ef" dependencies = [ "bytecheck", "hstr", @@ -5803,9 +5824,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.222.31" +version = "0.222.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8e4c2e870949ef919693a16a7bae57e30b75bec662e0e40bba131b5884c3fb" +checksum = "cdab096f62e461d4524ddf65978e69393db703356a97f4b558f2a4f212a1b7dd" dependencies = [ "anyhow", "crc", @@ -5849,9 +5870,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.33.5" +version = "0.33.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b33eb74d42276b5f37ac78ed470dd206ece8a2687cfe3a681444f66c29a061f" +checksum = "49fba1ce1d44f142b9e8212a6360fc7818e2c99c7f5ebe8b4fa4061c5764e48e" dependencies = [ "ahash 0.8.6", "anyhow", @@ -5883,9 +5904,9 @@ dependencies = [ [[package]] name = "swc_compiler_base" -version = "0.3.37" +version = "0.3.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5aa27756be34b2dcba6e632ac35e1416aefaef7aa1cf9e32c54bdd482a8b5ab" +checksum = "4ccb251385a0ab21b4470b2e9088c3d992f4cb3c9a3a80a46ee802e4f6b22dbb" dependencies = [ "anyhow", "base64 0.13.1", @@ -5932,9 +5953,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.86.40" +version = "0.86.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22da79427085d5ba7ea5ec14f104f8af66bf479655475cd901d292e87b7b3a73" +checksum = "f718c699aac95c69bad3ba5e81e554407c4195ff339e61b96686abab4bfed40c" dependencies = [ "binding_macros", "swc", @@ -5974,9 +5995,9 @@ dependencies = [ [[package]] name = "swc_css_ast" -version = "0.140.6" +version = "0.140.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec6ea3b519c6e44a16f680036f5faadcfd31d6bdad0762f19d4f15c2e6d013a" +checksum = "24e33aed6900a6478ec9bffa7cdf5249ea79b55fcc86b34872212800086504fa" dependencies = [ "is-macro", "serde", @@ -5987,9 +6008,9 @@ dependencies = [ [[package]] name = "swc_css_codegen" -version = "0.151.9" +version = "0.151.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b313c0ca16ddb367288d17dd77d491c7c6ad62eb297448a0ce0ae1c3767592" +checksum = "71a04ac7b5672d740340ae09a6bcedad753d45ae9d4ec3b935617c20dce90094" dependencies = [ "auto_impl", "bitflags 2.4.0", @@ -6017,9 +6038,9 @@ dependencies = [ [[package]] name = "swc_css_compat" -version = "0.27.9" +version = "0.27.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8448e5731f3d2d2d91b28f11ca2c1ff0d92e7f8f687e3bba20857b0b85abc2fb" +checksum = "4f82fd2fc69fb5898111ef25a2dd74f68dc4f043a25b4a4ceca7db67322e4a83" dependencies = [ "bitflags 2.4.0", "once_cell", @@ -6048,9 +6069,9 @@ dependencies = [ [[package]] name = "swc_css_modules" -version = "0.29.10" +version = "0.29.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064878840d63575702f64e4f22e7c7866e5d61e3aa026237d5acd7f3b6ce547e" +checksum = "3fcf9dc1c339724167d9bbeec6176e4785d0996babc9def04786c724626dee69" dependencies = [ "rustc-hash", "serde", @@ -6064,9 +6085,9 @@ dependencies = [ [[package]] name = "swc_css_parser" -version = "0.150.9" +version = "0.150.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ae34661b2c08cb60947e05735d8d6db255b5ee2484d2ebdbc5d7de0f14b121" +checksum = "5a3a21dc7405cbb2f7c923e0759bc3ab4a561780b638e9e79c96675341fd89d0" dependencies = [ "lexical", "serde", @@ -6094,9 +6115,9 @@ dependencies = [ [[package]] name = "swc_css_utils" -version = "0.137.6" +version = "0.137.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e64f7d7de2158bbedd12b309089f8bb94ce60fc45dde37fa0447da8b6fa624" +checksum = "24fec9a00252d393ca43383109f38a68d64c326ca967b40ec35499ef0c57a7dc" dependencies = [ "once_cell", "serde", @@ -6109,9 +6130,9 @@ dependencies = [ [[package]] name = "swc_css_visit" -version = "0.139.6" +version = "0.139.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1b09ebb933e50d23d5d583e783bf35c678b7ad7072a6d5f8f47e72aceeb6b5" +checksum = "5f4827e116e4e417a5f7f995ef3e2ef83ddef034418667c5e1ed169f072053c2" dependencies = [ "serde", "swc_atoms", @@ -6122,9 +6143,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.110.6" +version = "0.110.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f902ec313c3c442bfbb5e999326582fccfb83b7db6c171819495b485f4057f01" +checksum = "4cefcc1c71bf00e48da7b65801d1fccf7eed2b7fa1fc5c4848ed09801bfe2403" dependencies = [ "bitflags 2.4.0", "bytecheck", @@ -6142,9 +6163,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.146.16" +version = "0.146.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6c8efbcee4acb346c15e6d9470f47b94053a3d61f1677d5b7d677c8a79e6a6f" +checksum = "c45a0beb1293372354b57bbafa06bf5ca6c3fab4bfd157b54d65db96612232eb" dependencies = [ "memchr", "num-bigint", @@ -6174,9 +6195,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_bugfixes" -version = "0.1.24" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7475da4769ed5be961cd86a4cb0a0629ff55d11ff044a366732a64e02119d3cb" +checksum = "5521b96f87e13fd10f2a7c3bf4f8f80ed2cc3a532a4c9b6625a724d8e3083e85" dependencies = [ "swc_atoms", "swc_common", @@ -6191,9 +6212,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_common" -version = "0.1.16" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46ea85927ab506fb1f42a9c0c2cac73d8f0a4a28f2ec7aace836aba0ebfd62f6" +checksum = "c1889c73fde0612659b59359a0f4e42be73b623cba895fd88957b60471559d04" dependencies = [ "swc_common", "swc_ecma_ast", @@ -6204,9 +6225,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2015" -version = "0.1.24" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0904f4a35212c021e40745c6aa71b44c0bb2827ecdd836e4064d34db5cc6437" +checksum = "ea1c8835b35efa6b3264cf3330e5ecd3abde691e3037fac724fe73cf26fb4a9f" dependencies = [ "arrayvec", "indexmap 1.9.3", @@ -6230,9 +6251,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2016" -version = "0.1.22" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "587dad924fc00d268899771ae942a84c87c493dadc1a024d831eb464dcf330f9" +checksum = "58265ca3e2bbeefe595c3a77cbca10d44d877cf006429529ee6a7245122a7f84" dependencies = [ "swc_atoms", "swc_common", @@ -6247,9 +6268,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2017" -version = "0.1.22" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10bf1d18316b202f2a75dcd364f49c3bd6406d58f1c2cf308388c782773bbc66" +checksum = "590e3ea46d074bd8ebd57d0f45d3c8dcbafacf18e58704abd034ebcf73f120ad" dependencies = [ "serde", "swc_atoms", @@ -6265,9 +6286,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2018" -version = "0.1.22" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62266ecd18493c9440413731606ca8d46f76d32a1df3474f20b5863a6175c9bc" +checksum = "8e8ba03ae7d980a7a09c425b8be7ef56775f7ee703cceee82cf6f6712899cfe6" dependencies = [ "serde", "swc_atoms", @@ -6284,9 +6305,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2019" -version = "0.1.22" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49646a589d7c4594b452b4133e833060fe894efc16929bdb6b7040261601e845" +checksum = "7c034b8ea66e47552fafdef3d904c53597761c91ca51174c2576c04706e38687" dependencies = [ "swc_atoms", "swc_common", @@ -6300,9 +6321,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2020" -version = "0.1.21" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53da0baf19e324757527733d3b37615bfebc2d136ee3d989c0e930c5636e090" +checksum = "5d43af0631e13dbfccf67c42105b3e07dfc620d43226128c3a0cd478b57e87de" dependencies = [ "serde", "swc_atoms", @@ -6318,9 +6339,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2021" -version = "0.1.20" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c67a4db9e67f6ff3afc5629091cf672703966d69956dcdd88aa3e859f992008" +checksum = "4623f933fea8df5e8d8be0d511b9c441c30f0601f9161b6a6660fc0f6a54aea9" dependencies = [ "swc_atoms", "swc_common", @@ -6334,9 +6355,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2022" -version = "0.1.22" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088b968df343c7d2d5dc05dbe72124a7745126c0febe4ce201eeb0f78c10c3be" +checksum = "9e041d062041ca30fea5cb0f9c590edff6e99f3fc117c0470f12dbe5abe5412d" dependencies = [ "swc_atoms", "swc_common", @@ -6353,9 +6374,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es3" -version = "0.1.21" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54548c16bc5198c152ab61cb62167f2c883f96cae8ec3346182f7e05235598d8" +checksum = "6102f7c0c339ed21d5be4a197332ec9b4886d0b28fd4ca15905a9ce6eec4ea83" dependencies = [ "swc_common", "swc_ecma_ast", @@ -6368,9 +6389,9 @@ dependencies = [ [[package]] name = "swc_ecma_ext_transforms" -version = "0.110.19" +version = "0.110.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4b20acb54ee2c48784efa3f27995c648a6f44cb58c166e0538b92075c54e10" +checksum = "04c4614dca2e8561024be8906f9a095777ad1f39a3b2b426111b96c03465af8d" dependencies = [ "phf 0.10.1", "swc_atoms", @@ -6382,9 +6403,9 @@ dependencies = [ [[package]] name = "swc_ecma_lints" -version = "0.89.22" +version = "0.89.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c3900597328e9e84f903dd1ba0c5d1c82a304b4ac60fa71891f221c15d0cfb" +checksum = "c783cf4cf1a5887de0e7b5fc25fab6f7bdcf7268eca671fe2fb4ff654e6b1006" dependencies = [ "auto_impl", "dashmap", @@ -6402,9 +6423,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.45.6" +version = "0.45.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a550d167cef210e34ea7ad223a3243969257c3fe0efcdbe605b390065afc4a3" +checksum = "cc83806e30310943718eef1209c388f375417bcc3e499df8820c189d92ecf05f" dependencies = [ "anyhow", "dashmap", @@ -6423,9 +6444,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.189.32" +version = "0.189.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b07fc3067a5ed6ded17b4133765b1cde0a8e8a1c30c39388e0b864e97ad27" +checksum = "1d50fedc759df341016d49a100b389cb6c1b7574e4cc65367487d5d3afc22e9e" dependencies = [ "arrayvec", "indexmap 1.9.3", @@ -6458,9 +6479,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.141.14" +version = "0.141.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17e2c91d688f8853ed6be8ba5ee3bdec2230b60a58b22338f3174792646c9c8" +checksum = "acfad502c2e0579e09e216da1c627d583fdbc6c8a08f2c8bd0160f9119d4246d" dependencies = [ "either", "new_debug_unreachable", @@ -6480,9 +6501,9 @@ dependencies = [ [[package]] name = "swc_ecma_preset_env" -version = "0.203.29" +version = "0.203.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b8ca7733d321438e15eee673bc435cacdd4b92fd71e0b441a5cd72b0ba5d35" +checksum = "652c066e316cd2acf9bc39a151456188925a5f01e5bb00018b9bf468ee0fd734" dependencies = [ "anyhow", "dashmap", @@ -6505,9 +6526,9 @@ dependencies = [ [[package]] name = "swc_ecma_quote_macros" -version = "0.52.14" +version = "0.52.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "725e83abdb92bac059ea9a90e41710e28dc8a892141bf79a2ca836c5c562d3d8" +checksum = "51c6de18105523ee7c930178406cd324c272ae21bc549e53593105b345969e18" dependencies = [ "anyhow", "pmutil", @@ -6523,9 +6544,9 @@ dependencies = [ [[package]] name = "swc_ecma_testing" -version = "0.22.7" +version = "0.22.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea1698f37105c753803166f415569edcf34a2b82f41c9aee125d5462af40d13" +checksum = "62dc3d273ef4f7fe39b670b7f1fdd2dd33518f5de987e7f7fe9d1b44e650e891" dependencies = [ "anyhow", "hex", @@ -6536,9 +6557,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms" -version = "0.226.29" +version = "0.226.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529ea35a5ad6ee8add3ef15380a8e5e5a1da4cfd04e0d070f2efc4c8c2266823" +checksum = "5b020aef371703583047e8e41468c17790e5f3caf9cf1cb53b7fb91d7a8d8a70" dependencies = [ "swc_atoms", "swc_common", @@ -6556,9 +6577,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.134.22" +version = "0.134.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b27038edff04dc41a41b1976670df93470a4a88c1dc5b17e996326978b76e8c" +checksum = "1cea2778aaa7152bacc2877ce900a78f815c64630102ec8d824a8ec543ac5ef5" dependencies = [ "better_scoped_tls", "bitflags 2.4.0", @@ -6580,9 +6601,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.123.23" +version = "0.123.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e8bf4894b46f56b37657c942529d3478224260e576ab38c641c508b805d0bb" +checksum = "75a2a98541dffaffbfecb6aaccf8d910c8e9e54576a785e431d8eb2d2c56b80a" dependencies = [ "swc_atoms", "swc_common", @@ -6594,9 +6615,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.160.28" +version = "0.160.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "407f66ce3dd22fd2bcc00876d2007aefa73183e39bbca6e19da2a083235b001a" +checksum = "2be5f5f7b7e62cd94ae24f51bf42fc33a25a3ea5a401e3da313538bfa682bdf7" dependencies = [ "arrayvec", "indexmap 1.9.3", @@ -6644,9 +6665,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_module" -version = "0.177.30" +version = "0.177.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a7827f522465f597d1dfd93ec8b3e389799c3d351058d0f4a272bce15c1e1a" +checksum = "ee2323576600e67365ba75f6db9fa38d18d2227921cd5cec907a2bc5f3e8a51b" dependencies = [ "Inflector", "anyhow", @@ -6671,9 +6692,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.195.29" +version = "0.195.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a1cce15248d51fd3a1b4c8a638fda8e67ffab269a6ea2a53fb3e6a05d1ff2" +checksum = "eb488266e2ed474b1315fee62396217fc62a505adfe4a29a65aa9985026e9d24" dependencies = [ "dashmap", "indexmap 1.9.3", @@ -6696,9 +6717,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.168.30" +version = "0.168.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42afc0f6df25e37c46241fe86619a561ece47bb75317ff540da04ceba81ed707" +checksum = "fa5d747160aca89b0496d0f3e5a3c7961e6f31d3b4f75a1ab52e050d894d0e12" dependencies = [ "either", "rustc-hash", @@ -6716,9 +6737,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.180.31" +version = "0.180.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7ccd4ed6b3272dff18fb088b3030215c3dd1fdc44b0b3cac96dfcd459b67af" +checksum = "21876e623cb894ca2d020c29003c8e5f619e7d345f6188eb53e39c2ce6dea783" dependencies = [ "base64 0.13.1", "dashmap", @@ -6741,9 +6762,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.137.24" +version = "0.137.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3929c8c9820a4277b801ac796f03deddc25134bd2e34a6973a00828c87aa8bdc" +checksum = "1633020e7f46dd994e1f39c9365b852f25384cab56e527cbde645ba6742dba65" dependencies = [ "ansi_term", "anyhow", @@ -6767,9 +6788,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.185.28" +version = "0.185.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74cfc6095f0e141595aa12845d6d2f93a73108c7eacc88f0e4dd472b74e41e58" +checksum = "e64b6cf5505e05f4a3a9ef2fcb13bcd5147e16ce642a8a06f76270eb5a240434" dependencies = [ "ryu-js", "serde", @@ -6784,9 +6805,9 @@ dependencies = [ [[package]] name = "swc_ecma_usage_analyzer" -version = "0.20.20" +version = "0.20.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cab9cbafaf2d28e1b45bad1e07bf97ab230f2cdc7cb4d494908b432f79cd1b" +checksum = "e5fd3bb4cdb8813a7045eb569388386ab9a13317f5bef4a334cfe2e7018bbc29" dependencies = [ "indexmap 1.9.3", "rustc-hash", @@ -6801,9 +6822,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.124.19" +version = "0.124.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055737e1189b2bac57aac998699b339ab839945058134ed28b7611c950e34071" +checksum = "10584648054df1b174b0ce48070f1567996141c2549906eebd12467019752c00" dependencies = [ "indexmap 1.9.3", "num_cpus", @@ -6820,9 +6841,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.96.6" +version = "0.96.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c97d88354947ba36b21b355fccb75b5fba2a2db36f00bf8327a6728257662e4f" +checksum = "21305b130986e771206c9f447c8040f9b3be47c9fbbb1f659904e223b8e1c007" dependencies = [ "num-bigint", "serde", @@ -6871,9 +6892,9 @@ dependencies = [ [[package]] name = "swc_error_reporters" -version = "0.17.5" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbfad2ff99154d20b5dd9246290f162114c836cfe8532d8d0d4c116f49ee6ce" +checksum = "4a80f674bef7baf65c979f684bbe9fa8f4e275e3b61589b62d6dc260331a102b" dependencies = [ "anyhow", "miette", @@ -6884,9 +6905,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.21.5" +version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175c7dced501083242106790d72119bebe84233bc24c26b59a70172967dc8231" +checksum = "392047ce047ab6f9c02ef17e7e19627c0050fe6dbb0bccd2350a92664a859c62" dependencies = [ "indexmap 1.9.3", "petgraph", @@ -6896,9 +6917,9 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.22.7" +version = "0.22.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7090c8d9faba1e3ff6ed8f88662ac89ce410cb70f87e940fe29a06099a07c83" +checksum = "ebb1843242b0ee38517116da75576e13bcdcc8e08af288537e8745d480c31cfc" dependencies = [ "auto_impl", "petgraph", @@ -6921,9 +6942,9 @@ dependencies = [ [[package]] name = "swc_node_comments" -version = "0.20.5" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779d8f8597eeb98dbcc7571af50bfa664d68b192a0e07c7b52643a3bfa720806" +checksum = "249c6c5935bcea54025c5c767f33d89d650293288837b50113ac9c437e546450" dependencies = [ "dashmap", "swc_atoms", @@ -6957,9 +6978,9 @@ dependencies = [ [[package]] name = "swc_plugin_proxy" -version = "0.39.6" +version = "0.39.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2004e74d75a7bbbf5d6b89f2348e000825cb7eaf87d51966793729aa1bc56690" +checksum = "e73aa3453e0026b009f35462b77f7dbc2e1b9a91cd92fae6f517802f3b6f4561" dependencies = [ "better_scoped_tls", "rkyv", @@ -6971,9 +6992,9 @@ dependencies = [ [[package]] name = "swc_plugin_runner" -version = "0.104.14" +version = "0.104.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1604548ed056f29dcc3dafa6dd131ac00fc752f4fc812a02ac34a448133a4e6" +checksum = "b1ef2eb955ba87377bda7b17b7bb511b62d3c8e7b56c9481598f7821438df5e0" dependencies = [ "anyhow", "enumset", @@ -7013,9 +7034,9 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.21.7" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90c333bce29a3bc3ee694976cce0b08927f0939c494bb0e1650bfce3dba214" +checksum = "388d9d8a67d907c9a5f69250a32134b80fa01c2c03b7fbfcdbb9e8d4ed18b3ed" dependencies = [ "tracing", ] @@ -7181,9 +7202,9 @@ dependencies = [ [[package]] name = "testing" -version = "0.35.7" +version = "0.35.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "272f2b6de45b9ad1444af11a54077d9b2ec439357c44086da60ad8369db1b87e" +checksum = "94fa85c2c4605cd16c3b358b125a23b36e01fe04a0ef687d22df97baa4b25fa8" dependencies = [ "ansi_term", "cargo_metadata", @@ -8001,7 +8022,7 @@ dependencies = [ "async-recursion", "async-trait", "auto-hash-map", - "browserslist-rs", + "browserslist-rs 0.12.4", "futures", "indexmap 1.9.3", "lazy_static", @@ -8343,7 +8364,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "rand", "static_assertions", ] From 193c052a2f271ce0af6bca28654a557fe8fda073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Thu, 16 Nov 2023 21:19:27 +0900 Subject: [PATCH 11/27] next.js config --- .../next-swc/crates/next-core/src/next_client/context.rs | 3 +++ packages/next-swc/crates/next-core/src/next_config.rs | 9 +++++++++ .../next-swc/crates/next-core/src/next_server/context.rs | 3 +++ 3 files changed, 15 insertions(+) diff --git a/packages/next-swc/crates/next-core/src/next_client/context.rs b/packages/next-swc/crates/next-core/src/next_client/context.rs index 51b8b93903004..f3cea807ac188 100644 --- a/packages/next-swc/crates/next-core/src/next_client/context.rs +++ b/packages/next-swc/crates/next-core/src/next_client/context.rs @@ -274,6 +274,8 @@ pub async fn get_client_module_options_context( ..module_options_context.clone() }; + let use_lightningcss = *next_config.use_lightningcss().await?; + let module_options_context = ModuleOptionsContext { // We don't need to resolve React Refresh for each module. Instead, // we try resolve it once at the root and pass down a context to all @@ -302,6 +304,7 @@ pub async fn get_client_module_options_context( ), ], custom_rules, + use_lightningcss, ..module_options_context } .cell(); diff --git a/packages/next-swc/crates/next-core/src/next_config.rs b/packages/next-swc/crates/next-core/src/next_config.rs index 4974f1962fce4..ec0dd24da52d1 100644 --- a/packages/next-swc/crates/next-core/src/next_config.rs +++ b/packages/next-swc/crates/next-core/src/next_config.rs @@ -503,6 +503,8 @@ pub struct ExperimentalConfig { /// (doesn't apply to Turbopack). webpack_build_worker: Option, worker_threads: Option, + + use_lightningcss: Option, } #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, TraceRawVcs)] @@ -765,6 +767,13 @@ impl NextConfig { pub async fn enable_taint(self: Vc) -> Result> { Ok(Vc::cell(self.await?.experimental.taint.unwrap_or(false))) } + + #[turbo_tasks::function] + pub async fn use_lightningcss(self: Vc) -> Result> { + Ok(Vc::cell( + self.await?.experimental.use_lightningcss.unwrap_or(false), + )) + } } fn next_configs() -> Vc> { diff --git a/packages/next-swc/crates/next-core/src/next_server/context.rs b/packages/next-swc/crates/next-core/src/next_server/context.rs index 00d35a8d325f6..ea949eb4b75d5 100644 --- a/packages/next-swc/crates/next-core/src/next_server/context.rs +++ b/packages/next-swc/crates/next-core/src/next_server/context.rs @@ -360,9 +360,12 @@ pub async fn get_server_module_options_context( }, ); + let use_lightningcss = *next_config.use_lightningcss().await?; + let module_options_context = ModuleOptionsContext { execution_context: Some(execution_context), esm_url_rewrite_behavior: url_rewrite_behavior, + use_lightningcss, ..Default::default() }; From 62a24343d6200aa3b5fe47466da251dcd7a2bb1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Fri, 17 Nov 2023 11:35:51 +0900 Subject: [PATCH 12/27] use_lightningcss --- .../next-swc/crates/next-core/src/next_client/context.rs | 6 +++--- .../next-swc/crates/next-core/src/next_server/context.rs | 6 +++--- .../next-core/src/next_shared/transforms/styled_jsx.rs | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/next-swc/crates/next-core/src/next_client/context.rs b/packages/next-swc/crates/next-core/src/next_client/context.rs index f3cea807ac188..13e10f919fa0d 100644 --- a/packages/next-swc/crates/next-core/src/next_client/context.rs +++ b/packages/next-swc/crates/next-core/src/next_client/context.rs @@ -237,12 +237,14 @@ pub async fn get_client_module_options_context( .cell() }); + let use_lightningcss = *next_config.use_lightningcss().await?; + let source_transforms = vec![ *get_swc_ecma_transform_plugin(project_path, next_config).await?, *get_relay_transform_plugin(next_config).await?, *get_emotion_transform_plugin(next_config).await?, *get_styled_components_transform_plugin(next_config).await?, - *get_styled_jsx_transform_plugin().await?, + *get_styled_jsx_transform_plugin(use_lightningcss).await?, ] .into_iter() .flatten() @@ -274,8 +276,6 @@ pub async fn get_client_module_options_context( ..module_options_context.clone() }; - let use_lightningcss = *next_config.use_lightningcss().await?; - let module_options_context = ModuleOptionsContext { // We don't need to resolve React Refresh for each module. Instead, // we try resolve it once at the root and pass down a context to all diff --git a/packages/next-swc/crates/next-core/src/next_server/context.rs b/packages/next-swc/crates/next-core/src/next_server/context.rs index ea949eb4b75d5..c790a1681e198 100644 --- a/packages/next-swc/crates/next-core/src/next_server/context.rs +++ b/packages/next-swc/crates/next-core/src/next_server/context.rs @@ -291,10 +291,12 @@ pub async fn get_server_module_options_context( .cell() }); + let use_lightningcss = *next_config.use_lightningcss().await?; + // EcmascriptTransformPlugins for custom transforms let styled_components_transform_plugin = *get_styled_components_transform_plugin(next_config).await?; - let styled_jsx_transform_plugin = *get_styled_jsx_transform_plugin().await?; + let styled_jsx_transform_plugin = *get_styled_jsx_transform_plugin(use_lightningcss).await?; // ModuleOptionsContext related options let tsconfig = get_typescript_transform_options(project_path); @@ -360,8 +362,6 @@ pub async fn get_server_module_options_context( }, ); - let use_lightningcss = *next_config.use_lightningcss().await?; - let module_options_context = ModuleOptionsContext { execution_context: Some(execution_context), esm_url_rewrite_behavior: url_rewrite_behavior, diff --git a/packages/next-swc/crates/next-core/src/next_shared/transforms/styled_jsx.rs b/packages/next-swc/crates/next-core/src/next_shared/transforms/styled_jsx.rs index 13c903d72cb11..75aee3e71ae74 100644 --- a/packages/next-swc/crates/next-core/src/next_shared/transforms/styled_jsx.rs +++ b/packages/next-swc/crates/next-core/src/next_shared/transforms/styled_jsx.rs @@ -7,8 +7,10 @@ use turbopack_binding::turbopack::{ /// Returns a transform plugin for the relay graphql transform. #[turbo_tasks::function] -pub async fn get_styled_jsx_transform_plugin() -> Result> { +pub async fn get_styled_jsx_transform_plugin( + use_lightningcss: bool, +) -> Result> { Ok(Vc::cell(Some(Vc::cell( - Box::new(StyledJsxTransformer::new()) as _, + Box::new(StyledJsxTransformer::new(use_lightningcss)) as _, )))) } From 2131d546c98426887df3372b63eac5cd9d26ec83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Fri, 17 Nov 2023 16:25:11 +0900 Subject: [PATCH 13/27] cargo lockfile --- Cargo.lock | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dad6f960b2b20..835643a77e5cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -826,7 +826,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.7.4", ] [[package]] @@ -2854,6 +2854,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + [[package]] name = "libmimalloc-sys" version = "0.1.30" @@ -3293,9 +3303,9 @@ dependencies = [ [[package]] name = "napi" -version = "2.13.3" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd063c93b900149304e3ba96ce5bf210cd4f81ef5eb80ded0d100df3e85a3ac0" +checksum = "f9d90182620f32fe34b6ac9b52cba898af26e94c7f5abc01eb4094c417ae2e6c" dependencies = [ "anyhow", "bitflags 2.4.0", @@ -3345,11 +3355,11 @@ dependencies = [ [[package]] name = "napi-sys" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" +checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" dependencies = [ - "libloading", + "libloading 0.8.1", ] [[package]] @@ -8364,7 +8374,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "rand", "static_assertions", ] @@ -8531,9 +8541,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", "serde", From bd35b147f7d7c4300372df1367741924ba5ab16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Fri, 17 Nov 2023 16:34:34 +0900 Subject: [PATCH 14/27] cargo lockfile --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 835643a77e5cf..b1610a35266b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3326,9 +3326,9 @@ checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" [[package]] name = "napi-derive" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367" +checksum = "a01328a2da5c52a77fe839ec8576ddf063529cf23db8958b1030005675f32c45" dependencies = [ "cfg-if 1.0.0", "convert_case 0.6.0", @@ -3340,9 +3340,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.52" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17" +checksum = "ecd3ea4b54020c73d591a49cd192f6334c5f37f71a63ead54dbc851fa991ef00" dependencies = [ "convert_case 0.6.0", "once_cell", From 5e0f89c8f275b1a0b2071a136e9d89d1823e5471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Sun, 19 Nov 2023 16:54:54 +0900 Subject: [PATCH 15/27] link next.js --- Cargo.lock | 134 ++++++++++++++++--------------------- Cargo.toml | 6 +- packages/next/package.json | 2 +- pnpm-lock.yaml | 10 +-- 4 files changed, 66 insertions(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b1610a35266b9..3c83a0b3afe87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,7 +322,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "serde", "smallvec", @@ -613,31 +613,6 @@ dependencies = [ "alloc-stdlib", ] -[[package]] -name = "browserslist-rs" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bda9b4595376bf255f68dafb5dcc5b0e2842b38dc2a7b52c4e0bfe9fd1c651" -dependencies = [ - "ahash 0.8.6", - "anyhow", - "chrono", - "either", - "getrandom", - "itertools", - "js-sys", - "nom", - "once_cell", - "quote", - "serde", - "serde-wasm-bindgen", - "serde_json", - "string_cache", - "string_cache_codegen", - "thiserror", - "wasm-bindgen", -] - [[package]] name = "browserslist-rs" version = "0.13.0" @@ -1331,6 +1306,7 @@ dependencies = [ "dtoa-short", "itoa", "phf 0.11.2", + "serde", "smallvec", ] @@ -3259,9 +3235,9 @@ dependencies = [ [[package]] name = "modularize_imports" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b7185e6577ae96612f3ad16f77e26631f1a3227a7baff75c2113e336a28111" +checksum = "b938c4ffaa1180f64186fd52f51dac5998e68c8c29f3ce4a0da952b873ebe021" dependencies = [ "convert_case 0.5.0", "handlebars", @@ -3573,7 +3549,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "serde", @@ -3867,6 +3843,7 @@ dependencies = [ "phf 0.10.1", "phf_codegen", "precomputed-hash", + "serde", "smallvec", "static-self", ] @@ -4231,7 +4208,7 @@ checksum = "3277c43d5ab99ddc71f4a301686c50a1a155339feb0cbe41492aabc211ef474f" dependencies = [ "ahash 0.8.6", "anyhow", - "browserslist-rs 0.13.0", + "browserslist-rs", "dashmap", "from_variant", "once_cell", @@ -5690,9 +5667,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "styled_components" -version = "0.82.0" +version = "0.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27e27c25eeaa8ddea7f9094187417251cdedcd6e31a97404c964f724bf5fbaf0" +checksum = "97aa75a37e4afde897446c920d4569ff18fbf32d2f8f3d9d0f109da674a9cb15" dependencies = [ "Inflector", "once_cell", @@ -5708,13 +5685,14 @@ dependencies = [ [[package]] name = "styled_jsx" -version = "0.59.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7aa926750af235c32342376eaf5f997595b381f4202908e40a71bf3708c284" +checksum = "0d5d705b3f746558b25d9badb4e2af0d106688880a7a7efd7cc41b4af7d42fd4" dependencies = [ "easy-error", "lightningcss", "parcel_selectors", + "preset_env_base", "serde", "swc_common", "swc_css_ast", @@ -5978,7 +5956,6 @@ dependencies = [ "swc_css_compat", "swc_css_modules", "swc_css_parser", - "swc_css_utils", "swc_css_visit", "swc_ecma_ast", "swc_ecma_codegen", @@ -6010,7 +5987,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24e33aed6900a6478ec9bffa7cdf5249ea79b55fcc86b34872212800086504fa" dependencies = [ "is-macro", - "serde", "string_enum", "swc_atoms", "swc_common", @@ -6065,9 +6041,9 @@ dependencies = [ [[package]] name = "swc_css_minifier" -version = "0.116.9" +version = "0.116.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe9803a0b7562ac8e0baebca15fc228fdd3dbc3c88d4fc5e85545b5f1f9597f" +checksum = "f758a030c634a2dfd78c44ebefbb64c9155e086a72d15784ad3ee91c1fa66485" dependencies = [ "serde", "swc_atoms", @@ -6108,9 +6084,9 @@ dependencies = [ [[package]] name = "swc_css_prefixer" -version = "0.153.10" +version = "0.153.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28769f899a6c6dc208221c0272b58576b6c8cbe8988395efae913eeba5e4834e" +checksum = "18ee513d43dca0debd04de9f2df55292778f982ec27d02bc503203bb644e409d" dependencies = [ "once_cell", "preset_env_base", @@ -6866,9 +6842,9 @@ dependencies = [ [[package]] name = "swc_emotion" -version = "0.58.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d123bc6ff6aff8724f43542964ee726801fc205137bbf0de7f822a2f8b15f204" +checksum = "708a605ff7a722d169e800dbbb0328a82db38811d3b07cbb8ca87db27d7b3e9c" dependencies = [ "base64 0.13.1", "byteorder", @@ -7026,9 +7002,9 @@ dependencies = [ [[package]] name = "swc_relay" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffdcdf1fd127262323ba54a1ab97a6dc0f5ba937e5d3fca8aa79935ded1a151" +checksum = "9a144781f2f2de3e7ccc22f7381a7f24383ac36168a4afefdbb029f78c1aa973" dependencies = [ "once_cell", "regex", @@ -7719,7 +7695,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "async-trait", @@ -7751,7 +7727,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "cargo-lock", @@ -7763,7 +7739,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "bytes", @@ -7778,7 +7754,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "dotenvs", @@ -7792,7 +7768,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7809,7 +7785,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "auto-hash-map", @@ -7839,7 +7815,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "base16", "hex", @@ -7851,7 +7827,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7865,7 +7841,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "proc-macro2", "quote", @@ -7875,7 +7851,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "mimalloc", ] @@ -7883,7 +7859,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "auto-hash-map", @@ -7908,7 +7884,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "async-recursion", @@ -7939,7 +7915,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "auto-hash-map", "mdxjs", @@ -7979,7 +7955,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8002,7 +7978,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "clap 4.4.2", @@ -8026,13 +8002,13 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "async-recursion", "async-trait", "auto-hash-map", - "browserslist-rs 0.12.4", + "browserslist-rs", "futures", "indexmap 1.9.3", "lazy_static", @@ -8056,15 +8032,19 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "async-trait", "indexmap 1.9.3", "indoc", + "lightningcss", "once_cell", + "parcel_selectors", + "parcel_sourcemap", "regex", "serde", + "smallvec", "swc_core", "turbo-tasks", "turbo-tasks-build", @@ -8078,7 +8058,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8102,7 +8082,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "async-compression", @@ -8139,7 +8119,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "async-trait", @@ -8173,7 +8153,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "serde", "serde_json", @@ -8184,7 +8164,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "async-trait", @@ -8207,7 +8187,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "indoc", @@ -8224,7 +8204,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8240,7 +8220,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "base64 0.21.4", @@ -8260,7 +8240,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "serde", @@ -8275,7 +8255,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "mdxjs", @@ -8290,7 +8270,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "async-stream", @@ -8325,7 +8305,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "serde", @@ -8341,7 +8321,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "swc_core", "turbo-tasks", @@ -8352,7 +8332,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8374,7 +8354,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "rand", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index f461e48fb99cf..0634a4b83bb00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,11 +43,11 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran testing = { version = "0.35.10" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231117.4" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/css-mode" } # last tag: "turbopack-231117.4" # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. -turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231117.4" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/css-mode" } # last tag: "turbopack-231117.4" # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231117.4" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/css-mode" } # last tag: "turbopack-231117.4" # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 58c3f16ff485a..cfea51c88cf1c 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -193,7 +193,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.22.6", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231113.3", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0f71e0024c9c6..2a6cf29dd4bb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1065,8 +1065,8 @@ importers: specifier: 0.22.6 version: 0.22.6 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231113.3 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231113.3(react-refresh@0.12.0)(webpack@5.86.0)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1(react-refresh@0.12.0)(webpack@5.86.0)' acorn: specifier: 8.5.0 version: 8.5.0 @@ -24646,9 +24646,9 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231113.3(react-refresh@0.12.0)(webpack@5.86.0)': - resolution: {registry: https://registry.npmjs.org/, tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231113.3} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231113.3' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1(react-refresh@0.12.0)(webpack@5.86.0)': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: From f43edbbcbdfcfe3d6100baa2ce30e6e467a3750b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Sun, 19 Nov 2023 17:39:48 +0900 Subject: [PATCH 16/27] link next.js --- Cargo.lock | 66 +++++++++++++++++++------------------- packages/next/package.json | 2 +- pnpm-lock.yaml | 10 +++--- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c83a0b3afe87..18fc88aa22997 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,7 +322,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "serde", "smallvec", @@ -3549,7 +3549,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "serde", @@ -7695,7 +7695,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "async-trait", @@ -7727,7 +7727,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "cargo-lock", @@ -7739,7 +7739,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "bytes", @@ -7754,7 +7754,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "dotenvs", @@ -7768,7 +7768,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7785,7 +7785,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "auto-hash-map", @@ -7815,7 +7815,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "base16", "hex", @@ -7827,7 +7827,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7841,7 +7841,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "proc-macro2", "quote", @@ -7851,7 +7851,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "mimalloc", ] @@ -7859,7 +7859,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "auto-hash-map", @@ -7884,7 +7884,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "async-recursion", @@ -7915,7 +7915,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "auto-hash-map", "mdxjs", @@ -7955,7 +7955,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7978,7 +7978,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "clap 4.4.2", @@ -8002,7 +8002,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "async-recursion", @@ -8032,7 +8032,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "async-trait", @@ -8058,7 +8058,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8082,7 +8082,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "async-compression", @@ -8119,7 +8119,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "async-trait", @@ -8153,7 +8153,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "serde", "serde_json", @@ -8164,7 +8164,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "async-trait", @@ -8187,7 +8187,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "indoc", @@ -8204,7 +8204,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8220,7 +8220,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "base64 0.21.4", @@ -8240,7 +8240,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "serde", @@ -8255,7 +8255,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "mdxjs", @@ -8270,7 +8270,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "async-stream", @@ -8305,7 +8305,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "serde", @@ -8321,7 +8321,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "swc_core", "turbo-tasks", @@ -8332,7 +8332,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#6757a848ca77c5d37aef19109f53d30f25e740f1" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/packages/next/package.json b/packages/next/package.json index cfea51c88cf1c..55020c3ae781c 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -193,7 +193,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.22.6", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2a6cf29dd4bb4..8e6e7248db8c3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1065,8 +1065,8 @@ importers: specifier: 0.22.6 version: 0.22.6 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1(react-refresh@0.12.0)(webpack@5.86.0)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e(react-refresh@0.12.0)(webpack@5.86.0)' acorn: specifier: 8.5.0 version: 8.5.0 @@ -24646,9 +24646,9 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1(react-refresh@0.12.0)(webpack@5.86.0)': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?6757a848ca77c5d37aef19109f53d30f25e740f1' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e(react-refresh@0.12.0)(webpack@5.86.0)': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: From 5cc38fe9db52c5257b49e48c7702c5758c12157c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 20 Nov 2023 11:49:16 +0900 Subject: [PATCH 17/27] init --- .../experimental-lightningcss/app/layout.tsx | 7 ++++ .../experimental-lightningcss/app/page.tsx | 3 ++ .../experimental-lightningcss.test.ts | 34 +++++++++++++++++++ .../experimental-lightningcss/next.config.js | 6 ++++ 4 files changed, 50 insertions(+) create mode 100644 test/development/app-dir/experimental-lightningcss/app/layout.tsx create mode 100644 test/development/app-dir/experimental-lightningcss/app/page.tsx create mode 100644 test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts create mode 100644 test/development/app-dir/experimental-lightningcss/next.config.js diff --git a/test/development/app-dir/experimental-lightningcss/app/layout.tsx b/test/development/app-dir/experimental-lightningcss/app/layout.tsx new file mode 100644 index 0000000000000..e7077399c03ce --- /dev/null +++ b/test/development/app-dir/experimental-lightningcss/app/layout.tsx @@ -0,0 +1,7 @@ +export default function Root({ children }: { children: React.ReactNode }) { + return ( + + {children} + + ) +} diff --git a/test/development/app-dir/experimental-lightningcss/app/page.tsx b/test/development/app-dir/experimental-lightningcss/app/page.tsx new file mode 100644 index 0000000000000..ff7159d9149fe --- /dev/null +++ b/test/development/app-dir/experimental-lightningcss/app/page.tsx @@ -0,0 +1,3 @@ +export default function Page() { + return

hello world

+} diff --git a/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts new file mode 100644 index 0000000000000..ebaaee9f01aa0 --- /dev/null +++ b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts @@ -0,0 +1,34 @@ +import { createNextDescribe } from 'e2e-utils' + +createNextDescribe( + 'experimental-lightningcss', + { + files: __dirname, + }, + ({ next }) => { + // Recommended for tests that check HTML. Cheerio is a HTML parser that has a jQuery like API. + it('should work using cheerio', async () => { + const $ = await next.render$('/') + expect($('p').text()).toBe('hello world') + }) + + // Recommended for tests that need a full browser + it('should work using browser', async () => { + const browser = await next.browser('/') + expect(await browser.elementByCss('p').text()).toBe('hello world') + }) + + // In case you need the full HTML. Can also use $.html() with cheerio. + it('should work with html', async () => { + const html = await next.render('/') + expect(html).toContain('hello world') + }) + + // In case you need to test the response object + it('should work with fetch', async () => { + const res = await next.fetch('/') + const html = await res.text() + expect(html).toContain('hello world') + }) + } +) diff --git a/test/development/app-dir/experimental-lightningcss/next.config.js b/test/development/app-dir/experimental-lightningcss/next.config.js new file mode 100644 index 0000000000000..807126e4cf0bf --- /dev/null +++ b/test/development/app-dir/experimental-lightningcss/next.config.js @@ -0,0 +1,6 @@ +/** + * @type {import('next').NextConfig} + */ +const nextConfig = {} + +module.exports = nextConfig From 6e14d5d3a003c5287edfa73addddfa10786e45f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 20 Nov 2023 12:01:48 +0900 Subject: [PATCH 18/27] WIP: test --- .../experimental-lightningcss/app/page.tsx | 4 +++- .../app/style.module.css | 3 +++ .../experimental-lightningcss.test.ts | 22 +++---------------- .../experimental-lightningcss/next.config.js | 6 ++++- 4 files changed, 14 insertions(+), 21 deletions(-) create mode 100644 test/development/app-dir/experimental-lightningcss/app/style.module.css diff --git a/test/development/app-dir/experimental-lightningcss/app/page.tsx b/test/development/app-dir/experimental-lightningcss/app/page.tsx index ff7159d9149fe..083d52fda9e5d 100644 --- a/test/development/app-dir/experimental-lightningcss/app/page.tsx +++ b/test/development/app-dir/experimental-lightningcss/app/page.tsx @@ -1,3 +1,5 @@ +import styles from './style.module.css' + export default function Page() { - return

hello world

+ return

hello world

} diff --git a/test/development/app-dir/experimental-lightningcss/app/style.module.css b/test/development/app-dir/experimental-lightningcss/app/style.module.css new file mode 100644 index 0000000000000..659edcf511a92 --- /dev/null +++ b/test/development/app-dir/experimental-lightningcss/app/style.module.css @@ -0,0 +1,3 @@ +.blue { + color: blue; +} diff --git a/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts index ebaaee9f01aa0..102066b4c77ae 100644 --- a/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts +++ b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts @@ -10,25 +10,9 @@ createNextDescribe( it('should work using cheerio', async () => { const $ = await next.render$('/') expect($('p').text()).toBe('hello world') - }) - - // Recommended for tests that need a full browser - it('should work using browser', async () => { - const browser = await next.browser('/') - expect(await browser.elementByCss('p').text()).toBe('hello world') - }) - - // In case you need the full HTML. Can also use $.html() with cheerio. - it('should work with html', async () => { - const html = await next.render('/') - expect(html).toContain('hello world') - }) - - // In case you need to test the response object - it('should work with fetch', async () => { - const res = await next.fetch('/') - const html = await res.text() - expect(html).toContain('hello world') + expect($('p').html()).toMatchInlineSnapshot(`"hello world"`) + expect($('p').attr('class')).toMatchInlineSnapshot(`"style_blue__2oYLK"`) + expect($('p').css('color')).toBe('red') }) } ) diff --git a/test/development/app-dir/experimental-lightningcss/next.config.js b/test/development/app-dir/experimental-lightningcss/next.config.js index 807126e4cf0bf..89e3729811429 100644 --- a/test/development/app-dir/experimental-lightningcss/next.config.js +++ b/test/development/app-dir/experimental-lightningcss/next.config.js @@ -1,6 +1,10 @@ /** * @type {import('next').NextConfig} */ -const nextConfig = {} +const nextConfig = { + experimental: { + useLightningcss: true, + }, +} module.exports = nextConfig From 29b4ea31b9af9aaa68c3630f0dfe828cd53dc5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 20 Nov 2023 12:43:16 +0900 Subject: [PATCH 19/27] lightningcss --- .../experimental-lightningcss/experimental-lightningcss.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts index 102066b4c77ae..58a2ef6c6c43d 100644 --- a/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts +++ b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts @@ -12,7 +12,7 @@ createNextDescribe( expect($('p').text()).toBe('hello world') expect($('p').html()).toMatchInlineSnapshot(`"hello world"`) expect($('p').attr('class')).toMatchInlineSnapshot(`"style_blue__2oYLK"`) - expect($('p').css('color')).toBe('red') + expect($('p').css('color')).toBe('#00f') }) } ) From f8e94af72329d7cdc7118f26d5752b7270da39e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 20 Nov 2023 15:29:38 +0900 Subject: [PATCH 20/27] Pass use_lightningcss to more --- packages/next-swc/crates/next-core/src/next_server/context.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/next-swc/crates/next-core/src/next_server/context.rs b/packages/next-swc/crates/next-core/src/next_server/context.rs index c790a1681e198..65db03c036a67 100644 --- a/packages/next-swc/crates/next-core/src/next_server/context.rs +++ b/packages/next-swc/crates/next-core/src/next_server/context.rs @@ -434,6 +434,7 @@ pub async fn get_server_module_options_context( let module_options_context = ModuleOptionsContext { custom_ecma_transform_plugins: base_ecma_transform_plugins, execution_context: Some(execution_context), + use_lightningcss, ..Default::default() }; let foreign_code_module_options_context = ModuleOptionsContext { @@ -518,6 +519,7 @@ pub async fn get_server_module_options_context( let module_options_context = ModuleOptionsContext { custom_ecma_transform_plugins: base_ecma_transform_plugins, execution_context: Some(execution_context), + use_lightningcss, ..Default::default() }; let foreign_code_module_options_context = ModuleOptionsContext { From bac829b4e64bfc76ca9cf73aedc93a1284c67fe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 20 Nov 2023 15:32:49 +0900 Subject: [PATCH 21/27] type --- packages/next/src/server/config-shared.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/next/src/server/config-shared.ts b/packages/next/src/server/config-shared.ts index b3db542eede1f..34f4f749ff2ca 100644 --- a/packages/next/src/server/config-shared.ts +++ b/packages/next/src/server/config-shared.ts @@ -342,6 +342,11 @@ export interface ExperimentalConfig { staticWorkerRequestDeduping?: boolean useWasmBinary?: boolean + + /** + * Use lightningcss instead of swc_css + */ + useLightningcss?: boolean } export type ExportPathMap = { From 84ebfaf1399e3e82f3f870078e4cc2932bf68261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 20 Nov 2023 15:36:16 +0900 Subject: [PATCH 22/27] type --- packages/next/src/server/config-schema.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/next/src/server/config-schema.ts b/packages/next/src/server/config-schema.ts index 21a7ed6450731..69da6035c0a67 100644 --- a/packages/next/src/server/config-schema.ts +++ b/packages/next/src/server/config-schema.ts @@ -368,6 +368,7 @@ export const configSchema: zod.ZodType = z.lazy(() => bundlePagesExternals: z.boolean().optional(), staticWorkerRequestDeduping: z.boolean().optional(), useWasmBinary: z.boolean().optional(), + useLightningcss: z.boolean().optional(), }) .optional(), exportPathMap: z From 380e690632d61b52704f676938b35768653f7898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 20 Nov 2023 15:40:29 +0900 Subject: [PATCH 23/27] turbopack --- packages/next/src/lib/turbopack-warning.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/next/src/lib/turbopack-warning.ts b/packages/next/src/lib/turbopack-warning.ts index cbc0bbe46af6b..fdd407165bb0a 100644 --- a/packages/next/src/lib/turbopack-warning.ts +++ b/packages/next/src/lib/turbopack-warning.ts @@ -66,6 +66,7 @@ const supportedTurbopackNextConfigOptions = [ 'experimental.useDeploymentId', 'experimental.useDeploymentIdServerActions', 'experimental.deploymentId', + 'experimental.useLightningcss', // Experimental options that don't affect compilation 'experimental.ppr', From 5ea862ded0e0f9198079377bf6c2f47bb860a2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 20 Nov 2023 15:46:36 +0900 Subject: [PATCH 24/27] basic test --- .../experimental-lightningcss.test.ts | 16 +++++++------ .../experimental-lightningcss/tsconfig.json | 23 +++++++++++++++++++ 2 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 test/development/app-dir/experimental-lightningcss/tsconfig.json diff --git a/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts index 58a2ef6c6c43d..148dcd0162f23 100644 --- a/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts +++ b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts @@ -7,12 +7,14 @@ createNextDescribe( }, ({ next }) => { // Recommended for tests that check HTML. Cheerio is a HTML parser that has a jQuery like API. - it('should work using cheerio', async () => { - const $ = await next.render$('/') - expect($('p').text()).toBe('hello world') - expect($('p').html()).toMatchInlineSnapshot(`"hello world"`) - expect($('p').attr('class')).toMatchInlineSnapshot(`"style_blue__2oYLK"`) - expect($('p').css('color')).toBe('#00f') - }) + ;(process.env.TURBOPACK ? it : it.skip)( + 'should support css modules', + async () => { + const $ = await next.render$('/') + expect($('p').text()).toBe('hello world') + // swc_css does not include `-module` in the class name, while lightningcss does. + expect($('p').attr('class')).toBe('style-module__hlQ3RG__blue') + } + ) } ) diff --git a/test/development/app-dir/experimental-lightningcss/tsconfig.json b/test/development/app-dir/experimental-lightningcss/tsconfig.json new file mode 100644 index 0000000000000..b3222239ed246 --- /dev/null +++ b/test/development/app-dir/experimental-lightningcss/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": false, + "noEmit": true, + "incremental": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "plugins": [ + { + "name": "next" + } + ] + }, + "include": ["next-env.d.ts", ".next/types/**/*.ts", "**/*.ts", "**/*.tsx"], + "exclude": ["node_modules"] +} From 036ed41fe6d89bb56b09fc372a3e1ff564648724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 20 Nov 2023 17:11:01 +0900 Subject: [PATCH 25/27] lint --- .../experimental-lightningcss.test.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts index 148dcd0162f23..5f925e71fb017 100644 --- a/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts +++ b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts @@ -7,13 +7,15 @@ createNextDescribe( }, ({ next }) => { // Recommended for tests that check HTML. Cheerio is a HTML parser that has a jQuery like API. - ;(process.env.TURBOPACK ? it : it.skip)( - 'should support css modules', - async () => { - const $ = await next.render$('/') - expect($('p').text()).toBe('hello world') - // swc_css does not include `-module` in the class name, while lightningcss does. - expect($('p').attr('class')).toBe('style-module__hlQ3RG__blue') + ;(process.env.TURBOPACK ? describe : describe.skip)( + 'with it enabled', + () => { + it('should support css modules', async () => { + const $ = await next.render$('/') + expect($('p').text()).toBe('hello world') + // swc_css does not include `-module` in the class name, while lightningcss does. + expect($('p').attr('class')).toBe('style-module__hlQ3RG__blue') + }) } ) } From 6d982ac92869324581881150102c84479ec31f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Mon, 20 Nov 2023 18:37:59 +0900 Subject: [PATCH 26/27] link --- Cargo.lock | 66 +++++++++++++++++++------------------- Cargo.toml | 6 ++-- packages/next/package.json | 2 +- pnpm-lock.yaml | 10 +++--- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18fc88aa22997..316c7a4e7a115 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,7 +322,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "serde", "smallvec", @@ -3549,7 +3549,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "serde", @@ -7695,7 +7695,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "async-trait", @@ -7727,7 +7727,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "cargo-lock", @@ -7739,7 +7739,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "bytes", @@ -7754,7 +7754,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "dotenvs", @@ -7768,7 +7768,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7785,7 +7785,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "auto-hash-map", @@ -7815,7 +7815,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "base16", "hex", @@ -7827,7 +7827,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7841,7 +7841,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "proc-macro2", "quote", @@ -7851,7 +7851,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "mimalloc", ] @@ -7859,7 +7859,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "auto-hash-map", @@ -7884,7 +7884,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "async-recursion", @@ -7915,7 +7915,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "auto-hash-map", "mdxjs", @@ -7955,7 +7955,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7978,7 +7978,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "clap 4.4.2", @@ -8002,7 +8002,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "async-recursion", @@ -8032,7 +8032,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "async-trait", @@ -8058,7 +8058,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8082,7 +8082,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "async-compression", @@ -8119,7 +8119,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "async-trait", @@ -8153,7 +8153,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "serde", "serde_json", @@ -8164,7 +8164,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "async-trait", @@ -8187,7 +8187,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "indoc", @@ -8204,7 +8204,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8220,7 +8220,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "base64 0.21.4", @@ -8240,7 +8240,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "serde", @@ -8255,7 +8255,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "mdxjs", @@ -8270,7 +8270,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "async-stream", @@ -8305,7 +8305,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "serde", @@ -8321,7 +8321,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "swc_core", "turbo-tasks", @@ -8332,7 +8332,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=kdy1/css-mode#14e72fce9ab5c197ddd2942679421ec109d8510e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231120.2#5de1380b33ec564de8b32b430c155163bcbc9cfb" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 0634a4b83bb00..d1dc9ccc6256a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,11 +43,11 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran testing = { version = "0.35.10" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/css-mode" } # last tag: "turbopack-231117.4" +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231120.2" } # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. -turbo-tasks = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/css-mode" } # last tag: "turbopack-231117.4" +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231120.2" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/css-mode" } # last tag: "turbopack-231117.4" +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231120.2" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 55020c3ae781c..697e35e087384 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -193,7 +193,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.22.6", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231120.2", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8e6e7248db8c3..908f783d6ddc6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1065,8 +1065,8 @@ importers: specifier: 0.22.6 version: 0.22.6 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e(react-refresh@0.12.0)(webpack@5.86.0)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231120.2 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231120.2(react-refresh@0.12.0)(webpack@5.86.0)' acorn: specifier: 8.5.0 version: 8.5.0 @@ -24646,9 +24646,9 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e(react-refresh@0.12.0)(webpack@5.86.0)': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?14e72fce9ab5c197ddd2942679421ec109d8510e' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231120.2(react-refresh@0.12.0)(webpack@5.86.0)': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231120.2} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231120.2' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: From bb486d2b782ed88edb3ada4e6437eb14b432db9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Mon, 20 Nov 2023 23:25:38 +0900 Subject: [PATCH 27/27] Update test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts Co-authored-by: Leah --- .../experimental-lightningcss.test.ts | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts index 5f925e71fb017..06dc1ad7755a1 100644 --- a/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts +++ b/test/development/app-dir/experimental-lightningcss/experimental-lightningcss.test.ts @@ -1,22 +1,16 @@ -import { createNextDescribe } from 'e2e-utils' +import { nextTestSetup } from 'e2e-utils' +import { describeVariants as describe } from 'next-test-utils' -createNextDescribe( - 'experimental-lightningcss', - { +describe.each(['turbo'])('experimental-lightningcss', () => { + const { next } = nextTestSetup({ files: __dirname, - }, - ({ next }) => { + }) + + it('should support css modules', async () => { // Recommended for tests that check HTML. Cheerio is a HTML parser that has a jQuery like API. - ;(process.env.TURBOPACK ? describe : describe.skip)( - 'with it enabled', - () => { - it('should support css modules', async () => { - const $ = await next.render$('/') - expect($('p').text()).toBe('hello world') - // swc_css does not include `-module` in the class name, while lightningcss does. - expect($('p').attr('class')).toBe('style-module__hlQ3RG__blue') - }) - } - ) - } -) + const $ = await next.render$('/') + expect($('p').text()).toBe('hello world') + // swc_css does not include `-module` in the class name, while lightningcss does. + expect($('p').attr('class')).toBe('style-module__hlQ3RG__blue') + }) +})