Turbopack: don't execute action loader eagerly

Author: mischnic

crates/next-api/src/app.rs

@@ -1785,7 +1785,6 @@ impl AppEndpoint {
                     bail!("rsc_entry must be evaluatable");
                 };
 
-                evaluatable_assets.push(server_action_manifest_loader);
                 evaluatable_assets.push(rsc_entry);
 
                 async {
@@ -1864,6 +1863,25 @@ impl AppEndpoint {
                         .await?;
                     }
 
+                    {
+                        let chunk_group = chunking_context
+                            .chunk_group(
+                                server_action_manifest_loader.ident(),
+                                ChunkGroup::Entry(vec![ResolvedVc::upcast(
+                                    server_action_manifest_loader,
+                                )]),
+                                module_graph,
+                                current_availability_info,
+                            )
+                            .await?;
+
+                        current_chunks = current_chunks
+                            .concatenate(*chunk_group.assets)
+                            .resolve()
+                            .await?;
+                        current_availability_info = chunk_group.availability_info;
+                    }
+
                     anyhow::Ok(Vc::cell(vec![
                         chunking_context
                             .entry_chunk_group_asset(

test/e2e/app-dir/actions/app-action.test.ts

@@ -44,7 +44,7 @@ describe('app-dir action handling', () => {
 
           expect(itemInfo.filename).toBeString()
           // can be outside app dir but this test suite has them all in app
-          expect(itemInfo.filename.startsWith('app/')).toBe(true)
+          expect(itemInfo.filename).toStartWith('app/')
           expect(itemInfo.exportedName).toBeString()
         } catch (err) {
           require('console').error(`Invalid action entry ${item}`, err)