Merge branch 'canary' into shu/ggya

Author: shuding

docs/02-app/01-building-your-application/03-rendering/02-client-components.mdx

@@ -18,7 +18,7 @@ There are a couple of benefits to doing the rendering work on the client, includ
 
 To use Client Components, you can add the React [`"use client"` directive](https://react.dev/reference/react/use-client) at the top of a file, above your imports.
 
-`"use client"` is used to declare a [boundary](/docs/app/building-your-application/rendering#network-boundary) between a Server and Client Component modules. This means that by defining a `"use client"` in a file, all other modules imported into it, including child components, are considered part of the client bundle - and will be rendered by React on the client.
+`"use client"` is used to declare a [boundary](/docs/app/building-your-application/rendering#network-boundary) between a Server and Client Component modules. This means that by defining a `"use client"` in a file, all other modules imported into it, including child components, are considered part of the client bundle.
 
 ```tsx filename="app/counter.tsx" highlight={1} switcher
 'use client'

packages/next-swc/crates/next-core/src/next_app/app_page_entry.rs

@@ -9,6 +9,7 @@ use turbopack_binding::{
         core::{
             asset::{Asset, AssetContent},
             context::AssetContext,
+            module::Module,
             reference_type::ReferenceType,
             source::Source,
             virtual_source::VirtualSource,
@@ -101,14 +102,14 @@ pub async fn get_app_page_entry(
     let file = File::from(result.build());
     let source = VirtualSource::new(source.ident().path(), AssetContent::file(file.into()));
 
-    let rsc_entry = context.process(
+    let mut rsc_entry = context.process(
         Vc::upcast(source),
         Value::new(ReferenceType::Internal(Vc::cell(inner_assets))),
     );
 
     if is_edge {
-        todo!("edge pages are not supported yet")
-    }
+        rsc_entry = wrap_edge_entry(context, project_root, rsc_entry).await?;
+    };
 
     let Some(rsc_entry) =
         Vc::try_resolve_downcast::<Box<dyn EcmascriptChunkPlaceable>>(rsc_entry).await?
@@ -124,3 +125,30 @@ pub async fn get_app_page_entry(
     }
     .cell())
 }
+
+async fn wrap_edge_entry(
+    context: Vc<ModuleAssetContext>,
+    project_root: Vc<FileSystemPath>,
+    entry: Vc<Box<dyn Module>>,
+) -> Result<Vc<Box<dyn Module>>> {
+    const INNER: &str = "INNER_RSC_ENTRY";
+
+    let source = load_next_js_template(
+        "edge-app-route.js",
+        project_root,
+        indexmap! {
+            "VAR_USERLAND" => INNER.to_string(),
+        },
+        indexmap! {},
+    )
+    .await?;
+
+    let inner_assets = indexmap! {
+        INNER.to_string() => entry
+    };
+
+    Ok(context.process(
+        Vc::upcast(source),
+        Value::new(ReferenceType::Internal(Vc::cell(inner_assets))),
+    ))
+}