size and test case fixes

Author: sokra

crates/next-core/src/next_client/context.rs

@@ -471,7 +471,7 @@ pub async fn get_client_chunking_context(
         builder = builder.chunking_config(
             Vc::<CssChunkType>::default().to_resolved().await?,
             ChunkingConfig {
-                max_merge_chunk_size: 200_000,
+                max_merge_chunk_size: 100_000,
                 ..Default::default()
             },
         );

crates/next-core/src/next_edge/context.rs

@@ -256,7 +256,7 @@ pub async fn get_edge_chunking_context_with_client_assets(
         builder = builder.chunking_config(
             Vc::<CssChunkType>::default().to_resolved().await?,
             ChunkingConfig {
-                max_merge_chunk_size: 200_000,
+                max_merge_chunk_size: 100_000,
                 ..Default::default()
             },
         );
@@ -319,7 +319,7 @@ pub async fn get_edge_chunking_context(
         builder = builder.chunking_config(
             Vc::<CssChunkType>::default().to_resolved().await?,
             ChunkingConfig {
-                max_merge_chunk_size: 200_000,
+                max_merge_chunk_size: 100_000,
                 ..Default::default()
             },
         );

test/e2e/app-dir/css-order/app/big-interleaved/style0.module.css

@@ -27,7 +27,6 @@ const PAGES: Record<
     conflict?: boolean
     brokenLoading?: boolean
     brokenLoadingDev?: boolean
-    brokenLoadingTurbo?: boolean
   }
 > = {
   first: {
@@ -62,16 +61,12 @@ const PAGES: Record<
   },
   'interleaved-a': {
     group: 'interleaved',
-    // TODO fix this case
-    brokenLoadingTurbo: true,
     url: '/interleaved/a',
     selector: '#helloia',
     color: 'rgb(0, 255, 0)',
   },
   'interleaved-b': {
     group: 'interleaved',
-    // TODO fix this case
-    brokenLoadingTurbo: true,
     url: '/interleaved/b',
     selector: '#helloib',
     color: 'rgb(255, 0, 255)',
@@ -244,10 +239,6 @@ describe.each(process.env.TURBOPACK ? ['turbo'] : ['strict', true])(
       // TODO fix this case
       let broken =
         isNextDev || ordering.some((page) => PAGES[page].brokenLoading)
-      if (mode === 'turbo') {
-        // TODO fix this case
-        broken ||= ordering.some((page) => PAGES[page].brokenLoadingTurbo)
-      }
       if (broken) {
         it.todo(name)
         continue
@@ -304,10 +295,6 @@ describe.each(process.env.TURBOPACK ? ['turbo'] : ['strict', 'loose'])(
           PAGES[page].brokenLoading ||
           (isNextDev && PAGES[page].brokenLoadingDev)
       )
-      if (mode === 'turbo') {
-        // TODO fix this case
-        broken ||= ordering.some((page) => PAGES[page].brokenLoadingTurbo)
-      }
       if (broken) {
         it.todo(name)
         continue
@@ -341,7 +328,7 @@ describe.each(process.env.TURBOPACK ? ['turbo'] : ['strict', 'loose'])(
     const { next } = nextTestSetup(options(mode))
     for (const [page, pageInfo] of Object.entries(PAGES)) {
       const name = `should load correct styles on ${page}`
-      if (mode === 'loose' && pageInfo.conflict) {
+      if (mode !== 'strict' && pageInfo.conflict) {
         // Conflict scenarios won't support that case
         continue
       }

test/e2e/app-dir/css-order/app/big-interleaved/style1.module.css

@@ -1554,6 +1554,7 @@
       "css-order turbo should load correct styles navigating back again pages-first -> pages-second -> pages-first -> pages-second",
       "css-order turbo should load correct styles navigating back again pages-first -> pages-third -> pages-first -> pages-third",
       "css-order turbo should load correct styles navigating back again pages-interleaved-a -> pages-interleaved-b -> pages-interleaved-a -> pages-interleaved-b",
+      "css-order turbo should load correct styles navigating back again pages-interleaved-b -> pages-interleaved-a -> pages-interleaved-b -> pages-interleaved-a",
       "css-order turbo should load correct styles navigating back again pages-second -> pages-first -> pages-second -> pages-first",
       "css-order turbo should load correct styles navigating back again pages-second -> pages-third -> pages-second -> pages-third",
       "css-order turbo should load correct styles navigating back again pages-third -> pages-first -> pages-third -> pages-first",
@@ -1583,6 +1584,7 @@
       "css-order turbo should load correct styles navigating pages-first -> pages-second",
       "css-order turbo should load correct styles navigating pages-first -> pages-third",
       "css-order turbo should load correct styles navigating pages-interleaved-a -> pages-interleaved-b",
+      "css-order turbo should load correct styles navigating pages-interleaved-b -> pages-interleaved-a",
       "css-order turbo should load correct styles navigating pages-second -> pages-first",
       "css-order turbo should load correct styles navigating pages-second -> pages-third",
       "css-order turbo should load correct styles navigating pages-third -> pages-first",
@@ -1615,31 +1617,25 @@
       "css-order turbo should load correct styles on pages-interleaved-a",
       "css-order turbo should load correct styles on pages-interleaved-b",
       "css-order turbo should load correct styles on pages-partial-reversed-a",
-      "css-order turbo should load correct styles on pages-partial-reversed-b",
       "css-order turbo should load correct styles on pages-reversed-a",
-      "css-order turbo should load correct styles on pages-reversed-b",
       "css-order turbo should load correct styles on pages-second",
       "css-order turbo should load correct styles on pages-third",
-      "css-order turbo should load correct styles on partial-reversed-a",
-      "css-order turbo should load correct styles on partial-reversed-b",
-      "css-order turbo should load correct styles on reversed-a",
-      "css-order turbo should load correct styles on reversed-b",
       "css-order turbo should load correct styles on second-client",
       "css-order turbo should load correct styles on second",
       "css-order turbo should load correct styles on third",
       "css-order turbo should load correct styles on vendor"
     ],
     "failed": [
-      "css-order turbo should load correct styles navigating back again pages-interleaved-b -> pages-interleaved-a -> pages-interleaved-b -> pages-interleaved-a",
-      "css-order turbo should load correct styles navigating back again pages-reversed-a -> pages-reversed-b -> pages-reversed-a -> pages-reversed-b",
-      "css-order turbo should load correct styles navigating back again pages-reversed-b -> pages-reversed-a -> pages-reversed-b -> pages-reversed-a",
       "css-order turbo should load correct styles navigating back again pages-partial-reversed-a -> pages-partial-reversed-b -> pages-partial-reversed-a -> pages-partial-reversed-b",
       "css-order turbo should load correct styles navigating back again pages-partial-reversed-b -> pages-partial-reversed-a -> pages-partial-reversed-b -> pages-partial-reversed-a",
-      "css-order turbo should load correct styles navigating pages-interleaved-b -> pages-interleaved-a",
+      "css-order turbo should load correct styles navigating back again pages-reversed-a -> pages-reversed-b -> pages-reversed-a -> pages-reversed-b",
+      "css-order turbo should load correct styles navigating back again pages-reversed-b -> pages-reversed-a -> pages-reversed-b -> pages-reversed-a",
+      "css-order turbo should load correct styles navigating pages-partial-reversed-a -> pages-partial-reversed-b",
+      "css-order turbo should load correct styles navigating pages-partial-reversed-b -> pages-partial-reversed-a",
       "css-order turbo should load correct styles navigating pages-reversed-a -> pages-reversed-b",
       "css-order turbo should load correct styles navigating pages-reversed-b -> pages-reversed-a",
-      "css-order turbo should load correct styles navigating pages-partial-reversed-a -> pages-partial-reversed-b",
-      "css-order turbo should load correct styles navigating pages-partial-reversed-b -> pages-partial-reversed-a"
+      "css-order turbo should load correct styles on pages-partial-reversed-b",
+      "css-order turbo should load correct styles on pages-reversed-b"
     ],
     "pending": [
       "css-order turbo should load correct styles navigating back again big-interleaved-a -> big-interleaved-b -> big-interleaved-a -> big-interleaved-b",

test/e2e/app-dir/css-order/app/big-interleaved/style2.module.css

@@ -350,7 +350,7 @@ async fn build_internal(
                     builder = builder.chunking_config(
                         Vc::<CssChunkType>::default().to_resolved().await?,
                         ChunkingConfig {
-                            max_merge_chunk_size: 200_000,
+                            max_merge_chunk_size: 100_000,
                             ..Default::default()
                         },
                     );

test/e2e/app-dir/css-order/app/big-interleaved/style3.module.css

@@ -417,6 +417,8 @@ mod tests {
         assert_eq!(round_chunk_item_size(6), 6);
         assert_eq!(round_chunk_item_size(7), 6);
         assert_eq!(round_chunk_item_size(8), 8);
+        assert_eq!(round_chunk_item_size(49000), 32_768);
+        assert_eq!(round_chunk_item_size(50000), 49_152);
 
         assert_eq!(changes_in_range(0..1000), 19);
         assert_eq!(changes_in_range(1000..2000), 2);

test/e2e/app-dir/css-order/app/big-interleaved/style4.module.css

@@ -164,14 +164,6 @@ pub async fn compute_style_groups(
         }
 
         if !styles.is_empty() {
-            println!(
-                "chunk group {chunk_group:?} {idx} {:#?}",
-                styles
-                    .iter()
-                    .map(|m| m.ident().to_string())
-                    .try_join()
-                    .await?
-            );
             chunk_group_state.push(ChunkGroupState {
                 requests: styles.len(),
                 styles,
@@ -274,8 +266,6 @@ pub async fn compute_style_groups(
         let info = module_info_map.get(&module).unwrap().as_ref().unwrap();
         let mut global_mode = info.style_type == StyleType::GlobalStyle;
 
-        println!("start with {}", info.ident);
-
         // The current position of processing in all selected chunk groups
         let mut all_chunk_states = info.chunk_group_indicies.clone();
 
@@ -386,7 +376,6 @@ pub async fn compute_style_groups(
                         potential_next_modules.insert(module, pos + 1 + i);
                     }
                 }
-                println!("add {}", info.ident);
 
                 new_chunk_items.push(info.chunk_item.as_ref().unwrap().clone());
                 new_chunk_modules.insert(module);